Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
bdb47490 by xu
Options

Merge branch 'feature-tds-v1.0.0' into 'develop' 

可信空间连接器入住接口

See merge request !12
2 parents 0654cd46 63a455fd
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
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.Wrappers;
import com.csbr.cloud.common.enums.SystemError;
......@@ -132,7 +133,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
beforeSave(rqVO);
MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO);
// 发起审批流程或保存草稿
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO);
super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
// 业务数据保存
boolean flag = mfTdsConnectorIdentityManagementService.save(entity);
......@@ -160,7 +161,7 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
beforeUpdate(rqVO);
MfTdsConnectorIdentityManagement entity = convertToEntity(rqVO);
// 发起审批流程或保存草稿
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
super.startOrRestartWorkFlow(rqVO, rqVO.getBizApproveState(), approvalDTO, entity::setBizApproveState);
if (rqVO.getIsRestart()) {
// 重新提交
......@@ -271,9 +272,10 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
* @author xup
* @date 2025-09-23 17:35
* @param entity
* @param rqVO
* @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
*/
private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentityManagement entity) {
private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentityManagement entity, TdsConnectorIdentityManagementRQVO rqVO) {
AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
// todo
approvalDTO.setFuncCode(SysFuncCode);
......@@ -285,6 +287,9 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl
approvalDTO.setParam3(null);
approvalDTO.setParam4(null);
// 增加跨服务审批字段
rqVO.setGuid(entity.getGuid());
approvalDTO.setBizData(JSON.toJSONString(rqVO));
return approvalDTO;
}
......
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityServiceImpl.java
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.Wrappers;
import com.csbr.cloud.common.enums.SystemError;
......@@ -153,7 +154,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
rqVO.setGuid(entity.getGuid());
mfTdsConnectorIdentityService.csbrAddEntity(entity);
// 发起审批流程或保存草稿
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity,rqVO);
super.startWorkFlow(rqVO, approvalDTO, entity::setBizApproveState);
boolean flag = mfTdsConnectorIdentityService.save(entity);
if (!flag) {
......@@ -167,9 +168,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
* @author xup
* @date 2024-12-30 13:43
* @param entity
* @param rqVO
* @return com.csbr.cloud.workflow.domain.dto.appove.AddApprovalDTO
*/
private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity) {
private AddApprovalDTO getAddApprovalDTO(MfTdsConnectorIdentity entity, TdsConnectorIdentityRQVO rqVO) {
AddApprovalDTO approvalDTO = new AddApprovalDTO(FLOW_TYPE, entity.getGuid());
approvalDTO.setFuncCode(SysFuncCode);
// 流程消息中的变量替换参数
......@@ -183,6 +185,10 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
approvalDTO.setParam3(null);
approvalDTO.setParam4(null);
// 增加跨服务审批字段
rqVO.setGuid(entity.getGuid());
approvalDTO.setBizData(JSON.toJSONString(rqVO));
return approvalDTO;
}
......@@ -204,7 +210,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
MfTdsConnectorIdentity entity = convertToEntity(rqVO);
mfTdsConnectorIdentityService.csbrUpdateEntity(entity);
// 发起审批流程或保存草稿
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity);
AddApprovalDTO approvalDTO = getAddApprovalDTO(entity, rqVO);
super.restartWorkFlow(rqVO,oldEntity.getBizApproveState(),approvalDTO,this::saveTdsConnectorIdentity,entity::setBizApproveState);
boolean flag = mfTdsConnectorIdentityService.updateById(entity);
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!