可信空间连接器入住接口

@@ -53,7 +53,12 @@ public class TdsConnectorIdentityController {
     @SystemLog(value = "连接器身份信息-修改")
     @Operation(summary = "连接器身份信息-修改")
     public CommonRes<Boolean> updateTdsConnectorIdentity(@RequestBody TdsConnectorIdentityRQVO vo) {
+        //变更数据重新提交流程
+        if("Y".equals(vo.getIsChangeData()) && vo.getImmediateApprove()){
+            tdsConnectorIdentityService.changeSaveTdsConnectorIdentity(vo);
+        }else {
             tdsConnectorIdentityService.updateTdsConnectorIdentity(vo);
+        }
         return CommonRes.success(true);
     }
 

@@ -38,4 +38,10 @@ public class TdsConnectorIdentityManagementQueryVO extends FlowBizGuidQueryDTO {
     @Schema(description = "是否调用查询的判断", hidden = true)
     private Boolean isNeedQuery;
 
+    /**
+     * 连接器名称
+     */
+    @Schema(description = "连接器名称")
+    private String conName;
+    
 }

@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
@@ -23,6 +24,7 @@ import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentityManagement;
 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityManagementService;
 import com.csbr.qingcloud.portal.service.TdsConnectorIdentityManagementService;
+import com.csbr.qingcloud.portal.service.TdsConnectorIdentityService;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -73,6 +75,9 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
     @Value("${csbr.platform-type:''}")
     private String platformType;
 
+    @Resource
+    private TdsConnectorIdentityService tdsConnectorIdentityService;
+
     /**
      * 连接器身份管理分页查询
      * @author xup
@@ -87,6 +92,11 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
             LambdaQueryWrapper<MfTdsConnectorIdentityManagement> queryWrapper = mfTdsConnectorIdentityManagementService.csbrQueryWrapper(queryVO, MfTdsConnectorIdentityManagement.class);
             queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfTdsConnectorIdentityManagement::getGuid,
                 queryVO.getGuidList());
+            String existsSql = "select guid from mf_tds_connector_identity a where a.guid=mf_tds_connector_identity_management.connector_guid and is_deleted='N' and is_change_data='N'";
+            if(StringUtils.isNotBlank(queryVO.getConName())){
+                existsSql = existsSql+" and connector_name like '%+"+queryVO.getConName()+"+%'";
+            }
+            queryWrapper.exists(existsSql);
             queryWrapper.orderByDesc(MfTdsConnectorIdentityManagement::getCreateTime);
             mfTdsConnectorIdentityManagementService.csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
             PageListVO<MfTdsConnectorIdentityManagement> pageList = mfTdsConnectorIdentityManagementService.csbrPageList(queryVO, queryWrapper);
@@ -514,29 +524,29 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
      * @return void
      */
     private void afterQuery(PageListVO<MfTdsConnectorIdentityManagement> pageList, PageListVO<TdsConnectorIdentityManagementRSVO> rsPageList) {
-        if (CollectionUtils.isNotEmpty(pageList.getRecords())) {
-            rsPageList.setRecords(convertToVO(pageList.getRecords()));
-        }
-        // 需要特殊处理数据时使用
-//        if(CollectionUtils.isNotEmpty(pageList.getRecords())){
-//            List<TdsConnectorIdentityManagementRSVO> results = new ArrayList<>();
-//            Set<String> guidSet = CommonUtil.filterSetFiled(pageList.getRecords(), MfTdsConnectorIdentityManagement::getGuid);
-//            Map<String, BizApproveVO> approvalInfoMap = approvalFlowUtil.getApprovalCrossTenantInfoMap(guidSet);
-//            Map<String, MfTdsConnectorIdentity> connectorIdentityMap = tdsConnectorIdentityService.getCrossTenantTdsConnectorIdentitys(guidSet);
-//            for (MfTdsConnectorIdentityManagement item : pageList.getRecords()){
-//                TdsConnectorIdentityManagementRSVO vo = convertToVO(item,false);
-//                String guid = vo.getGuid();
-//                if(ObjectUtils.isNotEmpty(approvalInfoMap) && approvalInfoMap.containsKey(guid)) {
-//                    vo.setApproveVO(approvalInfoMap.get(guid));
-//                }
-//                if(ObjectUtils.isNotEmpty(connectorIdentityMap) && connectorIdentityMap.containsKey(guid)) {
-//                    vo.setConnectorName(connectorIdentityMap.get(guid).getConnectorName());
-//                    vo.setLegalEntity(connectorIdentityMap.get(guid).getLegalEntity());
-//                }
-//                results.add(vo);
-//            }
-//            rsPageList.setRecords(results);
+//        if (CollectionUtils.isNotEmpty(pageList.getRecords())) {
+//            rsPageList.setRecords(convertToVO(pageList.getRecords()));
 //        }
+        // 需要特殊处理数据时使用
+        if(CollectionUtils.isNotEmpty(pageList.getRecords())){
+            List<TdsConnectorIdentityManagementRSVO> results = new ArrayList<>();
+            Set<String> guidSet = CommonUtil.filterSetFiled(pageList.getRecords(), MfTdsConnectorIdentityManagement::getGuid);
+            Map<String, BizApproveVO> approvalInfoMap = approvalFlowUtil.getApprovalCrossTenantInfoMap(guidSet);
+            Map<String, MfTdsConnectorIdentity> connectorIdentityMap = tdsConnectorIdentityService.getCrossTenantTdsConnectorIdentitys(guidSet);
+            for (MfTdsConnectorIdentityManagement item : pageList.getRecords()){
+                TdsConnectorIdentityManagementRSVO vo = convertToVO(item,false);
+                String guid = vo.getGuid();
+                if(ObjectUtils.isNotEmpty(approvalInfoMap) && approvalInfoMap.containsKey(guid)) {
+                    vo.setApproveVO(approvalInfoMap.get(guid));
+                }
+                if(ObjectUtils.isNotEmpty(connectorIdentityMap) && connectorIdentityMap.containsKey(guid)) {
+                    vo.setConnectorName(connectorIdentityMap.get(guid).getConnectorName());
+                    vo.setLegalEntity(connectorIdentityMap.get(guid).getLegalEntity());
+                }
+                results.add(vo);
+            }
+            rsPageList.setRecords(results);
+        }
     }
 
     //region 辅助操作

@@ -519,6 +519,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         if(StringUtils.isBlank(rqVO.getSourceBizGuid())){
             throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, String.format("%s参数为空。","原始数据Guid"));
         }
+        String message = validatorUtil.validateRetrunOne(rqVO);
+        if(StringUtils.isNotBlank(message)){
+            throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, message);
+        }
         MfTdsConnectorIdentity tdsConnectorIdentity = mfTdsConnectorIdentityService.getById(rqVO.getSourceBizGuid());
         if(ObjectUtils.isEmpty(tdsConnectorIdentity)){
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS,"变更数据不存在。");