可信空间连接器入住接口

@@ -94,6 +94,14 @@ public class TdsConnectorIdentityManagementController {
         return CommonRes.success(true);
         return CommonRes.success(true);
     }
     }
 
 
+    @PostMapping("/cross-flow-call-back")
+    @SystemLog(value = "连接器身份管理-流程结束后进行业务回调(跨服务审批)")
+    @Operation(summary = "连接器身份管理-流程结束后进行业务回调(跨服务审批)", hidden = true)
+    public CommonRes<Boolean> crossFlowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        tdsConnectorIdentityManagementService.crossFlowCallBack(dto);
+        return CommonRes.success(true);
+    }
+    
     //endregion
     //endregion
     
     
 }
 }

@@ -112,6 +112,8 @@ public class TdsConnectorIdentityRQVO extends FlowRQBaseVO {
     @Schema(description = "是否变更数据【N 正常数据，Y 变更数据】")
     @Schema(description = "是否变更数据【N 正常数据，Y 变更数据】")
     private String isChangeData;
     private String isChangeData;
 
 
+    private String funcCode;
+    
     /******** 库表存储属性 需处理 *****/
     /******** 库表存储属性 需处理 *****/
     
     
     /******** 自定义扩展 *****/
     /******** 自定义扩展 *****/

@@ -76,4 +76,6 @@ public interface TdsConnectorIdentityManagementService {
      * @param rqVO
      * @param rqVO
      */
      */
     void updateVoucher(TdsConnectorIdentityManagementVoucherRQVO rqVO);
     void updateVoucher(TdsConnectorIdentityManagementVoucherRQVO rqVO);
+
+    void crossFlowCallBack(BizCallbackDTO dto);
 }
 }

@@ -19,6 +19,7 @@ import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementQueryVO
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementRQVO;
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementRQVO;
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementRSVO;
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementRSVO;
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementVoucherRQVO;
 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementVoucherRQVO;
+import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentityManagement;
 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentityManagement;
 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityManagementService;
 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityManagementService;
 import com.csbr.qingcloud.portal.service.TdsConnectorIdentityManagementService;
 import com.csbr.qingcloud.portal.service.TdsConnectorIdentityManagementService;
@@ -267,6 +268,13 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
         mfTdsConnectorIdentityManagementService.updateById(entity);
         mfTdsConnectorIdentityManagementService.updateById(entity);
     }
     }
 
 
+    @Override
+    public void crossFlowCallBack(BizCallbackDTO dto) {
+        MfTdsConnectorIdentityManagement entity = mfTdsConnectorIdentityManagementService.getById(dto.getBizGuid());
+        entity.setCrossPlatformApproveState(dto.getApprovalState());
+        mfTdsConnectorIdentityManagementService.updateById(entity);
+    }
+
     /**
     /**
      * 获取发起流程参数
      * 获取发起流程参数
      * @author xup
      * @author xup

@@ -181,7 +181,11 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
      */
      */
     private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity, TdsConnectorIdentityRQVO rqVO) {
     private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity, TdsConnectorIdentityRQVO rqVO) {
         AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
         AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
+        if(StringUtils.isBlank(rqVO.getFuncCode())) {
             approvalDTO.setFuncCode(SysFuncCode);
             approvalDTO.setFuncCode(SysFuncCode);
+        }else{
+            approvalDTO.setFuncCode(rqVO.getFuncCode());
+        }
         // 流程消息中的变量替换参数
         // 流程消息中的变量替换参数
         String msParam = String.format("%s,%s",bizCommonRedisUtil.getTenantName(entity.getTenantGuid()),null);
         String msParam = String.format("%s,%s",bizCommonRedisUtil.getTenantName(entity.getTenantGuid()),null);
         approvalDTO.setFlowMessageBody(msParam);
         approvalDTO.setFlowMessageBody(msParam);
@@ -299,6 +303,12 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
                 mfTdsConnectorIdentityService.updateById(sourceEntity);
                 mfTdsConnectorIdentityService.updateById(sourceEntity);
             }
             }
         }
         }
+        //主平台审批通过更新数据
+        if("MAIN".equals(platformType)) {
+            if(ApprovalStateEnum.PASSED.getValue().equals(bizApproveVO.getApprovalState())){
+                changSourceConnectorInentity(entity);
+            }
+        }
         // 同步更新审批状态
         // 同步更新审批状态
         entity.setBizApproveState(bizApproveVO.getApprovalState());
         entity.setBizApproveState(bizApproveVO.getApprovalState());
         mfTdsConnectorIdentityService.updateById(entity);
         mfTdsConnectorIdentityService.updateById(entity);
@@ -444,6 +454,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         MfTdsConnectorIdentity oldTdsConnectorIdentity = beforeChangeSaveTdsConnectorIdentity(rqVO);
         MfTdsConnectorIdentity oldTdsConnectorIdentity = beforeChangeSaveTdsConnectorIdentity(rqVO);
         //发起连接器入住申请
         //发起连接器入住申请
         rqVO.setIsChangeData("Y");
         rqVO.setIsChangeData("Y");
+        rqVO.setFuncCode(SysFuncCode+"BG");
         saveTdsConnectorIdentity(rqVO);
         saveTdsConnectorIdentity(rqVO);
         afterChangeSaveTdsConnectorIdentity(rqVO,oldTdsConnectorIdentity);
         afterChangeSaveTdsConnectorIdentity(rqVO,oldTdsConnectorIdentity);
     }
     }
@@ -470,14 +481,6 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         UserInfo userInfo = UserContextHolder.get();
         UserInfo userInfo = UserContextHolder.get();
         userInfo.setCurrentTenantGuid(entity.getTenantGuid());
         userInfo.setCurrentTenantGuid(entity.getTenantGuid());
         UserContextHolder.set(userInfo);
         UserContextHolder.set(userInfo);
-        //修改原始数据为变更中状态
-        if(ApprovalStateEnum.CHECKING.getValue().equals(dto.getApprovalState())){
-            if("Y".equals(entity.getIsChangeData())) {
-                MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(entity.getSourceBizGuid());
-                oldEntity.setBizApproveState("B");
-                mfTdsConnectorIdentityService.updateById(oldEntity);
-            }
-        }
         //如果是变更数据需要更新原来数据信息
         //如果是变更数据需要更新原来数据信息
         //审批通过
         //审批通过
         if(ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())){
         if(ApprovalStateEnum.PASSED.getValue().equals(dto.getApprovalState())){