可信空间修改
Showing
9 changed files
with
174 additions
and
13 deletions
... | @@ -5,13 +5,11 @@ import com.alibaba.fastjson2.JSON; | ... | @@ -5,13 +5,11 @@ import com.alibaba.fastjson2.JSON; |
5 | import com.csbr.cloud.common.response.CommonRes; | 5 | import com.csbr.cloud.common.response.CommonRes; |
6 | import com.csbr.qingcloud.portal.domain.vo.TdsUserIdentityRQVO; | 6 | import com.csbr.qingcloud.portal.domain.vo.TdsUserIdentityRQVO; |
7 | import com.csbr.qingcloud.portal.enums.TdsDataTypeEnum; | 7 | import com.csbr.qingcloud.portal.enums.TdsDataTypeEnum; |
8 | import com.csbr.qingcloud.portal.service.TdsSyncToRegionalNodeCallback; | ||
9 | import com.csbr.qingcloud.portal.service.TdsUserIdentityService; | 8 | import com.csbr.qingcloud.portal.service.TdsUserIdentityService; |
10 | import csbr.cloud.entity.annotation.SystemLog; | 9 | import csbr.cloud.entity.annotation.SystemLog; |
11 | import io.swagger.v3.oas.annotations.Operation; | 10 | import io.swagger.v3.oas.annotations.Operation; |
12 | import io.swagger.v3.oas.annotations.tags.Tag; | 11 | import io.swagger.v3.oas.annotations.tags.Tag; |
13 | import jakarta.annotation.Resource; | 12 | import jakarta.annotation.Resource; |
14 | import jakarta.validation.Valid; | ||
15 | import org.springframework.web.bind.annotation.*; | 13 | import org.springframework.web.bind.annotation.*; |
16 | 14 | ||
17 | /** | 15 | /** | ... | ... |
... | @@ -2,6 +2,8 @@ package com.csbr.qingcloud.portal.domain.vo; | ... | @@ -2,6 +2,8 @@ package com.csbr.qingcloud.portal.domain.vo; |
2 | 2 | ||
3 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
4 | import com.fasterxml.jackson.annotation.JsonFormat; | 4 | import com.fasterxml.jackson.annotation.JsonFormat; |
5 | import jakarta.validation.constraints.NotBlank; | ||
6 | import jakarta.validation.constraints.NotNull; | ||
5 | import jakarta.validation.constraints.Size; | 7 | import jakarta.validation.constraints.Size; |
6 | import lombok.Data; | 8 | import lombok.Data; |
7 | import java.util.Date; | 9 | import java.util.Date; |
... | @@ -33,6 +35,7 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -33,6 +35,7 @@ public class TdsConnectorAdditionalRQVO { |
33 | */ | 35 | */ |
34 | @Schema(description = "可验证身份签发单位") | 36 | @Schema(description = "可验证身份签发单位") |
35 | @Size(max = 100, message = "可验证身份签发单位长度超过100") | 37 | @Size(max = 100, message = "可验证身份签发单位长度超过100") |
38 | @NotBlank(message = "可验证身份签发单位为空。") | ||
36 | private String identityIssuingUnit; | 39 | private String identityIssuingUnit; |
37 | 40 | ||
38 | /** | 41 | /** |
... | @@ -40,6 +43,7 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -40,6 +43,7 @@ public class TdsConnectorAdditionalRQVO { |
40 | */ | 43 | */ |
41 | @Schema(description = "供应商名称") | 44 | @Schema(description = "供应商名称") |
42 | @Size(max = 100, message = "供应商名称长度超过100") | 45 | @Size(max = 100, message = "供应商名称长度超过100") |
46 | @NotBlank(message = "供应商名称为空。") | ||
43 | private String supplierName; | 47 | private String supplierName; |
44 | 48 | ||
45 | /** | 49 | /** |
... | @@ -47,6 +51,7 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -47,6 +51,7 @@ public class TdsConnectorAdditionalRQVO { |
47 | */ | 51 | */ |
48 | @Schema(description = "供应商代码") | 52 | @Schema(description = "供应商代码") |
49 | @Size(max = 50, message = "供应商代码长度超过50") | 53 | @Size(max = 50, message = "供应商代码长度超过50") |
54 | @NotBlank(message = "供应商代码为空。") | ||
50 | private String supplierCode; | 55 | private String supplierCode; |
51 | 56 | ||
52 | /** | 57 | /** |
... | @@ -54,6 +59,7 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -54,6 +59,7 @@ public class TdsConnectorAdditionalRQVO { |
54 | */ | 59 | */ |
55 | @Schema(description = "产品SN号") | 60 | @Schema(description = "产品SN号") |
56 | @Size(max = 20, message = "产品SN号长度超过20") | 61 | @Size(max = 20, message = "产品SN号长度超过20") |
62 | @NotBlank(message = "产品SN号为空。") | ||
57 | private String productSn; | 63 | private String productSn; |
58 | 64 | ||
59 | /** | 65 | /** |
... | @@ -61,12 +67,14 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -61,12 +67,14 @@ public class TdsConnectorAdditionalRQVO { |
61 | */ | 67 | */ |
62 | @Schema(description = "产品版本号") | 68 | @Schema(description = "产品版本号") |
63 | @Size(max = 20, message = "产品版本号长度超过20") | 69 | @Size(max = 20, message = "产品版本号长度超过20") |
70 | @NotBlank(message = "产品版本号为空。") | ||
64 | private String productVersion; | 71 | private String productVersion; |
65 | 72 | ||
66 | /** | 73 | /** |
67 | * 连接器类型(0 标准型;1 全功能型) | 74 | * 连接器类型(0 标准型;1 全功能型) |
68 | */ | 75 | */ |
69 | @Schema(description = "连接器类型(0 标准型;1 全功能型)") | 76 | @Schema(description = "连接器类型(0 标准型;1 全功能型)") |
77 | @NotNull(message = "连接器类型为空。") | ||
70 | private Integer connectorType; | 78 | private Integer connectorType; |
71 | 79 | ||
72 | /** | 80 | /** |
... | @@ -74,6 +82,7 @@ public class TdsConnectorAdditionalRQVO { | ... | @@ -74,6 +82,7 @@ public class TdsConnectorAdditionalRQVO { |
74 | */ | 82 | */ |
75 | @Schema(description = "设备MAC地址") | 83 | @Schema(description = "设备MAC地址") |
76 | @Size(max = 50, message = "设备MAC地址长度超过50") | 84 | @Size(max = 50, message = "设备MAC地址长度超过50") |
85 | @NotBlank(message = "设备MAC地址为空。") | ||
77 | private String deviceMacAddress; | 86 | private String deviceMacAddress; |
78 | 87 | ||
79 | /******** 库表存储属性 需处理 *****/ | 88 | /******** 库表存储属性 需处理 *****/ | ... | ... |
... | @@ -31,6 +31,7 @@ public class TdsConnectorIdentityRQVO { | ... | @@ -31,6 +31,7 @@ public class TdsConnectorIdentityRQVO { |
31 | */ | 31 | */ |
32 | @Schema(description = "接入连接器名称") | 32 | @Schema(description = "接入连接器名称") |
33 | @Size(max = 50, message = "接入连接器名称长度超过50") | 33 | @Size(max = 50, message = "接入连接器名称长度超过50") |
34 | @NotBlank(message = "接入连接器名称为空。") | ||
34 | private String connectorName; | 35 | private String connectorName; |
35 | 36 | ||
36 | /** | 37 | /** | ... | ... |
... | @@ -2,6 +2,8 @@ package com.csbr.qingcloud.portal.domain.vo; | ... | @@ -2,6 +2,8 @@ package com.csbr.qingcloud.portal.domain.vo; |
2 | 2 | ||
3 | import io.swagger.v3.oas.annotations.media.Schema; | 3 | import io.swagger.v3.oas.annotations.media.Schema; |
4 | import com.fasterxml.jackson.annotation.JsonFormat; | 4 | import com.fasterxml.jackson.annotation.JsonFormat; |
5 | import jakarta.validation.constraints.NotBlank; | ||
6 | import jakarta.validation.constraints.NotNull; | ||
5 | import jakarta.validation.constraints.Size; | 7 | import jakarta.validation.constraints.Size; |
6 | import lombok.Data; | 8 | import lombok.Data; |
7 | import java.util.Date; | 9 | import java.util.Date; |
... | @@ -33,6 +35,7 @@ public class TdsConnectorVerifiableRQVO { | ... | @@ -33,6 +35,7 @@ public class TdsConnectorVerifiableRQVO { |
33 | * 网络接入资质认证 | 35 | * 网络接入资质认证 |
34 | */ | 36 | */ |
35 | @Schema(description = "网络接入资质认证") | 37 | @Schema(description = "网络接入资质认证") |
38 | @NotNull(message = "网络接入资质认证为空。") | ||
36 | private Map<String,String> networkAccessQualification; | 39 | private Map<String,String> networkAccessQualification; |
37 | 40 | ||
38 | /** | 41 | /** |
... | @@ -40,54 +43,63 @@ public class TdsConnectorVerifiableRQVO { | ... | @@ -40,54 +43,63 @@ public class TdsConnectorVerifiableRQVO { |
40 | */ | 43 | */ |
41 | @Schema(description = "等级保护测评结果") | 44 | @Schema(description = "等级保护测评结果") |
42 | @Size(max = 200, message = "等级保护测评结果长度超过200") | 45 | @Size(max = 200, message = "等级保护测评结果长度超过200") |
46 | @NotBlank(message = "等级保护测评结果为空。") | ||
43 | private String levelProtectionEvaluationResults; | 47 | private String levelProtectionEvaluationResults; |
44 | 48 | ||
45 | /** | 49 | /** |
46 | * 网络安全产品备案证明 | 50 | * 网络安全产品备案证明 |
47 | */ | 51 | */ |
48 | @Schema(description = "网络安全产品备案证明") | 52 | @Schema(description = "网络安全产品备案证明") |
53 | @NotNull(message = "网络安全产品备案证明为空。") | ||
49 | private Map<String,String> networkSecurityFilingCertificate; | 54 | private Map<String,String> networkSecurityFilingCertificate; |
50 | 55 | ||
51 | /** | 56 | /** |
52 | * 加密模块认证 | 57 | * 加密模块认证 |
53 | */ | 58 | */ |
54 | @Schema(description = "加密模块认证") | 59 | @Schema(description = "加密模块认证") |
60 | @NotNull(message = "加密模块认证为空。") | ||
55 | private Map<String,String> encryptionModuleAuthentication; | 61 | private Map<String,String> encryptionModuleAuthentication; |
56 | 62 | ||
57 | /** | 63 | /** |
58 | * 软件供应链合规声明 | 64 | * 软件供应链合规声明 |
59 | */ | 65 | */ |
60 | @Schema(description = "软件供应链合规声明") | 66 | @Schema(description = "软件供应链合规声明") |
67 | @NotNull(message = "软件供应链合规声明为空。") | ||
61 | private Map<String,String> softwareScmStatemen; | 68 | private Map<String,String> softwareScmStatemen; |
62 | 69 | ||
63 | /** | 70 | /** |
64 | * 安全漏洞修复声明 | 71 | * 安全漏洞修复声明 |
65 | */ | 72 | */ |
66 | @Schema(description = "安全漏洞修复声明") | 73 | @Schema(description = "安全漏洞修复声明") |
74 | @NotNull(message = "安全漏洞修复声明为空。") | ||
67 | private Map<String,String> securityLoopholeRepairStatement; | 75 | private Map<String,String> securityLoopholeRepairStatement; |
68 | 76 | ||
69 | /** | 77 | /** |
70 | * 通信协议兼容性认证 | 78 | * 通信协议兼容性认证 |
71 | */ | 79 | */ |
72 | @Schema(description = "通信协议兼容性认证") | 80 | @Schema(description = "通信协议兼容性认证") |
81 | @NotNull(message = "通信协议兼容性认证为空。") | ||
73 | private Map<String,String> communicationProtocolCompatibilityCertification; | 82 | private Map<String,String> communicationProtocolCompatibilityCertification; |
74 | 83 | ||
75 | /** | 84 | /** |
76 | * 硬件可信执行环境(TEE)认证 | 85 | * 硬件可信执行环境(TEE)认证 |
77 | */ | 86 | */ |
78 | @Schema(description = "硬件可信执行环境(TEE)认证") | 87 | @Schema(description = "硬件可信执行环境(TEE)认证") |
88 | @NotNull(message = "硬件可信执行环境(TEE)认证为空。") | ||
79 | private Map<String,String> teeCertification; | 89 | private Map<String,String> teeCertification; |
80 | 90 | ||
81 | /** | 91 | /** |
82 | * 接入行为审计合规报告 | 92 | * 接入行为审计合规报告 |
83 | */ | 93 | */ |
84 | @Schema(description = "接入行为审计合规报告") | 94 | @Schema(description = "接入行为审计合规报告") |
95 | @NotNull(message = "接入行为审计合规报告为空。") | ||
85 | private Map<String,String> accessAuditReport; | 96 | private Map<String,String> accessAuditReport; |
86 | 97 | ||
87 | /** | 98 | /** |
88 | * 第三方认证声明 | 99 | * 第三方认证声明 |
89 | */ | 100 | */ |
90 | @Schema(description = "第三方认证声明") | 101 | @Schema(description = "第三方认证声明") |
102 | @NotNull(message = "第三方认证声明为空。") | ||
91 | private Map<String,String> thirdPartyCertification; | 103 | private Map<String,String> thirdPartyCertification; |
92 | 104 | ||
93 | /******** 库表存储属性 需处理 *****/ | 105 | /******** 库表存储属性 需处理 *****/ | ... | ... |
... | @@ -68,5 +68,17 @@ public interface TdsConnectorAdditionalService { | ... | @@ -68,5 +68,17 @@ public interface TdsConnectorAdditionalService { |
68 | * @return void | 68 | * @return void |
69 | */ | 69 | */ |
70 | void removeHandleByGuids(List<String> guids); | 70 | void removeHandleByGuids(List<String> guids); |
71 | 71 | ||
72 | /** | ||
73 | * 根据connectorGuid查询连接器附加信息 | ||
74 | * @param connectorGuid | ||
75 | * @return | ||
76 | */ | ||
77 | TdsConnectorAdditionalRSVO getTdsConnectorAdditionalByConnectorGuid(String connectorGuid); | ||
78 | |||
79 | /** | ||
80 | * 根据connectorGuid删除连接器附加信息 | ||
81 | * @param connectorGuids | ||
82 | */ | ||
83 | void removeByConnectorGuids(List<String> connectorGuids); | ||
72 | } | 84 | } | ... | ... |
... | @@ -68,5 +68,17 @@ public interface TdsConnectorVerifiableService { | ... | @@ -68,5 +68,17 @@ public interface TdsConnectorVerifiableService { |
68 | * @return void | 68 | * @return void |
69 | */ | 69 | */ |
70 | void removeHandleByGuids(List<String> guids); | 70 | void removeHandleByGuids(List<String> guids); |
71 | 71 | ||
72 | /** | ||
73 | * 根据connectorGuid查询连接器可验信息 | ||
74 | * @param connectorGuid | ||
75 | * @return | ||
76 | */ | ||
77 | TdsConnectorVerifiableRSVO getTdsConnectorVerifiableByConnectorGuid(String connectorGuid); | ||
78 | |||
79 | /** | ||
80 | * 根据connectorGuid删除连接器可验信息 | ||
81 | * @param connectorGuids | ||
82 | */ | ||
83 | void removeByConnectorGuids(List<String> connectorGuids); | ||
72 | } | 84 | } | ... | ... |
1 | package com.csbr.qingcloud.portal.service.impl; | 1 | package com.csbr.qingcloud.portal.service.impl; |
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | ||
5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||
4 | import com.csbr.cloud.common.enums.SystemError; | 6 | import com.csbr.cloud.common.enums.SystemError; |
5 | import com.csbr.cloud.common.exception.CsbrSystemException; | 7 | import com.csbr.cloud.common.exception.CsbrSystemException; |
6 | import com.csbr.cloud.common.util.CommonUtil; | 8 | import com.csbr.cloud.common.util.CommonUtil; |
7 | import com.csbr.cloud.common.util.CsbrBeanUtil; | 9 | import com.csbr.cloud.common.util.CsbrBeanUtil; |
8 | import com.csbr.cloud.common.util.MessageSourceUtil; | 10 | import com.csbr.cloud.common.util.MessageSourceUtil; |
9 | import csbr.cloud.entity.domain.base.vo.PageListVO; | ||
10 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalQueryVO; | 11 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalQueryVO; |
11 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalRQVO; | 12 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalRQVO; |
12 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalRSVO; | 13 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorAdditionalRSVO; |
13 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorAdditional; | 14 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorAdditional; |
14 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorAdditionalService; | 15 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorAdditionalService; |
15 | import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService; | 16 | import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService; |
17 | import csbr.cloud.entity.domain.base.vo.PageListVO; | ||
16 | import jakarta.annotation.Resource; | 18 | import jakarta.annotation.Resource; |
17 | import lombok.extern.slf4j.Slf4j; | 19 | import lombok.extern.slf4j.Slf4j; |
18 | import org.apache.commons.collections.CollectionUtils; | 20 | import org.apache.commons.collections.CollectionUtils; |
21 | import org.apache.commons.lang3.ObjectUtils; | ||
19 | import org.apache.commons.lang3.StringUtils; | 22 | import org.apache.commons.lang3.StringUtils; |
20 | import org.springframework.stereotype.Service; | 23 | import org.springframework.stereotype.Service; |
21 | import org.springframework.transaction.annotation.Transactional; | 24 | import org.springframework.transaction.annotation.Transactional; |
... | @@ -180,6 +183,30 @@ public class TdsConnectorAdditionalServiceImpl implements TdsConnectorAdditional | ... | @@ -180,6 +183,30 @@ public class TdsConnectorAdditionalServiceImpl implements TdsConnectorAdditional |
180 | } | 183 | } |
181 | } | 184 | } |
182 | 185 | ||
186 | @Override | ||
187 | public TdsConnectorAdditionalRSVO getTdsConnectorAdditionalByConnectorGuid(String connectorGuid) { | ||
188 | if(StringUtils.isBlank(connectorGuid)){ | ||
189 | return new TdsConnectorAdditionalRSVO(); | ||
190 | } | ||
191 | LambdaQueryWrapper<MfTdsConnectorAdditional> queryWrapper = Wrappers.lambdaQuery(); | ||
192 | queryWrapper.eq(MfTdsConnectorAdditional::getConnectorGuid,connectorGuid); | ||
193 | List<MfTdsConnectorAdditional> list = mfTdsConnectorAdditionalService.list(queryWrapper); | ||
194 | if(ObjectUtils.isEmpty(list)){ | ||
195 | return new TdsConnectorAdditionalRSVO(); | ||
196 | } | ||
197 | return convertToVO(list.get(0)); | ||
198 | } | ||
199 | |||
200 | @Override | ||
201 | public void removeByConnectorGuids(List<String> connectorGuids) { | ||
202 | if(ObjectUtils.isEmpty(connectorGuids)){ | ||
203 | return; | ||
204 | } | ||
205 | LambdaUpdateWrapper<MfTdsConnectorAdditional> removeWrapper = Wrappers.lambdaUpdate(); | ||
206 | removeWrapper.in(MfTdsConnectorAdditional::getConnectorGuid,connectorGuids); | ||
207 | mfTdsConnectorAdditionalService.remove(removeWrapper); | ||
208 | } | ||
209 | |||
183 | /** | 210 | /** |
184 | * 连接器附加信息新新增前置处理 | 211 | * 连接器附加信息新新增前置处理 |
185 | * @author xup | 212 | * @author xup | ... | ... |
1 | package com.csbr.qingcloud.portal.service.impl; | 1 | package com.csbr.qingcloud.portal.service.impl; |
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||
4 | import com.csbr.cloud.common.enums.SystemError; | 5 | import com.csbr.cloud.common.enums.SystemError; |
5 | import com.csbr.cloud.common.exception.CsbrSystemException; | 6 | import com.csbr.cloud.common.exception.CsbrSystemException; |
6 | import com.csbr.cloud.common.util.CommonUtil; | 7 | import com.csbr.cloud.common.util.CommonUtil; |
7 | import com.csbr.cloud.common.util.CsbrBeanUtil; | 8 | import com.csbr.cloud.common.util.CsbrBeanUtil; |
8 | import com.csbr.cloud.common.util.MessageSourceUtil; | 9 | import com.csbr.cloud.common.util.MessageSourceUtil; |
10 | import com.csbr.qingcloud.portal.domain.vo.*; | ||
11 | import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService; | ||
12 | import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService; | ||
9 | import csbr.cloud.entity.domain.base.vo.PageListVO; | 13 | import csbr.cloud.entity.domain.base.vo.PageListVO; |
10 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityQueryVO; | ||
11 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityRQVO; | ||
12 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityRSVO; | ||
13 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; | 14 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; |
14 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService; | 15 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService; |
15 | import com.csbr.qingcloud.portal.service.TdsConnectorIdentityService; | 16 | import com.csbr.qingcloud.portal.service.TdsConnectorIdentityService; |
16 | import jakarta.annotation.Resource; | 17 | import jakarta.annotation.Resource; |
17 | import lombok.extern.slf4j.Slf4j; | 18 | import lombok.extern.slf4j.Slf4j; |
18 | import org.apache.commons.collections.CollectionUtils; | 19 | import org.apache.commons.collections.CollectionUtils; |
20 | import org.apache.commons.lang3.ObjectUtils; | ||
19 | import org.apache.commons.lang3.StringUtils; | 21 | import org.apache.commons.lang3.StringUtils; |
20 | import org.springframework.stereotype.Service; | 22 | import org.springframework.stereotype.Service; |
21 | import org.springframework.transaction.annotation.Transactional; | 23 | import org.springframework.transaction.annotation.Transactional; |
... | @@ -48,6 +50,12 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -48,6 +50,12 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
48 | @Resource | 50 | @Resource |
49 | private MessageSourceUtil messageSourceUtil; | 51 | private MessageSourceUtil messageSourceUtil; |
50 | 52 | ||
53 | @Resource | ||
54 | private TdsConnectorVerifiableService tdsConnectorVerifiableService; | ||
55 | |||
56 | @Resource | ||
57 | private TdsConnectorAdditionalService tdsConnectorAdditionalService; | ||
58 | |||
51 | /** | 59 | /** |
52 | * 连接器身份信息分页查询 | 60 | * 连接器身份信息分页查询 |
53 | * @author xup | 61 | * @author xup |
... | @@ -84,7 +92,11 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -84,7 +92,11 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
84 | if (entity == null) { | 92 | if (entity == null) { |
85 | throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME))); | 93 | throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME))); |
86 | } | 94 | } |
87 | return convertToVO(entity); | 95 | TdsConnectorIdentityRSVO vo = convertToVO(entity); |
96 | //查询附件信息和验证信息 | ||
97 | vo.setTdsConnectorAdditional(tdsConnectorAdditionalService.getTdsConnectorAdditionalByConnectorGuid(vo.getGuid())); | ||
98 | vo.setTdsConnectorVerifiable(tdsConnectorVerifiableService.getTdsConnectorVerifiableByConnectorGuid(vo.getGuid())); | ||
99 | return vo; | ||
88 | } | 100 | } |
89 | 101 | ||
90 | /** | 102 | /** |
... | @@ -99,6 +111,7 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -99,6 +111,7 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
99 | public void saveTdsConnectorIdentity(TdsConnectorIdentityRQVO rqVO) { | 111 | public void saveTdsConnectorIdentity(TdsConnectorIdentityRQVO rqVO) { |
100 | beforeSave(rqVO); | 112 | beforeSave(rqVO); |
101 | MfTdsConnectorIdentity entity = convertToEntity(rqVO); | 113 | MfTdsConnectorIdentity entity = convertToEntity(rqVO); |
114 | rqVO.setGuid(entity.getGuid()); | ||
102 | mfTdsConnectorIdentityService.csbrAddEntity(entity); | 115 | mfTdsConnectorIdentityService.csbrAddEntity(entity); |
103 | boolean flag = mfTdsConnectorIdentityService.save(entity); | 116 | boolean flag = mfTdsConnectorIdentityService.save(entity); |
104 | if (!flag) { | 117 | if (!flag) { |
... | @@ -152,6 +165,9 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -152,6 +165,9 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
152 | if (!flag) { | 165 | if (!flag) { |
153 | throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, messageSourceUtil.delMessage(FUNCTION_NAME)); | 166 | throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, messageSourceUtil.delMessage(FUNCTION_NAME)); |
154 | } | 167 | } |
168 | //删除附件信息和验证信息 | ||
169 | tdsConnectorVerifiableService.removeByConnectorGuids(guids); | ||
170 | tdsConnectorAdditionalService.removeByConnectorGuids(guids); | ||
155 | } | 171 | } |
156 | 172 | ||
157 | /** | 173 | /** |
... | @@ -189,6 +205,9 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -189,6 +205,9 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
189 | */ | 205 | */ |
190 | private void beforeSave(TdsConnectorIdentityRQVO rqVO) { | 206 | private void beforeSave(TdsConnectorIdentityRQVO rqVO) { |
191 | //region 1.输入基础验证 | 207 | //region 1.输入基础验证 |
208 | if(ObjectUtils.isEmpty(rqVO)){ | ||
209 | throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, String.format("%s参数为空。",FUNCTION_NAME)); | ||
210 | } | ||
192 | //endregion | 211 | //endregion |
193 | 212 | ||
194 | //region 2.数据验证特殊处理 | 213 | //region 2.数据验证特殊处理 |
... | @@ -196,8 +215,8 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -196,8 +215,8 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
196 | //endregion 2.1.业务合规性验证 | 215 | //endregion 2.1.业务合规性验证 |
197 | 216 | ||
198 | //region 2.2.业务数据验证 | 217 | //region 2.2.业务数据验证 |
199 | //endregion 2.2.业务数据验证 | 218 | //验证接入连接器名称唯一性 |
200 | 219 | verifyUniqueness(rqVO); | |
201 | //endregion 2.数据验证特殊处理 | 220 | //endregion 2.数据验证特殊处理 |
202 | 221 | ||
203 | //region 3.数据转换处理 | 222 | //region 3.数据转换处理 |
... | @@ -223,6 +242,21 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -223,6 +242,21 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
223 | } | 242 | } |
224 | 243 | ||
225 | /** | 244 | /** |
245 | * 验证接入连接器名称唯一性 | ||
246 | * @param rqVO | ||
247 | */ | ||
248 | private void verifyUniqueness(TdsConnectorIdentityRQVO rqVO) { | ||
249 | LambdaQueryWrapper<MfTdsConnectorIdentity> queryWrapper = Wrappers.lambdaQuery(); | ||
250 | if(StringUtils.isNotBlank(rqVO.getGuid())){ | ||
251 | queryWrapper.ne(MfTdsConnectorIdentity::getGuid,rqVO.getGuid()); | ||
252 | } | ||
253 | queryWrapper.eq(MfTdsConnectorIdentity::getConnectorName,rqVO.getConnectorName()); | ||
254 | if(mfTdsConnectorIdentityService.count(queryWrapper)>0){ | ||
255 | throw new CsbrSystemException(SystemError.DATA_ALREADY_EXISTS,"接入连接器名称已经存在。"); | ||
256 | } | ||
257 | } | ||
258 | |||
259 | /** | ||
226 | * 连接器身份信息新增后置处理 | 260 | * 连接器身份信息新增后置处理 |
227 | * @author xup | 261 | * @author xup |
228 | * @date 2025-08-20 15:13 | 262 | * @date 2025-08-20 15:13 |
... | @@ -233,6 +267,14 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -233,6 +267,14 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
233 | //region 1.输出特殊转换 | 267 | //region 1.输出特殊转换 |
234 | 268 | ||
235 | //region 1.1.输出过滤与补充处理 | 269 | //region 1.1.输出过滤与补充处理 |
270 | if(ObjectUtils.isNotEmpty(rqVO.getTdsConnectorAdditional())){ | ||
271 | rqVO.getTdsConnectorAdditional().setConnectorGuid(rqVO.getGuid()); | ||
272 | tdsConnectorAdditionalService.saveTdsConnectorAdditional(rqVO.getTdsConnectorAdditional()); | ||
273 | } | ||
274 | if(ObjectUtils.isNotEmpty(rqVO.getTdsConnectorVerifiable())){ | ||
275 | rqVO.getTdsConnectorVerifiable().setConnectorGuid(rqVO.getGuid()); | ||
276 | tdsConnectorVerifiableService.saveTdsConnectorVerifiable(rqVO.getTdsConnectorVerifiable()); | ||
277 | } | ||
236 | //endregion 1.1.输出过滤与补充处理 | 278 | //endregion 1.1.输出过滤与补充处理 |
237 | 279 | ||
238 | //endregion 1.输出特殊转换 | 280 | //endregion 1.输出特殊转换 |
... | @@ -264,7 +306,8 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -264,7 +306,8 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
264 | //endregion 2.2.业务数据验证 | 306 | //endregion 2.2.业务数据验证 |
265 | 307 | ||
266 | //endregion 2.数据验证特殊处理 | 308 | //endregion 2.数据验证特殊处理 |
267 | 309 | //验证接入连接器名称唯一性 | |
310 | verifyUniqueness(rqVO); | ||
268 | //region 3.数据转换处理 | 311 | //region 3.数据转换处理 |
269 | 312 | ||
270 | //region 3.1.数据过程转换 | 313 | //region 3.1.数据过程转换 |
... | @@ -298,6 +341,26 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ | ... | @@ -298,6 +341,26 @@ public class TdsConnectorIdentityServiceImpl implements TdsConnectorIdentityServ |
298 | //region 1.输出特殊转换 | 341 | //region 1.输出特殊转换 |
299 | 342 | ||
300 | //region 1.1.输出过滤与补充处理 | 343 | //region 1.1.输出过滤与补充处理 |
344 | TdsConnectorAdditionalRQVO tdsConnectorAdditional = rqVO.getTdsConnectorAdditional(); | ||
345 | if(ObjectUtils.isNotEmpty(tdsConnectorAdditional)){ | ||
346 | tdsConnectorAdditional.setConnectorGuid(rqVO.getGuid()); | ||
347 | if(StringUtils.isNotBlank(tdsConnectorAdditional.getGuid())){ | ||
348 | tdsConnectorAdditionalService.updateTdsConnectorAdditional(tdsConnectorAdditional); | ||
349 | }else { | ||
350 | tdsConnectorAdditionalService.saveTdsConnectorAdditional(tdsConnectorAdditional); | ||
351 | } | ||
352 | } | ||
353 | TdsConnectorVerifiableRQVO tdsConnectorVerifiable = rqVO.getTdsConnectorVerifiable(); | ||
354 | if(ObjectUtils.isNotEmpty(tdsConnectorVerifiable)){ | ||
355 | tdsConnectorVerifiable.setConnectorGuid(rqVO.getGuid()); | ||
356 | if(StringUtils.isNotBlank(tdsConnectorVerifiable.getGuid())){ | ||
357 | tdsConnectorVerifiableService.updateTdsConnectorVerifiable(tdsConnectorVerifiable); | ||
358 | }else{ | ||
359 | tdsConnectorVerifiableService.saveTdsConnectorVerifiable(tdsConnectorVerifiable); | ||
360 | } | ||
361 | |||
362 | } | ||
363 | //region 1.1.输出过滤与补充处理 | ||
301 | //endregion 1.1.输出过滤与补充处理 | 364 | //endregion 1.1.输出过滤与补充处理 |
302 | 365 | ||
303 | //endregion 1.输出特殊转换 | 366 | //endregion 1.输出特殊转换 | ... | ... |
1 | package com.csbr.qingcloud.portal.service.impl; | 1 | package com.csbr.qingcloud.portal.service.impl; |
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | ||
5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||
4 | import com.csbr.cloud.common.enums.SystemError; | 6 | import com.csbr.cloud.common.enums.SystemError; |
5 | import com.csbr.cloud.common.exception.CsbrSystemException; | 7 | import com.csbr.cloud.common.exception.CsbrSystemException; |
6 | import com.csbr.cloud.common.util.CommonUtil; | 8 | import com.csbr.cloud.common.util.CommonUtil; |
7 | import com.csbr.cloud.common.util.CsbrBeanUtil; | 9 | import com.csbr.cloud.common.util.CsbrBeanUtil; |
8 | import com.csbr.cloud.common.util.MessageSourceUtil; | 10 | import com.csbr.cloud.common.util.MessageSourceUtil; |
9 | import csbr.cloud.entity.domain.base.vo.PageListVO; | ||
10 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableQueryVO; | 11 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableQueryVO; |
11 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableRQVO; | 12 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableRQVO; |
12 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableRSVO; | 13 | import com.csbr.qingcloud.portal.domain.vo.TdsConnectorVerifiableRSVO; |
13 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorVerifiable; | 14 | import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorVerifiable; |
14 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorVerifiableService; | 15 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorVerifiableService; |
15 | import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService; | 16 | import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService; |
17 | import csbr.cloud.entity.domain.base.vo.PageListVO; | ||
16 | import jakarta.annotation.Resource; | 18 | import jakarta.annotation.Resource; |
17 | import lombok.extern.slf4j.Slf4j; | 19 | import lombok.extern.slf4j.Slf4j; |
18 | import org.apache.commons.collections.CollectionUtils; | 20 | import org.apache.commons.collections.CollectionUtils; |
21 | import org.apache.commons.lang3.ObjectUtils; | ||
19 | import org.apache.commons.lang3.StringUtils; | 22 | import org.apache.commons.lang3.StringUtils; |
20 | import org.springframework.stereotype.Service; | 23 | import org.springframework.stereotype.Service; |
21 | import org.springframework.transaction.annotation.Transactional; | 24 | import org.springframework.transaction.annotation.Transactional; |
... | @@ -180,6 +183,30 @@ public class TdsConnectorVerifiableServiceImpl implements TdsConnectorVerifiable | ... | @@ -180,6 +183,30 @@ public class TdsConnectorVerifiableServiceImpl implements TdsConnectorVerifiable |
180 | } | 183 | } |
181 | } | 184 | } |
182 | 185 | ||
186 | @Override | ||
187 | public TdsConnectorVerifiableRSVO getTdsConnectorVerifiableByConnectorGuid(String connectorGuid) { | ||
188 | if(StringUtils.isBlank(connectorGuid)){ | ||
189 | return new TdsConnectorVerifiableRSVO(); | ||
190 | } | ||
191 | LambdaQueryWrapper<MfTdsConnectorVerifiable> queryWrapper = Wrappers.lambdaQuery(); | ||
192 | queryWrapper.eq(MfTdsConnectorVerifiable::getConnectorGuid,connectorGuid); | ||
193 | List<MfTdsConnectorVerifiable> list = mfTdsConnectorVerifiableService.list(queryWrapper); | ||
194 | if(ObjectUtils.isEmpty(list)){ | ||
195 | return new TdsConnectorVerifiableRSVO(); | ||
196 | } | ||
197 | return convertToVO(list.get(0)); | ||
198 | } | ||
199 | |||
200 | @Override | ||
201 | public void removeByConnectorGuids(List<String> connectorGuids) { | ||
202 | if(ObjectUtils.isEmpty(connectorGuids)){ | ||
203 | return; | ||
204 | } | ||
205 | LambdaUpdateWrapper<MfTdsConnectorVerifiable> removeWrapper = Wrappers.lambdaUpdate(); | ||
206 | removeWrapper.in(MfTdsConnectorVerifiable::getConnectorGuid,connectorGuids); | ||
207 | mfTdsConnectorVerifiableService.remove(removeWrapper); | ||
208 | } | ||
209 | |||
183 | /** | 210 | /** |
184 | * 连接器可验信息新新增前置处理 | 211 | * 连接器可验信息新新增前置处理 |
185 | * @author xup | 212 | * @author xup | ... | ... |
-
Please register or sign in to post a comment