391682cb by xu

可信空间连接器入住接口

1 parent f89494e3
1 package com.csbr.qingcloud.portal.controller; 1 package com.csbr.qingcloud.portal.controller;
2 2
3 import com.csbr.cloud.common.response.CommonRes; 3 import com.csbr.cloud.common.response.CommonRes;
4 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementVoucherRQVO;
4 import csbr.cloud.entity.annotation.SystemLog; 5 import csbr.cloud.entity.annotation.SystemLog;
5 import csbr.cloud.entity.domain.base.vo.PageListVO; 6 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 7 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
...@@ -85,6 +86,14 @@ public class TdsConnectorIdentityManagementController { ...@@ -85,6 +86,14 @@ public class TdsConnectorIdentityManagementController {
85 return CommonRes.success(true); 86 return CommonRes.success(true);
86 } 87 }
87 88
89 @PostMapping("/update-voucher")
90 @SystemLog(value = "连接器身份管理-修改凭证信息")
91 @Operation(summary = "连接器身份管理-修改凭证信息", hidden = true)
92 public CommonRes<Boolean> updateVoucher(@RequestBody @Valid TdsConnectorIdentityManagementVoucherRQVO rqVO) {
93 tdsConnectorIdentityManagementService.updateVoucher(rqVO);
94 return CommonRes.success(true);
95 }
96
88 //endregion 97 //endregion
89 98
90 } 99 }
......
...@@ -30,7 +30,7 @@ public class DemandRQVO extends FlowRQBaseVO { ...@@ -30,7 +30,7 @@ public class DemandRQVO extends FlowRQBaseVO {
30 @Schema(description = "需求类型") 30 @Schema(description = "需求类型")
31 private String requirementType; 31 private String requirementType;
32 32
33 @Schema(title = "专区名称") 33 @Schema(title = "节点名称")
34 private String zqName; 34 private String zqName;
35 35
36 /** 36 /**
......
...@@ -233,7 +233,7 @@ public class DemandRSVO { ...@@ -233,7 +233,7 @@ public class DemandRSVO {
233 @Schema(description = "加工单编号") 233 @Schema(description = "加工单编号")
234 private String processOrderNo; 234 private String processOrderNo;
235 235
236 @Schema(title = "专区名称") 236 @Schema(title = "节点名称")
237 private String zqName; 237 private String zqName;
238 238
239 @Schema(description ="业务名称") 239 @Schema(description ="业务名称")
......
...@@ -23,7 +23,7 @@ public class EnterpriseApproveRSVO extends ApproveVO { ...@@ -23,7 +23,7 @@ public class EnterpriseApproveRSVO extends ApproveVO {
23 @Schema(description = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)") 23 @Schema(description = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
24 private String crossPlatformApproveState; 24 private String crossPlatformApproveState;
25 25
26 @Schema(description = "专区名称") 26 @Schema(description = "节点名称")
27 private String zqName; 27 private String zqName;
28 28
29 /******** 子对象 *****/ 29 /******** 子对象 *****/
......
...@@ -25,7 +25,7 @@ public class EnterpriseRQVO extends FlowRQBaseVO { ...@@ -25,7 +25,7 @@ public class EnterpriseRQVO extends FlowRQBaseVO {
25 @Schema(description = "公司名称") 25 @Schema(description = "公司名称")
26 private String tenantName; 26 private String tenantName;
27 27
28 @Schema(title = "专区名称") 28 @Schema(title = "节点名称")
29 private String zqName; 29 private String zqName;
30 30
31 /** 31 /**
......
...@@ -189,7 +189,7 @@ public class EnterpriseRSVO { ...@@ -189,7 +189,7 @@ public class EnterpriseRSVO {
189 @Schema(description = "提交时间") 189 @Schema(description = "提交时间")
190 private Date createTime; 190 private Date createTime;
191 191
192 @Schema(title = "专区名称") 192 @Schema(title = "节点名称")
193 private String zqName; 193 private String zqName;
194 194
195 /** 195 /**
......
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import com.alibaba.fastjson.JSONArray;
3 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
4 import com.fasterxml.jackson.annotation.JsonFormat; 5 import com.fasterxml.jackson.annotation.JsonFormat;
5 import lombok.Data; 6 import lombok.Data;
...@@ -23,9 +24,9 @@ public class TdsConnectorIdentityManagementRSVO { ...@@ -23,9 +24,9 @@ public class TdsConnectorIdentityManagementRSVO {
23 private String guid; 24 private String guid;
24 25
25 /** 26 /**
26 * 专区Guid 27 * 节点Guid
27 */ 28 */
28 @Schema(description = "专区Guid") 29 @Schema(description = "节点Guid")
29 private String zqGuid; 30 private String zqGuid;
30 31
31 /** 32 /**
...@@ -57,7 +58,7 @@ public class TdsConnectorIdentityManagementRSVO { ...@@ -57,7 +58,7 @@ public class TdsConnectorIdentityManagementRSVO {
57 * 凭证证书 58 * 凭证证书
58 */ 59 */
59 @Schema(description = "凭证证书") 60 @Schema(description = "凭证证书")
60 private String certificate; 61 private JSONArray certificate;
61 62
62 /** 63 /**
63 * 凭证有效期 64 * 凭证有效期
......
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import com.alibaba.fastjson.JSONArray;
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 lombok.Data;
9
10 import java.util.Date;
11 import java.util.Map;
12
13 /**
14 * @program:
15 * @description: 连接器身份管理凭证信息参数
16 * @author: xup
17 * @create: 2025-09-23 15:45
18 **/
19 @Data
20 @Schema(title = "连接器身份管理凭证信息参数")
21 public class TdsConnectorIdentityManagementVoucherRQVO {
22
23 /**
24 * 系统唯一标识
25 */
26 @Schema(description = "系统唯一标识")
27 @NotBlank(message = "系统唯一标识为空。")
28 private String guid;
29
30 /**
31 * Key标识私钥
32 */
33 @Schema(description ="Key标识私钥")
34 @NotBlank(message = "Key标识私钥为空。")
35 private String privatekey;
36
37 /**
38 * 凭证证书
39 */
40 @Schema(description ="凭证证书")
41 @NotBlank(message = "凭证证书为空。")
42 private JSONArray certificate;
43
44 /**
45 * 凭证有效期
46 */
47 @Schema(description ="凭证有效期")
48 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
49 @NotNull(message = "凭证有效期为空。")
50 private Date voucherExpirationTime;
51
52 /******** 库表存储属性 需处理 *****/
53
54 /******** 自定义扩展 *****/
55
56 /******** 子对象 *****/
57
58 }
...@@ -224,7 +224,7 @@ public class MfDemand extends BaseShardingDO { ...@@ -224,7 +224,7 @@ public class MfDemand extends BaseShardingDO {
224 @Name("资产Guid") 224 @Name("资产Guid")
225 private String zqBizGuid; 225 private String zqBizGuid;
226 226
227 @Name("专区名称") 227 @Name("节点名称")
228 private String zqName; 228 private String zqName;
229 229
230 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)") 230 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
......
...@@ -175,7 +175,7 @@ public class MfEnterprise extends BaseDO { ...@@ -175,7 +175,7 @@ public class MfEnterprise extends BaseDO {
175 @Name("资产Guid") 175 @Name("资产Guid")
176 private String zqBizGuid; 176 private String zqBizGuid;
177 177
178 @Name("专区名称") 178 @Name("节点名称")
179 private String zqName; 179 private String zqName;
180 180
181 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)") 181 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
......
...@@ -193,7 +193,7 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -193,7 +193,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
193 @Name("资产Guid") 193 @Name("资产Guid")
194 private String zqBizGuid; 194 private String zqBizGuid;
195 195
196 @Name("专区名称") 196 @Name("节点名称")
197 private String zqName; 197 private String zqName;
198 198
199 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)") 199 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
......
1 package com.csbr.qingcloud.portal.mybatis.entity; 1 package com.csbr.qingcloud.portal.mybatis.entity;
2 2
3 import com.alibaba.fastjson.JSONArray;
4 import com.baomidou.mybatisplus.annotation.TableField;
5 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
3 import csbr.cloud.entity.domain.base.dao.BaseDO; 7 import csbr.cloud.entity.domain.base.dao.BaseDO;
4 import jdk.jfr.Name; 8 import jdk.jfr.Name;
5 import lombok.Data; 9 import lombok.Data;
...@@ -17,12 +21,13 @@ import java.util.Date; ...@@ -17,12 +21,13 @@ import java.util.Date;
17 @EqualsAndHashCode(callSuper = true) 21 @EqualsAndHashCode(callSuper = true)
18 @Accessors(chain = true) 22 @Accessors(chain = true)
19 @Name("连接器身份管理") 23 @Name("连接器身份管理")
24 @TableName(autoResultMap = true)
20 public class MfTdsConnectorIdentityManagement extends BaseDO { 25 public class MfTdsConnectorIdentityManagement extends BaseDO {
21 26
22 /** 27 /**
23 * 专区Guid 28 * 节点Guid
24 */ 29 */
25 @Name("专区Guid") 30 @Name("节点Guid")
26 private String zqGuid; 31 private String zqGuid;
27 32
28 /** 33 /**
...@@ -53,7 +58,8 @@ public class MfTdsConnectorIdentityManagement extends BaseDO { ...@@ -53,7 +58,8 @@ public class MfTdsConnectorIdentityManagement extends BaseDO {
53 * 凭证证书 58 * 凭证证书
54 */ 59 */
55 @Name("凭证证书") 60 @Name("凭证证书")
56 private String certificate; 61 @TableField(typeHandler = FastjsonTypeHandler.class)
62 private JSONArray certificate;
57 63
58 /** 64 /**
59 * 凭证有效期 65 * 凭证有效期
......
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementVoucherRQVO;
3 import csbr.cloud.entity.domain.base.vo.PageListVO; 4 import csbr.cloud.entity.domain.base.vo.PageListVO;
4 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
5 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 6 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
...@@ -70,4 +71,9 @@ public interface TdsConnectorIdentityManagementService { ...@@ -70,4 +71,9 @@ public interface TdsConnectorIdentityManagementService {
70 */ 71 */
71 void flowCallBack(BizCallbackDTO dto); 72 void flowCallBack(BizCallbackDTO dto);
72 73
74 /**
75 * 修改凭证信息
76 * @param rqVO
77 */
78 void updateVoucher(TdsConnectorIdentityManagementVoucherRQVO rqVO);
73 } 79 }
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 import com.csbr.cloud.common.enums.SystemError; 5 import com.csbr.cloud.common.enums.SystemError;
6 import com.csbr.cloud.common.enums.WorkFlowBizEnum; 6 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
7 import com.csbr.qingcloud.portal.domain.vo.TdsConnectorIdentityManagementVoucherRQVO;
7 import csbr.cloud.entity.enums.ApprovalStateEnum; 8 import csbr.cloud.entity.enums.ApprovalStateEnum;
8 import com.csbr.cloud.common.exception.CsbrSystemException; 9 import com.csbr.cloud.common.exception.CsbrSystemException;
9 import com.csbr.cloud.common.util.CommonUtil; 10 import com.csbr.cloud.common.util.CommonUtil;
...@@ -250,6 +251,21 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl ...@@ -250,6 +251,21 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
250 } 251 }
251 } 252 }
252 253
254 @Override
255 public void updateVoucher(TdsConnectorIdentityManagementVoucherRQVO rqVO) {
256 MfTdsConnectorIdentityManagement entity = mfTdsConnectorIdentityManagementService.getById(rqVO.getGuid());
257 if (entity == null) {
258 throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(FUNCTION_NAME));
259 }
260 if(!ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())){
261 throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR,"非审批通过数据,无法修改凭证信息");
262 }
263 entity.setPrivatekey(rqVO.getPrivatekey());
264 entity.setCertificate(rqVO.getCertificate());
265 entity.setVoucherExpirationTime(rqVO.getVoucherExpirationTime());
266 mfTdsConnectorIdentityManagementService.updateById(entity);
267 }
268
253 /** 269 /**
254 * 获取发起流程参数 270 * 获取发起流程参数
255 * @author xup 271 * @author xup
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!