修改序列生成规则

sop-business/src/main/java/com/qmth/sop/business/activiti/listener/ProcessEventListener.java

@@ -311,6 +311,7 @@ public class ProcessEventListener implements ActivitiEventListener, Serializable
                 flowResult.setVersion(tfCustomFlow.getVersion());
                 tfCustomFlow.setUpdateTime(System.currentTimeMillis());
             }
+            flowResult.setFlowName(tfCustomFlow.getType().name());
             tfCustomFlow.setFlowProcessVar(JacksonUtil.parseJson(flowResult));
             tfCustomFlowService.saveOrUpdate(tfCustomFlow);
         } catch (DocumentException e) {

sop-business/src/main/java/com/qmth/sop/business/entity/TDFormWidgetMetadata.java

@@ -0,0 +1,97 @@
+package com.qmth.sop.business.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 动态表单元数据表
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-29
+ */
+@ApiModel(value = "TDFormWidgetMetadata对象", description = "动态表单元数据表")
+public class TDFormWidgetMetadata implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程")
+    private String type;
+
+    @ApiModelProperty(value = "流程部署id")
+    private String flowDeploymentId;
+
+    @ApiModelProperty(value = "版本号")
+    private Integer version;
+
+    @ApiModelProperty(value = "字段id")
+    private String fieldId;
+
+    @ApiModelProperty(value = "字段名称")
+    private String fieldName;
+
+    @ApiModelProperty(value = "字段标题")
+    private String fieldTitle;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getFlowDeploymentId() {
+        return flowDeploymentId;
+    }
+
+    public void setFlowDeploymentId(String flowDeploymentId) {
+        this.flowDeploymentId = flowDeploymentId;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public String getFieldId() {
+        return fieldId;
+    }
+
+    public void setFieldId(String fieldId) {
+        this.fieldId = fieldId;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFieldTitle() {
+        return fieldTitle;
+    }
+
+    public void setFieldTitle(String fieldTitle) {
+        this.fieldTitle = fieldTitle;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+}

sop-business/src/main/java/com/qmth/sop/business/mapper/SequenceMapper.java

@@ -1,8 +1,10 @@
 package com.qmth.sop.business.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.sop.business.entity.Sequence;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>
@@ -21,4 +23,8 @@ public interface SequenceMapper extends BaseMapper<Sequence> {
      * @return
      */
     Long selectNextVal(@Param("name") String name);
+
+    @InterceptorIgnore(blockAttack = "true")
+    @Update("UPDATE sequence s set s.current_value = 0")
+    Boolean sequenceReset();
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/TDFormWidgetMetadataMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.sop.business.entity.TDFormWidgetMetadata;
+
+/**
+ * <p>
+ * 动态表单元数据表 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-29
+ */
+public interface TDFormWidgetMetadataMapper extends BaseMapper<TDFormWidgetMetadata> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/SequenceService.java

@@ -39,4 +39,11 @@ public interface SequenceService extends IService<Sequence> {
     String createCrmCode(String crm) throws InterruptedException;
 
     String createCode(String name) throws InterruptedException;
+
+    /**
+     * 序列重置
+     *
+     * @return
+     */
+    Boolean sequenceReset();
 }

sop-business/src/main/java/com/qmth/sop/business/service/TDFormWidgetMetadataService.java

@@ -0,0 +1,16 @@
+package com.qmth.sop.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.entity.TDFormWidgetMetadata;
+
+/**
+ * <p>
+ * 动态表单元数据表 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-29
+ */
+public interface TDFormWidgetMetadataService extends IService<TDFormWidgetMetadata> {
+
+}

sop-business/src/main/java/com/qmth/sop/business/service/impl/SequenceServiceImpl.java

@@ -13,6 +13,7 @@ import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.TFCustomTypeEnum;
 import com.qmth.sop.common.lock.MemoryLock;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Optional;
@@ -74,9 +75,9 @@ public class SequenceServiceImpl extends ServiceImpl<SequenceMapper, Sequence> i
     @Override
     public String createFlowCode(TFCustomTypeEnum tfCustomTypeEnum) throws InterruptedException {
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.FLOW_CODE_LENGTH);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程编码长度未设置"));
+        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("编码长度未设置"));
         String sequence = String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(tfCustomTypeEnum.getCode()));
-        return tfCustomTypeEnum.getMark() + sequence;
+        return tfCustomTypeEnum.getMark() + SystemConstant.getNowTime() + sequence;
     }
 
     /**
@@ -89,14 +90,24 @@ public class SequenceServiceImpl extends ServiceImpl<SequenceMapper, Sequence> i
     @Override
     public String createCrmCode(String crm) throws InterruptedException {
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.FLOW_CODE_LENGTH);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程编码长度未设置"));
-        return String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(crm));
+        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("编码长度未设置"));
+        return SystemConstant.getNowTime() + String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(crm));
     }
 
     @Override
     public String createCode(String name) throws InterruptedException {
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.FLOW_CODE_LENGTH);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程编码长度未设置"));
-        return String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(name));
+        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("编码长度未设置"));
+        return SystemConstant.getNowTime() + String.format("%0" + sysConfig.getConfigValue() + "d", this.selectNextVal(name));
+    }
+
+    /**
+     * 序列重置
+     * @return
+     */
+    @Override
+    @Transactional
+    public Boolean sequenceReset() {
+        return this.baseMapper.sequenceReset();
     }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TDFormWidgetMetadataServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.sop.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.sop.business.entity.TDFormWidgetMetadata;
+import com.qmth.sop.business.mapper.TDFormWidgetMetadataMapper;
+import com.qmth.sop.business.service.TDFormWidgetMetadataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动态表单元数据表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-29
+ */
+@Service
+public class TDFormWidgetMetadataServiceImpl extends ServiceImpl<TDFormWidgetMetadataMapper, TDFormWidgetMetadata> implements TDFormWidgetMetadataService {
+
+}

sop-business/src/main/java/com/qmth/sop/business/util/ImportExportUtil.java

@@ -49,10 +49,10 @@ public class ImportExportUtil {
         File txtFileTemp = null;
         try {
             StringJoiner stringJoiner = SystemConstant.getDirName(UploadFileEnum.FILE, true);
-            stringJoiner.add(SystemConstant.getNanoId()).add(SystemConstant.TXT_PREFIX);
+            stringJoiner.add(SystemConstant.getNanoId()).add(SystemConstant.JSON_PREFIX);
 
             String txtDirName = stringJoiner.toString();
-            txtFileTemp = SystemConstant.getFileTempVar(SystemConstant.TXT_PREFIX);
+            txtFileTemp = SystemConstant.getFileTempVar(SystemConstant.JSON_PREFIX);
 
             String charset = SystemConstant.CHARSET_NAME;
             SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_CONFIG_KEY_CHARSETS);

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -868,4 +868,27 @@ ALTER TABLE t_d_table_prop DROP COLUMN update_id;
 ALTER TABLE t_d_table_prop DROP COLUMN update_time;
 
 ALTER TABLE t_d_form_widget CHANGE COLUMN input_type input_type VARCHAR(20)
-    COMMENT '输入类型，STRING：字符串，INT：整型，LONG：长整型，DOUBLE：浮点型，ENUM：枚举，DATE：日期，BOOL：布尔，BIGDECIMAL：精确浮点，FILE：文件，ARRAY：数组' NULL;
+    COMMENT '输入类型，STRING：字符串，INT：整型，LONG：长整型，DOUBLE：浮点型，ENUM：枚举，DATE：日期，BOOL：布尔，BIGDECIMAL：精确浮点，FILE：文件，ARRAY：数组' NULL;
+
+UPDATE sys_config
+SET org_id=NULL, config_key='flow.code.length', config_name='流程编码长度', config_value='3', remark=NULL, enable=1, sort=1, create_id=1, create_time=NULL, update_id=NULL, update_time=NULL
+WHERE id=19;
+
+CREATE TABLE t_d_form_widget_metadata
+(
+    type VARCHAR(20)
+        COMMENT '流程类型，OFFICE_SOP_FLOW：教务处SOP，CLOUD_MARK_SOP_FLOW：研究生SOP，DING_EXCEPTION_FLOW：考勤异常审核流程，PROJECT_EXCHANGE_FLOW：项目计划变更流程，QUALITY_PROBLEM_FLOW：质量问题反馈流程' NOT NULL,
+    flow_deployment_id VARCHAR(50)
+        COMMENT '流程部署id' NOT NULL,
+    version INTEGER DEFAULT 1
+        COMMENT '版本号' NOT NULL,
+    field_id VARCHAR(50)
+        COMMENT '字段id' NOT NULL,
+    field_name VARCHAR(50)
+        COMMENT '字段名称' NOT NULL,
+    field_title VARCHAR(50)
+        COMMENT '字段标题' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NOT NULL
+);
+ALTER TABLE t_d_form_widget_metadata COMMENT = '动态表单元数据表';

sop-business/src/main/resources/mapper/TDFormWidgetMetadataMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.sop.business.mapper.TDFormWidgetMetadataMapper">
+
+</mapper>

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.common.contant;
 
+import cn.hutool.core.date.DateUtil;
 import com.aventrix.jnanoid.jnanoid.NanoIdUtils;
 import com.qmth.boot.core.uid.service.UidService;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
@@ -13,6 +14,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
+import java.text.MessageFormat;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -68,7 +70,6 @@ public class SystemConstant {
     public static final String HYPHEN = "-";
     public static final String SYS_ADMIN = "sysadmin";
     public static final String VERSION_VALUE = "1.0.0.1";
-    public static final String DATE_TIME_FORMAT = "%02d";
     public static final String PATH = "path";
     public static final String TYPE = "type";
     public static final String LOCAL = "local";
@@ -77,7 +78,9 @@ public class SystemConstant {
     public static final String TEMP = "temp";
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final String DEFAULT_DATE_YMD_PATTERN = "yyyy-MM-dd";
-    public static final String TXT_PREFIX = ".txt";
+    public static final String DEFAULT_DATE_CODE_PATTERN = "yyyyMMdd";
+    public static final String DEFAULT_DATE_ATTACHMENT_PATTERN = "/yyyy/MM/dd";
+    public static final String JSON_PREFIX = ".json";
     public static final String XLSX_PREFIX = ".xlsx";
     public static final String XLS_PREFIX = "xls";
     public static final String EXCEL_DATA = "excelData";
@@ -284,18 +287,21 @@ public class SystemConstant {
      * @return
      */
     public static StringJoiner getDirName(UploadFileEnum uploadFileEnum, boolean fileSpearator) {
-        LocalDateTime nowTime = LocalDateTime.now();
         StringJoiner stringJoiner = new StringJoiner("");
-        stringJoiner.add(uploadFileEnum.getTitle()).add(File.separator)
-                .add(String.valueOf(nowTime.getYear())).add(File.separator)
-                .add(String.format(SystemConstant.DATE_TIME_FORMAT, nowTime.getMonthValue())).add(File.separator)
-                .add(String.format(SystemConstant.DATE_TIME_FORMAT, nowTime.getDayOfMonth()));
-        if (fileSpearator) {
-            stringJoiner.add(File.separator);
-        }
+        stringJoiner.add(MessageFormat.format("{0}{1}", UploadFileEnum.FILE.getTitle(), DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_ATTACHMENT_PATTERN)));
+        stringJoiner = fileSpearator ? stringJoiner.add(File.separator) : stringJoiner;
         return stringJoiner;
     }
 
+    /**
+     * 获取当前年月日时间
+     *
+     * @return
+     */
+    public static String getNowTime() {
+        return DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_CODE_PATTERN);
+    }
+
     /**
      * 获取临时文件
      *

sop-common/src/main/java/com/qmth/sop/common/enums/JobEnum.java

@@ -15,6 +15,10 @@ public enum JobEnum {
 
     FLOW_TASK_REMIND_JOB_GROUP("流程任务提醒定时任务组"),
 
+    SEQUENCE_JOB("序列重置定时任务"),
+
+    SEQUENCE_JOB_GROUP("序列重置定时任务组"),
+
     REMIND_QUARTZ_JOB_GROUP("任务提醒一次性job group");
 
     private String title;

sop-server/src/main/java/com/qmth/sop/server/api/TDFormWidgetMetadataController.java

@@ -0,0 +1,19 @@
+package com.qmth.sop.server.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 动态表单元数据表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/t-dform-widget-metadata")
+public class TDFormWidgetMetadataController {
+
+}

sop-task/src/main/java/com/qmth/sop/task/job/SequenceJob.java

@@ -0,0 +1,29 @@
+package com.qmth.sop.task.job;
+
+import com.qmth.sop.task.job.service.JobService;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 序列重置job
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/7/9
+ */
+public class SequenceJob extends QuartzJobBean {
+    private final static Logger log = LoggerFactory.getLogger(SequenceJob.class);
+
+    @Resource
+    JobService jobService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+        jobService.sequenceReset();
+    }
+}

sop-task/src/main/java/com/qmth/sop/task/job/service/JobService.java

@@ -26,4 +26,9 @@ public interface JobService {
      * @param jobEnum
      */
     void setJobTime(Long finishTime, String jobName, Object o, Class cls, JobEnum jobEnum);
+
+    /**
+     * 序列重置
+     */
+    void sequenceReset();
 }

sop-task/src/main/java/com/qmth/sop/task/job/service/impl/JobServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.sop.business.cache.CommonCacheService;
 import com.qmth.sop.business.entity.SysConfig;
 import com.qmth.sop.business.entity.TSJobRemind;
+import com.qmth.sop.business.service.SequenceService;
 import com.qmth.sop.business.service.TSJobRemindService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
@@ -42,6 +43,9 @@ public class JobServiceImpl implements JobService {
     @Resource
     CommonCacheService commonCacheService;
 
+    @Resource
+    SequenceService sequenceService;
+
     /**
      * 流程任务提醒task
      */
@@ -84,7 +88,7 @@ public class JobServiceImpl implements JobService {
                                 break;
                         }
                     } else if (t.getType() == JobQuartzTypeEnum.FLOW) {//通告
-                        switch(t.getRemindType()){
+                        switch (t.getRemindType()) {
                             case AFTER://超时提醒
                                 SysConfig sysConfigAfter = commonCacheService.addSysConfigCache(SystemConstant.NOTICE_JOB_AFTER_TIME);
                                 Optional.ofNullable(sysConfigAfter).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("公告超时提醒任务时间未设置"));
@@ -144,4 +148,12 @@ public class JobServiceImpl implements JobService {
             quartzService.addJob(cls, jobName, jobEnum.name(), cron, mapJob);
         }
     }
+
+    /**
+     * 序列重置
+     */
+    @Override
+    public void sequenceReset() {
+        sequenceService.sequenceReset();
+    }
 }

sop-task/src/main/java/com/qmth/sop/task/start/StartRunning.java

@@ -6,6 +6,7 @@ import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.JobEnum;
 import com.qmth.sop.task.job.FlowTaskRemindJob;
+import com.qmth.sop.task.job.SequenceJob;
 import com.qmth.sop.task.service.QuartzService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,6 +42,14 @@ public class StartRunning implements CommandLineRunner {
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.REMIND_JOB_POLL_TIME);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("任务提醒轮询时间未设置"));
 
+        log.info("增加序列重置定时任务 start");
+        Map sequenceMap = new HashMap();
+        sequenceMap.put(SystemConstant.NAME, SequenceJob.class.getName());
+        quartzService.deleteJob(JobEnum.SEQUENCE_JOB.name(), JobEnum.SEQUENCE_JOB_GROUP.name());
+//        quartzService.addJob(SequenceJob.class, JobEnum.SEQUENCE_JOB.name(), JobEnum.SEQUENCE_JOB_GROUP.name(), "0 0/1 * * * ?", sequenceMap);
+        quartzService.addJob(SequenceJob.class, JobEnum.SEQUENCE_JOB.name(), JobEnum.SEQUENCE_JOB_GROUP.name(), "0 0 0 * * ?", sequenceMap);
+        log.info("增加序列重置定时任务 end");
+
         log.info("增加流程任务提醒定时任务 start");
         Map flowTaskRemindJobMap = new HashMap();
         flowTaskRemindJobMap.computeIfAbsent(SystemConstant.NAME, v -> FlowTaskRemindJob.class.getName());