fix: 修改为通过map传递

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/resp/bu/BuApproveSyncBizDataReqVO.java

@@ -1,36 +0,0 @@
-package com.dragonsoft.dcuc.approve.model.resp.bu;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author huangzqa
- * @date 2023/11/7
- */
-@Setter
-@Getter
-@ToString
-@ApiModel(value = "流程业务数据")
-public class BuApproveSyncBizDataReqVO {
-
-    @NotNull
-    @Valid
-    @ApiModelProperty(value = "任务数据")
-    private BuApproveSyncBizApproveReqVO taskInfo;
-
-    @Valid
-    @ApiModelProperty(value = "要素/承办人数据")
-    private List<BuApproveSyncBizApproveGridReqVO> approveGrid;
-
-}

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

@@ -11,6 +11,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * <p>
@@ -74,6 +75,6 @@ public class BuApproveSyncReqVO {
     @NotNull
     @Valid
     @ApiModelProperty(value = "流程业务数据")
-    private BuApproveSyncBizDataReqVO bizData;
+    private Map<String,Object> bizData;
 
 }

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

@@ -13,7 +13,6 @@ 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.BuApproveSyncBizDataReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.service.IApproveCirculationService;
 import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
@@ -27,7 +26,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -170,10 +171,9 @@ public class BuSyncBusinessImpl implements IBuSyncBusiness {
 
         BuApproveSyncBizApproveReqVO buApproveSyncBizApproveReqVO = parseApprovalInfoDTO(approvalInfoDTO);
 
-        BuApproveSyncBizDataReqVO buApproveSyncBizDataReqVO = new BuApproveSyncBizDataReqVO();
-        buApproveSyncBizDataReqVO.setTaskInfo(buApproveSyncBizApproveReqVO);
-        buApproveSyncReqVO.setBizData(buApproveSyncBizDataReqVO);
-
+        Map<String, Object> bizData = new LinkedHashMap<>(2);
+        bizData.put("taskInfo", buApproveSyncBizApproveReqVO);
+        buApproveSyncReqVO.setBizData(bizData);
 
         ResponseStatus responseStatus = noticeBusiness.retryRequestSyncToBu(buApproveSyncReqVO);
         if (ResponseUtil.isSuccess(responseStatus)) {

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

@@ -4,11 +4,9 @@ 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.BuApproveSyncBizDataReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.properties.ApproveBuProperties;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dreamhead.moco.HttpServer;
@@ -19,6 +17,8 @@ import org.junit.Test;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import static com.github.dreamhead.moco.Moco.*;
 
@@ -106,9 +106,9 @@ public class NoticeBusinessImplTest {
         buApproveSyncBizApproveReqVO.setTaskTermStart(new Date());
         buApproveSyncBizApproveReqVO.setTaskTermEnd(new Date());
 
-        BuApproveSyncBizDataReqVO buApproveSyncBizDataReqVO = new BuApproveSyncBizDataReqVO();
-        buApproveSyncBizDataReqVO.setTaskInfo(buApproveSyncBizApproveReqVO);
-        buApproveSyncReqVO.setBizData(buApproveSyncBizDataReqVO);
+        Map<String, Object> bizData = new LinkedHashMap<>(2);
+        bizData.put("taskInfo", buApproveSyncBizApproveReqVO);
+        buApproveSyncReqVO.setBizData(bizData);
 
         ResponseStatus responseStatus = noticeBusiness.retryRequestSyncToBu(buApproveSyncReqVO);
         Assert.assertTrue(ResponseUtil.isSuccess(responseStatus));