feat(jyjc):jyjc集成seata

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -414,7 +414,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             JyjcInspectionHistory jyjcInspectionHistory = inspectionHistoryService.getBySSeq(jyjcOpeningApplicationModel.getSequenceNbr());
             JSONObject hisData = jyjcInspectionHistory.getHistoryData();
             if (jyjcOpeningApplicationModel.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()) ||
-                    jyjcOpeningApplicationModel.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) { // 人员信息:审批完成、已作废时显示历史数据
+                    jyjcOpeningApplicationModel.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) { // 审批完成、已作废时显示历史数据
                 hisData.put("status", jyjcOpeningApplicationModel.getStatus());
                 BeanUtil.copyProperties(hisData, jyjcOpeningApplicationModel);
             } else {                                                                                           // 流程中实时数据显示人、企业基本信息
@@ -687,6 +687,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     // 通过操作
                     jyjcOpeningApplication.setStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getPass());
                     jyjcOpeningApplication.setExpiryDate(DateUtil.parseDate(params.get("expiryDate").toString()));
+                    jyjcOpeningApplication.setAgencyClassify(params.get("agencyClassify").toString());
                 } else {
                     // 驳回操作
                     jyjcOpeningApplication.setStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getReject());
@@ -760,7 +761,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private void saveLicenseData2Company(JyjcOpeningApplication jyjcOpeningApplication) {
         JyjcInspectionHistory history = inspectionHistoryService.getBySSeq(jyjcOpeningApplication.getSequenceNbr());
         JSONObject hisData = history.getHistoryData();
-        List<BaseEnterpriseCertDto> certDtos = JSONArray.parseArray(hisData.getString(BizCommonConstant.UNIT_LICENCE_KEY), BaseEnterpriseCertDto.class);
+        List<BaseEnterpriseCertDto> certDtos = hisData.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
         List<BaseEnterpriseCert> certs = new ArrayList<>();
         List<BaseUnitLicence> licences = new ArrayList<>();
         certDtos.forEach(e -> {
@@ -769,7 +770,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (cert.getSequenceNbr() == null) {
                 cert.setSequenceNbr(sequence.nextId());
             }
-            e.getItemCodes().forEach(itemCode -> {
+            Optional.ofNullable(e.getItemCodes())
+                    .orElseGet(Collections::emptyList)
+                    .stream()
+                    .filter(Objects::nonNull).forEach(itemCode -> {
                 BaseUnitLicence licence = new BaseUnitLicence();
                 BeanUtils.copyProperties(e, licence);
                 licence.setItemCode(itemCode);
@@ -964,10 +968,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setTaskContent(String.format("检验检测业务开通办理，【申请单号：%s】", model.getApplicationSeq()));
         dto.setRelationId(workflowResultDto.getInstanceId());
         dto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        dto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+        dto.setTaskStatus(commonService.getDictionaryCodeByName(model.getStatus()));
         dto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-        dto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-        dto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        dto.setFlowStatus(commonService.getDictionaryCodeByName(model.getStatus()));
+        dto.setFlowStatusLabel(model.getStatus());
         dto.setStartUserId(reginParams.getUserModel().getUserId());
         dto.setStartUser(reginParams.getUserModel().getRealName());
         dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
@@ -978,11 +982,19 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         BeanUtil.copyProperties(model, urlParms, "unitCode", "unitAddress", "unitCodeName", "detectionRegion", "detectionRegionName", "applicationSeq", "resultType", "expiryDate", "acceptDate", "remark", "applyTime", "baseUnitLicences", "userInfos", "useContact", "contactPhone", "industrySupervisor", "longitude", "latitude", "geographic", "unitBusinessLicense");
         dto.setModel(urlParms);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-        dto.setPageType("look");
+        this.setPageTypeByFlowStatus(dto.getFlowStatus(), dto);
         list.add(dto);
         taskModelService.buildTaskModel(list);
     }
 
+    private void setPageTypeByFlowStatus(Integer flowStatus, TaskModelDto dto) {
+        if(flowStatus == 167264){
+            dto.setPageType("edit");
+        } else {
+            dto.setPageType("look");
+        }
+    }
+
     private void updateTask(JyjcOpeningApplication model, WorkflowResultDto workflowResultDto, String operate) {
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         if (!org.springframework.util.ObjectUtils.isEmpty(workflowResultDto.getNextTaskCode())) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
-spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=10
 spring.datasource.hikari.maximum-pool-size=25

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/file.conf

+transport {
+  # tcp udt unix-domain-socket
+  type = "TCP"
+  #NIO NATIVE
+  server = "NIO"
+  #enable heartbeat
+  heartbeat = true
+  # the client batch send request enable
+  enableClientBatchSendRequest = true
+  #thread factory for netty
+  threadFactory {
+    bossThreadPrefix = "NettyBoss"
+    workerThreadPrefix = "NettyServerNIOWorker"
+    serverExecutorThread-prefix = "NettyServerBizHandler"
+    shareBossWorker = false
+    clientSelectorThreadPrefix = "NettyClientSelector"
+    clientSelectorThreadSize = 1
+    clientWorkerThreadPrefix = "NettyClientWorkerThread"
+    # netty boss thread size,will not be used for UDT
+    bossThreadSize = 1
+    #auto default pin or 8
+    workerThreadSize = "8"
+  }
+  shutdown {
+    # when destroy server, wait seconds
+    wait = 3
+  }
+  serialization = "seata"
+  compressor = "none"
+}
+service {
+  #transaction service group mapping
+  vgroupMapping.tzs-seata = "tzs-seata"
+  #only support when registry.type=file, please don't set multiple addresses
+  default.grouplist = "172.16.10.243:8091"
+  #degrade, current not support
+  enableDegrade = false
+  #disable seata
+  disableGlobalTransaction = false
+}
+
+client {
+  rm {
+    asyncCommitBufferLimit = 10000
+    lock {
+      retryInterval = 10
+      retryTimes = 30
+      retryPolicyBranchRollbackOnConflict = true
+    }
+    reportRetryCount = 5
+    tableMetaCheckEnable = false
+    reportSuccessEnable = false
+  }
+  tm {
+    commitRetryCount = 5
+    rollbackRetryCount = 5
+    default-global-transaction-timeout = 600  # 600秒
+  }
+  undo {
+    dataValidation = true
+    logSerialization = "protostuff"
+    logTable = "undo_log"
+  }
+  log {
+    exceptionRate = 100
+  }
+}
\ No newline at end of file