Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
63a455fd by xu
Options

可信空间连接器入住接口

1 parent 06d75b08
Inline Side-by-side
Showing 2 changed files with 17 additions and 6 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityManagementServiceImpl.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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.csbr.cloud.common.enums.SystemError; 6 import com.csbr.cloud.common.enums.SystemError;
...@@ -132,7 +133,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl ...@@ -132,7 +133,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
132 beforeSave(rqVO); 133 beforeSave(rqVO);
133 MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO); 134 MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO);
134 // 发起审批流程或保存草稿 135 // 发起审批流程或保存草稿
135 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 136 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO);
136 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState); 137 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
137 // 业务数据保存 138 // 业务数据保存
138 boolean flag = mfTdsConnectorIdentityManagementService.save(entity); 139 boolean flag = mfTdsConnectorIdentityManagementService.save(entity);
...@@ -160,7 +161,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl ...@@ -160,7 +161,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
160 beforeUpdate(rqVO); 161 beforeUpdate(rqVO);
161 MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO); 162 MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO);
162 // 发起审批流程或保存草稿 163 // 发起审批流程或保存草稿
163 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 164 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
164 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState); 165 super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
165 if (rqVO.getIsRestart()) { 166 if (rqVO.getIsRestart()) {
166 // 重新提交 167 // 重新提交
...@@ -271,9 +272,10 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl ...@@ -271,9 +272,10 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
271 * @author xup 272 * @author xup
272 * @date 2025-09-23 17:35 273 * @date 2025-09-23 17:35
273 * @param entity 274 * @param entity
275 * @param rqVO
274 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO 276 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
275 */ 277 */
276 private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentityManagement entity) { 278 private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentityManagement entity, TdsConnectorIdentityManagementRQVO rqVO) {
277 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid()); 279 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
278 // todo 280 // todo
279 approvalDTO.setFuncCode(SysFuncCode); 281 approvalDTO.setFuncCode(SysFuncCode);
...@@ -285,6 +287,9 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl ...@@ -285,6 +287,9 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
285 approvalDTO.setParam3(null); 287 approvalDTO.setParam3(null);
286 approvalDTO.setParam4(null); 288 approvalDTO.setParam4(null);
287 289
290 // 增加跨服务审批字段
291 rqVO.setGuid(entity.getGuid());
292 approvalDTO.setBizData(JSON.toJSONString(rqVO));
288 return approvalDTO; 293 return approvalDTO;
289 } 294 }
290 295
......
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityServiceImpl.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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.csbr.cloud.common.enums.SystemError; 6 import com.csbr.cloud.common.enums.SystemError;
...@@ -153,7 +154,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -153,7 +154,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
153 rqVO.setGuid(entity.getGuid()); 154 rqVO.setGuid(entity.getGuid());
154 mfTdsConnectorIdentityService.csbrAddEntity(entity); 155 mfTdsConnectorIdentityService.csbrAddEntity(entity);
155 // 发起审批流程或保存草稿 156 // 发起审批流程或保存草稿
156 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 157 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO);
157 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState); 158 super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
158 boolean flag = mfTdsConnectorIdentityService.save(entity); 159 boolean flag = mfTdsConnectorIdentityService.save(entity);
159 if (!flag) { 160 if (!flag) {
...@@ -167,9 +168,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -167,9 +168,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
167 * @author xup 168 * @author xup
168 * @date 2024-12-30 13:43 169 * @date 2024-12-30 13:43
169 * @param entity 170 * @param entity
171 * @param rqVO
170 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO 172 * @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
171 */ 173 */
172 private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity) { 174 private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity, TdsConnectorIdentityRQVO rqVO) {
173 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid()); 175 AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
174 approvalDTO.setFuncCode(SysFuncCode); 176 approvalDTO.setFuncCode(SysFuncCode);
175 // 流程消息中的变量替换参数 177 // 流程消息中的变量替换参数
...@@ -183,6 +185,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -183,6 +185,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
183 approvalDTO.setParam3(null); 185 approvalDTO.setParam3(null);
184 approvalDTO.setParam4(null); 186 approvalDTO.setParam4(null);
185 187
188 // 增加跨服务审批字段
189 rqVO.setGuid(entity.getGuid());
190 approvalDTO.setBizData(JSON.toJSONString(rqVO));
191
186 return approvalDTO; 192 return approvalDTO;
187 } 193 }
188 194
...@@ -204,7 +210,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -204,7 +210,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
204 MfTdsConnectorIdentity entity = convertToEntity(rqVO); 210 MfTdsConnectorIdentity entity = convertToEntity(rqVO);
205 mfTdsConnectorIdentityService.csbrUpdateEntity(entity); 211 mfTdsConnectorIdentityService.csbrUpdateEntity(entity);
206 // 发起审批流程或保存草稿 212 // 发起审批流程或保存草稿
207 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity); 213 AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
208 super.restartWorkFlow(rqVO,oldEntity.getBizApproveState(),approvalDTO,this::saveTdsConnectorIdentity,entity::setBizApproveState); 214 super.restartWorkFlow(rqVO,oldEntity.getBizApproveState(),approvalDTO,this::saveTdsConnectorIdentity,entity::setBizApproveState);
209 boolean flag = mfTdsConnectorIdentityService.updateById(entity); 215 boolean flag = mfTdsConnectorIdentityService.updateById(entity);
210 if (!flag) { 216 if (!flag) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!