Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
653402e3 by xiaojie
Options

【数据资产】 

1、连接器注册到数据港
1 parent e44f81a5
Inline Side-by-side
Showing 13 changed files with 333 additions and 30 deletions
src/main/java/com/csbr/qingcloud/portal/config/DataPortConfig.java
...@@ -23,4 +23,6 @@ public class DataPortConfig { ...@@ -23,4 +23,6 @@ public class DataPortConfig {
23 private String enterpriseRegisterUri; 23 private String enterpriseRegisterUri;
24 private String operatorUpdateUri; 24 private String operatorUpdateUri;
25 private String enterpriseUpdateUri; 25 private String enterpriseUpdateUri;
26 private String connectorRegisterUri;
27 private String destroyConnector;
26 } 28 }
......
src/main/java/com/csbr/qingcloud/portal/controller/DemandController.java
...@@ -4,10 +4,6 @@ import com.csbr.cloud.common.entity.CsbrUpdate; ...@@ -4,10 +4,6 @@ import com.csbr.cloud.common.entity.CsbrUpdate;
4 import com.csbr.cloud.common.response.CommonRes; 4 import com.csbr.cloud.common.response.CommonRes;
5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
6 import com.csbr.qingcloud.portal.domain.vo.*; 6 import com.csbr.qingcloud.portal.domain.vo.*;
7 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
8 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
9 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
10 import com.csbr.qingcloud.portal.service.DataPortService;
11 import com.csbr.qingcloud.portal.service.DemandService; 7 import com.csbr.qingcloud.portal.service.DemandService;
12 import csbr.cloud.entity.annotation.SystemLog; 8 import csbr.cloud.entity.annotation.SystemLog;
13 import csbr.cloud.entity.domain.base.vo.PageListVO; 9 import csbr.cloud.entity.domain.base.vo.PageListVO;
...@@ -132,23 +128,6 @@ public class DemandController { ...@@ -132,23 +128,6 @@ public class DemandController {
132 List<ProcessOrderProcessDtlRSVO> pageVO = demandService.listByProcessOrderNo(); 128 List<ProcessOrderProcessDtlRSVO> pageVO = demandService.listByProcessOrderNo();
133 return CommonRes.success(pageVO); 129 return CommonRes.success(pageVO);
134 } 130 }
135
136 @Resource
137 private MfEnterpriseService mfEnterpriseService;
138
139 @Resource
140 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
141
142 @Resource
143 private DataPortService dataPortService;
144
145 @GetMapping("/test")
146 public CommonRes getToken(@RequestParam String guid) {
147 MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
148 dataPortService.enterpriseUpdate(entity);
149 dataPortService.operatorUpdate(entity);
150 return CommonRes.success(Boolean.TRUE);
151 }
152 131
153 //endregion 132 //endregion
154 133
......
src/main/java/com/csbr/qingcloud/portal/controller/TdsConnectorIdentityController.java
...@@ -4,6 +4,7 @@ import com.csbr.cloud.common.enums.SystemError; ...@@ -4,6 +4,7 @@ import com.csbr.cloud.common.enums.SystemError;
4 import com.csbr.cloud.common.exception.CsbrSystemException; 4 import com.csbr.cloud.common.exception.CsbrSystemException;
5 import com.csbr.cloud.common.response.CommonRes; 5 import com.csbr.cloud.common.response.CommonRes;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
7 import com.csbr.qingcloud.portal.domain.vo.ConnectorIdentityRQVO;
7 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; 8 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
8 import csbr.cloud.entity.annotation.SystemLog; 9 import csbr.cloud.entity.annotation.SystemLog;
9 import csbr.cloud.entity.domain.base.vo.PageListVO; 10 import csbr.cloud.entity.domain.base.vo.PageListVO;
...@@ -129,6 +130,14 @@ public class TdsConnectorIdentityController { ...@@ -129,6 +130,14 @@ public class TdsConnectorIdentityController {
129 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.checkConnector(); 130 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.checkConnector();
130 return CommonRes.success(vo); 131 return CommonRes.success(vo);
131 } 132 }
133
134 @PostMapping("/update-identity")
135 @SystemLog(value = "连接器身份信息-修改接入连接器身份标识")
136 @Operation(summary = "连接器身份信息-修改接入连接器身份标识")
137 public CommonRes<Boolean> updateIdentity(@RequestBody ConnectorIdentityRQVO vo) {
138 tdsConnectorIdentityService.updateIdentity(vo);
139 return CommonRes.success(true);
140 }
132 //endregion 141 //endregion
133 142
134 } 143 }
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/ConnectorIdentityRQVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
4 import com.fasterxml.jackson.annotation.JsonFormat;
5 import io.swagger.v3.oas.annotations.media.Schema;
6 import jakarta.validation.constraints.NotBlank;
7 import jakarta.validation.constraints.NotNull;
8 import jakarta.validation.constraints.Size;
9 import lombok.Data;
10
11 import java.util.Date;
12 import java.util.List;
13
14 /**
15 * @program:
16 * @description: 连接器身份信息新增、修改参数
17 * @author: xup
18 * @create: 2025-08-20 15:13
19 **/
20 @Data
21 @Schema(title = "连接器身份标识参数")
22 public class ConnectorIdentityRQVO {
23
24 /**
25 * 系统唯一标识
26 */
27 @Schema(description = "系统唯一标识")
28 @NotBlank(message = "系统唯一标识为空.")
29 private String guid;
30
31 /**
32 * 接入连接器身份标识(由区域/行业功能节点下发，唯一标识连接器身份)
33 */
34 @Schema(description = "接入连接器身份标识(由区域/行业功能节点下发，唯一标识连接器身份)")
35 @NotBlank(message = "接入连接器身份标识为空.")
36 private String connectorIdentity;
37
38 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/dataPort/ConnectorRegisterRQVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo.dataPort;
2
3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data;
5
6 import java.util.List;
7
8 /**
9 * @program: daop-projects
10 * @description:
11 * @author: xiaojie
12 * @create: 2025-10-11 15:38
13 **/
14 @Data
15 @Schema(title = "连接器注册参数")
16 public class ConnectorRegisterRQVO {
17
18 @Schema(title = "连接器身份基本信息")
19 private IdentityBaseRQVO baseInfo;
20
21 @Schema(title = "连接器身份附加信息")
22 private IdentityExtendRQVO extendInfo;
23
24 @Schema(title = "连接器身份附件信息")
25 private AttachmentCommonVO attachInfo;
26
27 }
...\ No newline at end of file ...\ No newline at end of file
src/main/java/com/csbr/qingcloud/portal/domain/vo/dataPort/ConnectorRegisterRSVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo.dataPort;
2
3 import com.fasterxml.jackson.annotation.JsonFormat;
4 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data;
6
7 /**
8 * @program: daop-projects
9 * @description:
10 * @author: xiaojie
11 * @create: 2025-10-11 15:38
12 **/
13 @Data
14 @Schema(title = "连接器注册返回参数")
15 public class ConnectorRegisterRSVO {
16
17 @Schema(title = "接入连接器身份标识")
18 private String identityCode;
19
20 @Schema(title = "可信身份凭证（数字证书、DID 等），由平台认可的签发机构生成")
21 private String connectorCert;
22
23 @Schema(title = "凭证颁发日期（格式：YYYY-MM-DD）")
24 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
25 private String authTime;
26
27 @Schema(title = "可验证身份签发单位")
28 private String connectorIssueOrg;
29
30 }
...\ No newline at end of file ...\ No newline at end of file
src/main/java/com/csbr/qingcloud/portal/domain/vo/dataPort/IdentityBaseRQVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo.dataPort;
2
3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data;
5
6 import java.util.List;
7
8 /**
9 * @program: daop-projects
10 * @description:
11 * @author: xiaojie
12 * @create: 2025-10-11 15:38
13 **/
14 @Data
15 @Schema(title = "连接器身份基本参数")
16 public class IdentityBaseRQVO {
17
18 @Schema(title = "唯一身份标识")
19 private String identityCode;
20
21 @Schema(title = "接入连接器名称")
22 private String connectorName;
23
24 @Schema(title = "IP 地址列表")
25 private String connectorIpList;
26
27 @Schema(title = "域名列表")
28 private String connectorDomainList;
29
30 @Schema(title = "接入类型")
31 private String connectorJoinType;
32
33 @Schema(title = "所属法人或其他组织名称")
34 private String enterpriseName;
35
36 @Schema(title = "所属法人或其他组织 统一社会信用代码")
37 private String enterpriseCode;
38
39 }
...\ No newline at end of file ...\ No newline at end of file
src/main/java/com/csbr/qingcloud/portal/domain/vo/dataPort/IdentityExtendRQVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo.dataPort;
2
3 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data;
5
6 import java.util.List;
7
8 /**
9 * @program: daop-projects
10 * @description:
11 * @author: xiaojie
12 * @create: 2025-10-11 15:38
13 **/
14 @Data
15 @Schema(title = "连接器身份附加参数")
16 public class IdentityExtendRQVO {
17
18 @Schema(title = "供应商名称")
19 private String supplierName;
20
21 @Schema(title = "供应商统一社会信用代码")
22 private String supplierCode;
23
24 @Schema(title = "产品 SN 号")
25 private String connectorSN;
26
27 @Schema(title = "产品版本号")
28 private String connectorVersion;
29
30 @Schema(title = "连接器类型 1-标准型接入连接器 2-全功能型接入连接器")
31 private String connectorType;
32
33 @Schema(title = "物理设备唯一标识符（若有多台，只登记管理 服务器 mac 地址）")
34 private String connectorMac;
35
36 }
...\ No newline at end of file ...\ No newline at end of file
src/main/java/com/csbr/qingcloud/portal/service/DataPortService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityRSVO;
3 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 4 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
4 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove; 5 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
6 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
5 7
6 /** 8 /**
7 * @program: daop-projects 9 * @program: daop-projects
...@@ -34,4 +36,16 @@ public interface DataPortService { ...@@ -34,4 +36,16 @@ public interface DataPortService {
34 * @param entity 36 * @param entity
35 */ 37 */
36 void enterpriseUpdate(MfEnterpriseChangeApprove entity); 38 void enterpriseUpdate(MfEnterpriseChangeApprove entity);
39
40 /**
41 * 连接器注册
42 * @param entity
43 */
44 void connectorRegister(MfTdsConnectorIdentity entity);
45
46 /**
47 * 连接器注销
48 * @param identityCode
49 */
50 void destroyConnector(String identityCode);
37 } 51 }
...\ No newline at end of file ...\ No newline at end of file
......
src/main/java/com/csbr/qingcloud/portal/service/TdsConnectorIdentityService.java
...@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.service; ...@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 3 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
4 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 4 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
5 import com.csbr.qingcloud.portal.domain.vo.ConnectorIdentityRQVO;
5 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; 6 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
6 import csbr.cloud.entity.domain.base.vo.PageListVO; 7 import csbr.cloud.entity.domain.base.vo.PageListVO;
7 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityQueryVO; 8 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityQueryVO;
...@@ -114,4 +115,10 @@ public interface TdsConnectorIdentityService { ...@@ -114,4 +115,10 @@ public interface TdsConnectorIdentityService {
114 void crossFlowCallBack(BizCallbackDTO dto); 115 void crossFlowCallBack(BizCallbackDTO dto);
115 116
116 MfTdsConnectorIdentity getTdsConnectorIdentityById(String guid); 117 MfTdsConnectorIdentity getTdsConnectorIdentityById(String guid);
118
119 /**
120 * 修改接入连接器身份标识
121 * @param vo
122 */
123 void updateIdentity(ConnectorIdentityRQVO vo);
117 } 124 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/DataPortServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray;
5 import com.alibaba.fastjson.JSONObject;
4 import com.csbr.cloud.common.enums.RedisKeyEnum; 6 import com.csbr.cloud.common.enums.RedisKeyEnum;
5 import com.csbr.cloud.common.util.CsbrBeanUtil; 7 import com.csbr.cloud.common.util.CsbrBeanUtil;
6 import com.csbr.cloud.distributelock.util.RedisUtil; 8 import com.csbr.cloud.distributelock.util.RedisUtil;
7 import com.csbr.qingcloud.portal.config.DataPortConfig; 9 import com.csbr.qingcloud.portal.config.DataPortConfig;
8 import com.csbr.qingcloud.portal.domain.vo.dataPort.EnterpriseRegisterRQVO; 10 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalRSVO;
9 import com.csbr.qingcloud.portal.domain.vo.dataPort.EnterpriseSubordinateRQVO; 11 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityRSVO;
10 import com.csbr.qingcloud.portal.domain.vo.dataPort.OperatorRegisterRQVO; 12 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableRSVO;
11 import com.csbr.qingcloud.portal.domain.vo.dataPort.OperatorSubordinateRQVO; 13 import com.csbr.qingcloud.portal.domain.vo.dataPort.*;
12 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 14 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
13 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove; 15 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
16 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
17 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService;
14 import com.csbr.qingcloud.portal.service.DataPortService; 18 import com.csbr.qingcloud.portal.service.DataPortService;
19 import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService;
20 import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService;
15 import com.csbr.qingcloud.portal.util.DataPortConnectUtil; 21 import com.csbr.qingcloud.portal.util.DataPortConnectUtil;
22 import com.csbr.qingcloud.portal.util.InvokeUtil;
23 import com.csbr.qingcloud.portal.util.ZQConfig;
16 import jakarta.annotation.Resource; 24 import jakarta.annotation.Resource;
17 import lombok.extern.slf4j.Slf4j; 25 import lombok.extern.slf4j.Slf4j;
18 import org.apache.commons.lang3.ObjectUtils; 26 import org.apache.commons.lang3.ObjectUtils;
...@@ -20,9 +28,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -20,9 +28,7 @@ import org.apache.commons.lang3.StringUtils;
20 import org.springframework.stereotype.Service; 28 import org.springframework.stereotype.Service;
21 29
22 import java.text.SimpleDateFormat; 30 import java.text.SimpleDateFormat;
23 import java.util.Date; 31 import java.util.*;
24 import java.util.HashMap;
25 import java.util.Map;
26 32
27 /** 33 /**
28 * @program: daop-projects 34 * @program: daop-projects
...@@ -46,6 +52,21 @@ public class DataPortServiceImpl implements DataPortService { ...@@ -46,6 +52,21 @@ public class DataPortServiceImpl implements DataPortService {
46 @Resource 52 @Resource
47 private CsbrBeanUtil csbrBeanUtil; 53 private CsbrBeanUtil csbrBeanUtil;
48 54
55 @Resource
56 private ZQConfig zqConfig;
57
58 @Resource
59 private InvokeUtil invokeUtil;
60
61 @Resource
62 private TdsConnectorAdditionalService tdsConnectorAdditionalService;
63
64 @Resource
65 private TdsConnectorVerifiableService tdsConnectorVerifiableService;
66
67 @Resource
68 private MfTdsConnectorIdentityService mfTdsConnectorIdentityService;
69
49 @Override 70 @Override
50 public void operatorRegister(MfEnterprise entity) { 71 public void operatorRegister(MfEnterprise entity) {
51 log.info("======经办人用户注册开始======"); 72 log.info("======经办人用户注册开始======");
...@@ -80,6 +101,93 @@ public class DataPortServiceImpl implements DataPortService { ...@@ -80,6 +101,93 @@ public class DataPortServiceImpl implements DataPortService {
80 log.info("======法人用户更新结束======"); 101 log.info("======法人用户更新结束======");
81 } 102 }
82 103
104 @Override
105 public void connectorRegister(MfTdsConnectorIdentity entity) {
106 log.info("======连接器注册开始======");
107 ConnectorRegisterRQVO registerRQVO = beforeConnector(entity);
108 Object object = dataPortConnectUtil.postByAuthorization(registerRQVO, dataPortConfig.getConnectorRegisterUri());
109 ConnectorRegisterRSVO connectorRegisterRSVO = JSON.parseObject(JSON.toJSONString(object), ConnectorRegisterRSVO.class);
110 log.info("object, {}", object);
111 log.info("connectorRegisterRSVO, {}", connectorRegisterRSVO);
112 // 修改接入连接器身份标识
113 entity.setConnectorIdentity(connectorRegisterRSVO.getIdentityCode());
114 mfTdsConnectorIdentityService.updateById(entity);
115 // 修改主平台连接器身份标识
116 JSONObject jsonObject = new JSONObject();
117 jsonObject.put("bizCode", "TDSCONNECTOR");
118 jsonObject.put("operation", "XGSFBS");
119 JSONObject data = new JSONObject();
120 data.put("guid", entity.getGuid());
121 data.put("connectorIdentity", entity.getConnectorIdentity());
122 jsonObject.put("zqData", data);
123 invokeUtil.invokeMainDel(jsonObject, zqConfig.getAppKey(), zqConfig.getReceiveUrl());
124 log.info("======连接器注册结束======");
125 }
126
127 @Override
128 public void destroyConnector(String identityCode) {
129 log.info("======连接器注销开始======");
130 JSONObject jsonObject = new JSONObject();
131 jsonObject.put("identityCode", identityCode);
132 dataPortConnectUtil.postByAuthorization(jsonObject, dataPortConfig.getDestroyConnector());
133 log.info("======连接器注销结束======");
134 }
135
136 private ConnectorRegisterRQVO beforeConnector(MfTdsConnectorIdentity entity) {
137 ConnectorRegisterRQVO registerRQVO = new ConnectorRegisterRQVO();
138 IdentityBaseRQVO baseInfo = new IdentityBaseRQVO();
139 baseInfo.setConnectorName(entity.getConnectorName());
140 baseInfo.setIdentityCode(entity.getLegalSocialCreditCode());
141 if (ObjectUtils.isNotEmpty(entity.getIpAddressList())) {
142 baseInfo.setConnectorIpList(String.join("，", entity.getIpAddressList()));
143 }
144 if (ObjectUtils.isNotEmpty(entity.getDomainList())) {
145 baseInfo.setConnectorDomainList(String.join("，", entity.getDomainList()));
146 }
147 baseInfo.setConnectorJoinType(String.valueOf(entity.getAccessMethod()));
148 baseInfo.setEnterpriseName(entity.getLegalEntity());
149 baseInfo.setEnterpriseCode(entity.getLegalSocialCreditCode());
150 registerRQVO.setBaseInfo(baseInfo);
151
152 // 添加附加信息
153 TdsConnectorAdditionalRSVO tdsConnectorAdditional = tdsConnectorAdditionalService.getTdsConnectorAdditionalByConnectorGuid(entity.getGuid());
154 if (ObjectUtils.isNotEmpty(tdsConnectorAdditional)) {
155 IdentityExtendRQVO extendInfo = new IdentityExtendRQVO();
156 extendInfo.setSupplierName(tdsConnectorAdditional.getSupplierName());
157 extendInfo.setSupplierCode(tdsConnectorAdditional.getSupplierCode());
158 extendInfo.setConnectorSN(tdsConnectorAdditional.getProductSn());
159 extendInfo.setConnectorVersion(tdsConnectorAdditional.getProductVersion());
160 Integer connectorType = tdsConnectorAdditional.getConnectorType();
161 if (ObjectUtils.isNotEmpty(connectorType)) {
162 String connectorTypeStr;
163 if (connectorType == 0) {
164 connectorTypeStr = "1";
165 } else {
166 connectorTypeStr = "2";
167 }
168 extendInfo.setConnectorType(connectorTypeStr);
169 }
170 extendInfo.setConnectorMac(tdsConnectorAdditional.getDeviceMacAddress());
171 registerRQVO.setExtendInfo(extendInfo);
172 }
173
174 // 添加附件信息
175 TdsConnectorVerifiableRSVO tdsConnectorVerifiable = tdsConnectorVerifiableService.getTdsConnectorVerifiableByConnectorGuid(entity.getGuid());
176 if (ObjectUtils.isNotEmpty(tdsConnectorVerifiable)) {
177 JSONArray levelProtectionEvaluationResults = tdsConnectorVerifiable.getLevelProtectionEvaluationResults();
178 if (ObjectUtils.isNotEmpty(levelProtectionEvaluationResults)) {
179 AttachmentCommonVO attachInfo = new AttachmentCommonVO();
180 JSONObject jsonObject = levelProtectionEvaluationResults.getJSONObject(0);
181 attachInfo.setAttachType("等级保护测评结果");
182 String name = jsonObject.getString("name");
183 attachInfo.setAttachName(StringUtils.isNotEmpty(name) ? name.split("\\.")[0] : name);
184 attachInfo.setVerifyUrl(jsonObject.getString("url"));
185 registerRQVO.setAttachInfo(attachInfo);
186 }
187 }
188 return registerRQVO;
189 }
190
83 /** 191 /**
84 * 经办人注册前置 192 * 经办人注册前置
85 * @param entity 193 * @param entity
......
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityServiceImpl.java
...@@ -18,6 +18,7 @@ import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; ...@@ -18,6 +18,7 @@ import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
18 import com.csbr.cloud.workflow.util.ApprovalFlowUtil; 18 import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
19 import com.csbr.cloud.workflow.util.FlowAbstractImpl; 19 import com.csbr.cloud.workflow.util.FlowAbstractImpl;
20 import com.csbr.qingcloud.portal.domain.vo.*; 20 import com.csbr.qingcloud.portal.domain.vo.*;
21 import com.csbr.qingcloud.portal.service.DataPortService;
21 import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService; 22 import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService;
22 import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService; 23 import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService;
23 import com.csbr.qingcloud.portal.util.IdentificationCodeUtil; 24 import com.csbr.qingcloud.portal.util.IdentificationCodeUtil;
...@@ -90,6 +91,9 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -90,6 +91,9 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
90 @Resource 91 @Resource
91 private ValidatorUtil validatorUtil; 92 private ValidatorUtil validatorUtil;
92 93
94 @Resource
95 private DataPortService dataPortService;
96
93 /** 97 /**
94 * 连接器身份信息分页查询 98 * 连接器身份信息分页查询
95 * @author xup 99 * @author xup
...@@ -491,6 +495,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -491,6 +495,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
491 if("Y".equals(entity.getIsChangeData())) { 495 if("Y".equals(entity.getIsChangeData())) {
492 changSourceConnectorInentity(entity); 496 changSourceConnectorInentity(entity);
493 } 497 }
498 dataPortService.connectorRegister(entity);
494 } 499 }
495 //驳回和撤销是，修改原来数据状态 500 //驳回和撤销是，修改原来数据状态
496 if(ApprovalStateEnum.REJECT.getValue().equals(dto.getApprovalState()) 501 if(ApprovalStateEnum.REJECT.getValue().equals(dto.getApprovalState())
...@@ -508,6 +513,15 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -508,6 +513,15 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
508 return mfTdsConnectorIdentityService.getById(guid); 513 return mfTdsConnectorIdentityService.getById(guid);
509 } 514 }
510 515
516 @Override
517 public void updateIdentity(ConnectorIdentityRQVO vo) {
518 MfTdsConnectorIdentity entity = mfTdsConnectorIdentityService.getById(vo.getGuid());
519 if (ObjectUtils.isNotEmpty(entity)) {
520 entity.setConnectorIdentity(vo.getConnectorIdentity());
521 mfTdsConnectorIdentityService.updateById(entity);
522 }
523 }
524
511 @Transactional 525 @Transactional
512 public void afterChangeSaveTdsConnectorIdentity(String guid, MfTdsConnectorIdentity oldTdsConnectorIdentity, 526 public void afterChangeSaveTdsConnectorIdentity(String guid, MfTdsConnectorIdentity oldTdsConnectorIdentity,
513 Boolean isRestart) { 527 Boolean isRestart) {
......
src/main/java/com/csbr/qingcloud/portal/util/DataPortConnectUtil.java
...@@ -115,7 +115,7 @@ public class DataPortConnectUtil { ...@@ -115,7 +115,7 @@ public class DataPortConnectUtil {
115 DataPortRes dataPortRes = restTemplate.postForObject( 115 DataPortRes dataPortRes = restTemplate.postForObject(
116 dataPortConfig.getRequestUri() + uri 116 dataPortConfig.getRequestUri() + uri
117 , request, DataPortRes.class); 117 , request, DataPortRes.class);
118 118 log.info("======调用数据港接口(authKey调用)======, {}", dataPortRes);
119 if (ObjectUtils.isEmpty(dataPortRes)) { 119 if (ObjectUtils.isEmpty(dataPortRes)) {
120 throw new CsbrSystemException(SystemError.DATA_GET_ERROR, "调用数据港接口失败."); 120 throw new CsbrSystemException(SystemError.DATA_GET_ERROR, "调用数据港接口失败.");
121 } 121 }
...@@ -138,7 +138,7 @@ public class DataPortConnectUtil { ...@@ -138,7 +138,7 @@ public class DataPortConnectUtil {
138 DataPortRes dataPortRes = restTemplate.postForObject( 138 DataPortRes dataPortRes = restTemplate.postForObject(
139 dataPortConfig.getRequestUri() + uri 139 dataPortConfig.getRequestUri() + uri
140 , request, DataPortRes.class); 140 , request, DataPortRes.class);
141 141 log.info("======调用数据港接口(Authorization调用)======, {}", dataPortRes);
142 if (ObjectUtils.isEmpty(dataPortRes)) { 142 if (ObjectUtils.isEmpty(dataPortRes)) {
143 throw new CsbrSystemException(SystemError.DATA_GET_ERROR, "调用数据港接口失败."); 143 throw new CsbrSystemException(SystemError.DATA_GET_ERROR, "调用数据港接口失败.");
144 } 144 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!