Merge remote-tracking branch 'origin/master'

kingbasesql/act_ge_bytearray.sql

@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS ACT_GE_BYTEARRAY;
+CREATE TABLE PUBLIC.ACT_GE_BYTEARRAY (
+         ID_ VARCHAR(64) NOT NULL,
+         REV_ INT4,
+         NAME_ VARCHAR(255),
+         DEPLOYMENT_ID_ VARCHAR(64),
+         BYTES_ BLOB,
+         GENERATED_ INT4,
+         CONSTRAINT ACT_GE_BYTEARRAY_PKEY PRIMARY KEY (ID_)
+);
+CREATE UNIQUE INDEX "ACT_GE_BYTEARRAY_BYTES_DEPLOYMENT_ID_uindex" ON PUBLIC.ACT_GE_BYTEARRAY (BYTES_,DEPLOYMENT_ID_,ID_);

pgsql/wflow_model_historys.sql → kingbasesql/wflow_model_historys.sql

@@ -5,16 +5,16 @@ CREATE TABLE wflow_model_historys  (
        form_id varchar(40) NOT NULL,
        form_name varchar(40) NOT NULL,
        version int4 NOT NULL DEFAULT 0,
-       logo json NOT NULL,
-       settings json NOT NULL,
-       group_id int8 NOT NULL,
-       form_items json NOT NULL,
-       process json NOT NULL,
+       logo text,
+       settings text,
+       group_id int8,
+       form_items text,
+       process text,
        remark varchar(255),
        created timestamp NULL DEFAULT NULL,
        region_code varchar(50),
        process_type int4,
        node_map text,
        CONSTRAINT "wflow_model_historys_pri" PRIMARY KEY ("id")
-)
+);
 CREATE UNIQUE INDEX form_id_uk  ON wflow_model_historys(form_id,version);

pgsql/wflow_models.sql → kingbasesql/wflow_models.sql

@@ -8,8 +8,8 @@ CREATE TABLE wflow_models  (
        logo text,
        settings text,
        group_id int8,
-       form_items text NOT NULL,
-       process text NOT NULL,
+       form_items text,
+       process text,
        remark varchar(125),
        sort int4 NOT NULL,
        is_delete BOOL,

pmapi/src/main/java/com/ningdatech/pmapi/common/helper/basic/AbstractRegionCacheHelper.java

@@ -63,7 +63,7 @@ public abstract class AbstractRegionCacheHelper implements InitializingBean {
                     return RegionConverter.toRegionDTO(region);
                 });
         // 初始化所有区域数据到缓存
-//        initRegionCache();
+        initRegionCache();
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java

@@ -267,10 +267,9 @@ public class ProjectDTO implements Serializable {
     @ApiModelProperty("流程状态")
     private Integer processStatus;
 
-    @ApiModelProperty("动态表单 json")
-    private Map<String,Object> dynamicForm;
-
     @ApiModelProperty("项目发起人")
     private Long sponsor;
 
+    private Map<String,Object> dynamicForm;
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java

@@ -50,14 +50,14 @@ public class InitProcessTask {
 
     private final RegionCacheHelper regionCacheHelper;
 
-    @Scheduled(cron = "0 31 15 07 3 ?")
+    @Scheduled(cron = "0 14 16 07 3 ?")
     public void doTask() throws UnknownHostException {
         if (TaskContant.Host.HOST_ZPF.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("=========== 初始化丽水二期 系统表单和流程配置 ======== 任务开始");
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
             //1.查出丽水市下的 区县 分别去初始化 表单和流程配置数据
-            List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY);
+            List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
 
             if(CollUtil.isEmpty(regions)){
                 throw new BizException("丽水地区数据为空 任务结束!");
@@ -115,7 +115,7 @@ public class InitProcessTask {
 //                    models.setFormId("wf" + IdUtil.objectId());
                     models.setVersion(1);
                     models.setGroupId(1);
-//                    models.setProcessDefId("pd" + IdUtil.objectId());
+                    models.setProcessDefId("pd" + IdUtil.objectId());
                     models.setFormName(formName);
                     models.setProcessType(processType);
                     models.setRegionCode(region.getRegionCode());
@@ -125,9 +125,10 @@ public class InitProcessTask {
                     models.setSettings("{\"sign\":false,\"admin\":[],\"notify\":{},\"commiter\":[]}");
                     models.setFormItems("[]");
 
-                    if(StringUtils.isNotBlank(processModelService.saveProcess(models))){
+                    String formId = processModelService.saveProcess(models);
+                    if(StringUtils.isNotBlank(formId)){
                         //初始的流程在部署表也存一份，用来查询
-                        if(StringUtils.isNotBlank(processModelService.deployProcess(models.getFormId(),null))){
+                        if(StringUtils.isNotBlank(processModelService.deployProcess(formId,null))){
                             log.info("当前区域 【{}】 流程名[{}] 流程数据已经保存成功",region.getRegionName(),formName);
                         }else{
                             log.info("当前区域 【{}】 流程名[{}] 流程数据保存失败",region.getRegionName(),formName);

pmapi/src/test/java/com/ningdatech/pmapi/common/helper/RegionCacheHelperTest.java

@@ -0,0 +1,26 @@
+package com.ningdatech.pmapi.common.helper;
+
+import com.ningdatech.pmapi.AppTests;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * <p>
+ * RegionCacheHelperTest
+ * </p>
+ *
+ * @author WendyYang
+ * @since 15:52 2023/3/7
+ */
+class RegionCacheHelperTest extends AppTests {
+
+    @Autowired
+    private RegionCacheHelper regionCacheHelper;
+
+    @Test
+    void listChildren() {
+        regionCacheHelper.listChildren("331100", 2).forEach(System.out::println);
+    }
+}