refactor: 优化路径

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizApproveGridReqVO.java → approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/bu/BuApproveSyncBizApproveGridReqVO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.resp.bu;
+package com.dragonsoft.dcuc.approve.model.req.bu;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizApproveReqVO.java → approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/bu/BuApproveSyncBizApproveReqVO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.resp.bu;
+package com.dragonsoft.dcuc.approve.model.req.bu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncReqVO.java → approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/bu/BuApproveSyncReqVO.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.model.resp.bu;
+package com.dragonsoft.dcuc.approve.model.req.bu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/INoticeBusiness.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCallbackReqV3VO;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncReqVO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 
 /**

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BuSyncBusinessImpl.java

@@ -7,13 +7,14 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.api.IApproveApiBusiness;
 import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.business.external.INoticeBusiness;
+import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.enumresources.bu.TaskStatusEnum;
 import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.dto.ApprovalInfoDTO;
 import com.dragonsoft.dcuc.approve.model.dto.ApproveMessageInfoDTO;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizApproveReqVO;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncBizApproveReqVO;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.service.IApproveCirculationService;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -73,8 +74,8 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
     @Override
     @CacheLock
     public ResponseStatus syncTuBu() {
-        List<ApproveRecordInfo> unSyncList = approveRecordService.getUnSyncList();
         TransactionSupport.execute(() -> {
+            List<ApproveRecordInfo> unSyncList = approveRecordService.getUnSyncList();
             for (ApproveRecordInfo approveRecordInfo : unSyncList) {
                 String id = approveRecordInfo.getId();
                 String approveNo = approveRecordInfo.getApproveNo();
@@ -172,7 +173,7 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = parseApprovalInfoDTO(approvalInfoDTO);
 
         Map<String, Object> bizData = new LinkedHashMap<>(2);
-        bizData.put("taskInfo", buApproveSyncBizApproveReqVO);
+        bizData.put(ApproveConstants.TASK_INFO, buApproveSyncBizApproveReqVO);
         buApproveSyncReqVO.setBizData(bizData);
 
         ResponseStatus responseStatus = noticeBusiness.retryRequestSyncToBu(buApproveSyncReqVO);
@@ -191,6 +192,7 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
      * @return 流程业务数据
      */
     protected BuApproveSyncBizApproveReqVO parseApprovalInfoDTO(ApprovalInfoDTO approvalInfoDTO) {
+        Assert.notNull(approvalInfoDTO);
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = new BuApproveSyncBizApproveReqVO();
         buApproveSyncBizApproveReqVO.setTitle(approvalInfoDTO.getProcessTitle());
         buApproveSyncBizApproveReqVO.setTaskClass(approvalInfoDTO.getApproveTaskClass());

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/NoticeBusinessImpl.java

@@ -7,7 +7,7 @@ import com.dragonsoft.dcuc.approve.business.external.INoticeBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveBeanConstants;
 import com.dragonsoft.dcuc.approve.enumresources.bu.BuErrorCodeEnum;
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCallbackReqV3VO;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustMessageRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustResultDataVO;
 import com.dragonsoft.dcuc.approve.properties.ApproveBuProperties;
@@ -190,7 +190,7 @@ public class NoticeBusinessImpl implements INoticeBusiness {
             return ResponseUtil.dtoFail(errorTip);
         }
 
-        logger.info("baseReq resp :{}", JsonUtils.toJSONString(exchange));
+        logger.info("{} baseReq resp :{}", requestName, JsonUtils.toJSONString(exchange));
         TypeReference<ZeroTrustResultDataVO<Object>> typeReference = new TypeReference<ZeroTrustResultDataVO<Object>>() {
         };
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/constants/ApproveConstants.java

@@ -46,6 +46,15 @@ public final class ApproveConstants {
      */
     public static final String SYS_LOG_NAME = "sysLog";
 
+    /**
+     * 任务数据
+     */
+    public static final String TASK_INFO = "taskInfo";
+    /**
+     * 要素/承办人数据
+     */
+    public static final String APPROVE_GRID = "approveGird";
+
     private ApproveConstants() {
     }
 }

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/NoticeBusinessImplTest.java

@@ -3,8 +3,9 @@ package com.dragonsoft.dcuc.approve.business.impl;
 import com.dragoninfo.dcuc.common.http.SkipSslVerificationHttpRequestFactory;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.external.impl.NoticeBusinessImpl;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizApproveReqVO;
-import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
+import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncBizApproveReqVO;
+import com.dragonsoft.dcuc.approve.model.req.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.properties.ApproveBuProperties;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -107,7 +108,7 @@ public class NoticeBusinessImplTest {
         buApproveSyncBizApproveReqVO.setTaskTermEnd(new Date());
 
         Map<String, Object> bizData = new LinkedHashMap<>(2);
-        bizData.put("taskInfo", buApproveSyncBizApproveReqVO);
+        bizData.put(ApproveConstants.TASK_INFO, buApproveSyncBizApproveReqVO);
         buApproveSyncReqVO.setBizData(bizData);
 
         ResponseStatus responseStatus = noticeBusiness.retryRequestSyncToBu(buApproveSyncReqVO);