From a0f3e98fdd9472af3c78b42423a7e3fa6fb92eba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 14:28:55 +0800
Subject: [PATCH] 清理无用老代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java | 6 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.xml | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 28 +++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 5
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 1
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramApprovedService.java | 33 -----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/unlock/UnlockFinishListener.java | 13 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/DoneMapper.java | 3
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TempFlowCompleteService.java | 33 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java | 18 ---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowTransferService.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/AbstractFlowCompleteService.java | 12 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/DispatchFinishListener.java | 13 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java | 8 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java | 13 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java | 8 -
/dev/null | 98 ----------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java | 6 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java | 2
25 files changed, 41 insertions(+), 281 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java
index fc532c3..371563f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java
@@ -9,19 +9,13 @@
import org.apache.tika.utils.StringUtils;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.CompareDataVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* 绋嬪簭鑺傜偣
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
index 91c711f..955bbd9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
@@ -7,15 +7,12 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,9 +29,6 @@
@Tag(name = "娴佺▼绠＄悊", description = "娴佺▼绠＄悊")
@Slf4j
public class FlowProgramController {
-
- private final NcProgramService ncProgramService;
- private final ProcessProgRefService ncProcessProgRefService;
private final FlowProgramFileService flowProgramFileService;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
index f55ce6c..61c5b2f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
@@ -5,32 +5,14 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.excution.StartDispatcher;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.ReplaceFlowService;
-import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
-import org.springblade.mdm.flow.vo.ProgramUploadVO;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
import org.springblade.mdm.flow.vo.ReplaceUploadVO;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
-import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
@Slf4j
@RestController
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index a5d0bc7..fbfda13 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -131,6 +131,8 @@
ProcessInstance inst;
if(startVO.isTemporaryFlow()){
vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());//绗竴涓敤鎴风紪鍒朵笂浼犳枃浠�
+ vars.put(FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(div.getProgrammerId()));//缂栫▼鍛樺鍚�
+
inst = runtimeService.startProcessInstanceByKey(FlowContants.APPEND_PROCESS_KEY,businessKey,vars);
}else{
vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//绗竴涓敤鎴风粍闀�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
index d7b6dd4..c4bb669 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
@@ -5,7 +5,6 @@
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.dispatch.FinishDataHandler;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
@@ -25,10 +24,7 @@
@Slf4j
@Component("deviationCureFinishDataHandler")
public class DeviationCureFinishDataHandler implements FinishDataHandler {
- @Autowired
- private NcProgramApprovedService approvedService;
- @Autowired
- private ApproveRecordService approveRecordService;
+
@Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
@@ -98,14 +94,7 @@
}
- updateApproveRecordNodeId(instId, pkgNode.getId());
log.info("鍋忕鍥炰紶Listener瀹屾垚");
}
- void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
- //鏇存柊瀹℃壒璁板綍鐨刵cNodeId
- approveRecordService.lambdaUpdate()
- .eq(ApproveRecord::getProcessInstanceId, processInstanceId)
- .set(ApproveRecord::getNcNodeId,nodeId).update();
- }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
index 818bd98..45bf536 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -10,17 +10,13 @@
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamConstants;
-import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.dispatch.FinishDataHandler;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.mdm.program.service.programannotation.AnnotationProperties;
import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/DispatchFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/DispatchFinishListener.java
index bff2774..e2df22c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/DispatchFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/DispatchFinishListener.java
@@ -3,25 +3,14 @@
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
-import org.springblade.mdm.utils.EntityUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* 娲惧伐瀹℃壒閫氳繃鎵ц鐨勪簨浠讹紝鍔熻兘锛氭彃鍏ュ鎵硅〃鏁版嵁
@@ -33,8 +22,6 @@
private RuntimeService runtimeService;
@Autowired
private NcProgramApprovedService approvedService;
- @Autowired
- private ApproveRecordService approveRecordService;
@Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index 90b6e90..24b98da 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -4,8 +4,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
@@ -14,7 +12,6 @@
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
-import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.ProgramFileNameParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +62,7 @@
}
addApproveTable(packageNode,props);
-
+
log.info("鏅�氭祦绋嬪凡瀹屾垚in DispatchFinishListener");
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
index 45fef5b..d93c810 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/replace/ReplaceFinishListener.java
@@ -28,8 +28,6 @@
@Autowired
private RuntimeService runtimeService;
@Autowired
- private ApproveRecordService approveRecordService;
- @Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
private NcProgramApprovedService ncProgramApprovedService;
@@ -129,10 +127,4 @@
return newPackageNode;
}
- void updateApproveRecordNodeId(NcNode pkgNode){
- //鏇存柊瀹℃壒璁板綍鐨刵cNodeId
- approveRecordService.lambdaUpdate()
- .eq(ApproveRecord::getProcessInstanceId, pkgNode.getProcessInstanceId())
- .set(ApproveRecord::getNcNodeId,pkgNode.getId()).update();
- }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/unlock/UnlockFinishListener.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/unlock/UnlockFinishListener.java
index 8a14c17..e143f27 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/unlock/UnlockFinishListener.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/unlock/UnlockFinishListener.java
@@ -3,23 +3,12 @@
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
-import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.flow.service.ReplaceFlowService;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
-import org.springblade.mdm.utils.EntityUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* 瑙ｉ攣瀹屾垚鎵ц鐨勪簨浠讹紝鍔熻兘锛氭彃鍏ュ鎵硅〃鏁版嵁
@@ -29,8 +18,6 @@
public class UnlockFinishListener {
@Autowired
private RuntimeService runtimeService;
- @Autowired
- private ApproveRecordService approveRecordService;
@Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.java
deleted file mode 100644
index 65b3a2d..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.springblade.mdm.flow.mapper;
-
-import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.vo.NcNodeVO;
-
-import java.util.List;
-
-public interface ApproveRecordMapper extends BladeMapper<ApproveRecord> {
- List<ApproveRecordVO> listByNcProgramId(Long ncProgramId);
-
-
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.xml
deleted file mode 100644
index 12d2dad..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ApproveRecordMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.mdm.flow.mapper.ApproveRecordMapper">
- <resultMap id="BaseResultMap" type="org.springblade.mdm.flow.entity.ApproveRecord">
- <id column="id" property="id"/>
- <result column="status" property="status"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-
-
-
- <sql id="all_columns">id,tenant_id,nc_program_id,process_instances_id,operate_time,operate_result,user_id,user_nickname,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
- <select id="listByNcProgramId" resultType="org.springblade.mdm.flow.vo.ApproveRecordVO">
- select <include refid="all_columns"/> FROM mdm_approve_record
- WHERE nc_program_id = ${ncProgramId} and is_deleted = 0 order by create_time desc
-
- </select>
-
-</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/DoneMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/DoneMapper.java
index 20a9516..59f5c6f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/DoneMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/DoneMapper.java
@@ -4,11 +4,8 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
import org.springblade.mdm.flow.vo.DoneQueryVO;
import org.springblade.mdm.flow.vo.FlowVO;
-
-import java.util.List;
public interface DoneMapper extends BladeMapper<ApproveRecord> {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.java
index 669b337..e27ad3f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.java
@@ -1,11 +1,7 @@
package org.springblade.mdm.flow.mapper;
import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
-
-import java.util.List;
public interface FlowProgramFileMapper extends BladeMapper<FlowProgramFile> {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.xml
similarity index 75%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramMapper.xml
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.xml
index e1ec540..ee3f582 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/FlowProgramFileMapper.xml
@@ -12,10 +12,6 @@
<sql id="all_columns">id,tenant_id,nc_program_id,process_instances_id,operate_time,operate_result,user_id,user_nickname,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
- <select id="listByNcProgramId" resultType="org.springblade.mdm.flow.vo.ApproveRecordVO">
- select <include refid="all_columns"/> FROM mdm_approve_record
- WHERE nc_program_id = ${ncProgramId} and is_deleted = 0 order by create_time desc
- </select>
</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramFileMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramFileMapper.java
deleted file mode 100644
index b042bf0..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramFileMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.springblade.mdm.flow.mapper;
-
-import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.entity.ReplaceProgramFile;
-
-public interface ReplaceProgramFileMapper extends BladeMapper<ReplaceProgramFile> {
-
-
- void deleteByTempId(Long tempId);
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramMapper.xml
deleted file mode 100644
index b033b59..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/mapper/ReplaceProgramMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.mdm.flow.mapper.ReplaceProgramFileMapper">
- <resultMap id="BaseResultMap" type="org.springblade.mdm.flow.entity.ReplaceProgramFile">
- <id column="id" property="id"/>
- <result column="status" property="status"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
- <delete id="deleteByTempId">
- delete from mdm_replace_program_file where temp_id=#{tempId}
- </delete>
-
-
-</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
deleted file mode 100644
index 2ac2343..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-
-package org.springblade.mdm.flow.service;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.task.api.Task;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
-import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 瀹℃壒璁板綍锛岀敤浜庢煡璇㈡墽琛岃建杩�
- *
- * @author yangys
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class ApproveRecordService extends BizServiceImpl<ApproveRecordMapper, ApproveRecord> {
- private final ProcessProgRefService processProgRefService;
- private final FlowCommonService flowCommonService;
- public List<ApproveRecordVO> listByNcProgramId(Long ncProgramId) {
- return this.getBaseMapper().listByNcProgramId(ncProgramId);
- }
-
- public void saveApproveRecords(Task task, String operateResult, String comment) {
-
- String processDefinitionKey = flowCommonService.getDefinitionKey(task.getProcessInstanceId());
-
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setComment(comment==null? StringUtils.EMPTY:comment);
- //rec.setNcProgramId(refObj.getNcProgramId());
- rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
- rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(task.getProcessInstanceId());
- rec.setProcessDefinitionKey(processDefinitionKey);
- rec.setTaskDefinitionKey(task.getTaskDefinitionKey());
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
-
- save(rec);
- }
- /*
-
- public void saveApproveRecordsOld(Task task, String processInstanceId, String operateResult, String comment) {
-
- String processDefinitionKey = flowCommonService.getDefinitionKey(processInstanceId);
-
- LambdaQueryWrapper<ProcessProgRef> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProcessProgRef::getProcessInstanceId, processInstanceId);
- List<ProcessProgRef> refList = processProgRefService.list(queryWrapper);
- if(!refList.isEmpty()) {
- for (ProcessProgRef refObj : refList) {
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setComment(comment==null? StringUtils.EMPTY:comment);
-
- rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
- rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(processInstanceId);
- rec.setProcessDefinitionKey(processDefinitionKey);
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
-
- save(rec);
- }
-
- }else{
- //濡傛灉杩樻病鏈夊叧鑱旂殑绋嬪簭鏁版嵁锛屽垯鎻掑叆涓�涓猵rogramId涓簄ull鐨�
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setTaskDefinitionId(task.getTaskDefinitionId());
-
- rec.setComment(comment==null? StringUtils.EMPTY:comment);
- rec.setProcessInstanceId(processInstanceId);
- rec.setProcessDefinitionKey(processDefinitionKey);
- rec.setOperateResult(operateResult);
- rec.setOperateTime(DateUtil.now());
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
-
- save(rec);
- }
- }
- */
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 580473d..833cfec 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -23,8 +23,6 @@
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowTransferService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowTransferService.java
index 8d0f7e4..664f386 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowTransferService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowTransferService.java
@@ -22,8 +22,6 @@
private final TaskService taskService;
- private final ApproveRecordService approveRecordService;
-
/**
* 杞淳锛屽苟璁板綍鑷繁鐨勫娉ㄤ俊鎭�
* @param taskId 浠诲姟id
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java
deleted file mode 100644
index 3854255..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceProgramFileService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package org.springblade.mdm.flow.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.engine.RuntimeService;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.model.BladeFile;
-import org.springblade.core.tool.api.IResultCode;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.entity.ReplaceProgramFile;
-import org.springblade.mdm.flow.mapper.ReplaceProgramFileMapper;
-import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.flow.vo.ReplaceUploadVO;
-import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.utils.FileContentUtil;
-import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-/**
- * 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
- *
- * @author yangys
- */
-@Slf4j
-@Service
-public class ReplaceProgramFileService extends BizServiceImpl<ReplaceProgramFileMapper, ReplaceProgramFile> {
- @Autowired
- private OssTemplate ossTemplate;
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private FlowCommonService flowCommonService;
- @Autowired
- private FlowProgramFileService flowProgramFileService;
-
-
- public void deleteByTempId(Long tempId) {
- this.baseMapper.deleteByTempId(tempId);
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/AbstractFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/AbstractFlowCompleteService.java
index 543c53c..80008b5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/AbstractFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/AbstractFlowCompleteService.java
@@ -4,11 +4,6 @@
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
-import org.springblade.core.tool.api.R;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.system.feign.IUserClient;
-import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,8 +20,6 @@
protected TaskService taskService;
@Autowired
protected RuntimeService runtimeService;
- @Autowired
- protected ApproveRecordService approveRecordService;
@Transactional
public abstract void completeTask(String taskId, String processInstanceId, String comment, @Parameter(name = "variables", description = "娴佺▼鍙橀噺") @RequestBody Map<String, Object> variables);
@@ -49,10 +42,5 @@
.taskId(taskId)
.singleResult();
}
- void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
- String operateResult = variables.get("approve")+"";
- approveRecordService.saveApproveRecords(currentTask(taskId),operateResult,comment);
- }
-
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
index 74c3c7a..ee3d80d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
@@ -12,11 +12,8 @@
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowCommonService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
-import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +25,6 @@
*/
@Service
public class BatchDispatchService {
-
- @Autowired
- private ApproveRecordService approveRecordService;
@Autowired
private TaskService taskService;
@Autowired
@@ -68,7 +62,6 @@
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
- approveRecordService.saveApproveRecords(task,FlowContants.Y,comment);
taskService.complete(taskId, variables);
}
@@ -110,7 +103,6 @@
if (StringUtil.isNoneBlank(processInstanceId, batchDispatchVO.getComment())) {
taskService.addComment(taskId, processInstanceId, batchDispatchVO.getComment());
}
- approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());
//鏈�鍚庝竴姝ュ畬鎴�
taskService.complete(taskId, variables);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java
index 7747b83..f3db3e8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java
@@ -59,10 +59,8 @@
if(!variables.containsKey("assignee")) {
throw new ServiceException("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
}
- addApproveRecord(taskId,comment,variables);
variables.remove(FlowContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
-
taskService.complete(taskId, variables);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TempFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TempFlowCompleteService.java
index 025b960..b405395 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TempFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TempFlowCompleteService.java
@@ -6,16 +6,12 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.service.FlowCommonService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.flow.service.FlowProgramProperties;
-import org.springblade.mdm.program.service.NcNodeAutoCreateService;
-import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.util.Map;
/**
@@ -24,19 +20,11 @@
@Service("tempFlowCompleteService")
public class TempFlowCompleteService extends AbstractFlowCompleteService {
@Autowired
- private FlowProgramFileService flowProgramFileService;
- @Autowired
- private NcNodeService ncNodeService;
- @Autowired
- private FlowCommonService flowCommonService;
-
+ private UserCommonService userCommonService;
@Transactional
@Override
public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
Task task = currentTask(taskId);
- String operateResult = this.getApproveResult(variables);
-
-
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
@@ -44,12 +32,23 @@
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
- variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
if(!variables.containsKey("assignee")) {
throw new ServiceException("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
}
- addApproveRecord(taskId,comment,variables);
+ String operateResult = this.getApproveResult(variables);
+ variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+
+ if(task.getTaskDefinitionKey().equals("appendProgrammingTask") ) {//缂栧埗鑺傜偣
+ //璁板綍瀹為檯缂栫▼鍛�
+ variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
+
+ }else if(task.getTaskDefinitionKey().equals("appendCheckTask")){
+ variables.put(FlowVariableContants.ACT_CHECKER,Func.toStr(AuthUtil.getUserId()));
+ }else if(task.getTaskDefinitionKey().equals("appendApproveTask")){
+ variables.put(FlowVariableContants.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
+ }
+
taskService.complete(taskId, variables);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
index 443eef8..4a3d4ee 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -79,8 +79,6 @@
variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- addApproveRecord(taskId,comment,variables);
-
variables.remove(FlowContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ApproveRecordVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ApproveRecordVO.java
deleted file mode 100644
index 07e2086..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ApproveRecordVO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.springblade.mdm.flow.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-import org.springblade.core.mp.base.BizEntity;
-import org.springblade.mdm.commons.vo.BaseVO;
-
-import java.util.Date;
-
-/**
- * 鏁版帶绋嬪簭瀹℃壒璁板綍
- */
-@Setter
-@Getter
-public class ApproveRecordVO extends BaseVO {
-
- private String processInstanceId;
- /**
- * 鏁版帶绋嬪簭id
- */
- @Schema(description = "鏁版帶绋嬪簭id")
- private Long ncProgramId;
- @Schema(description = "鐢ㄦ埛id")
- private Long userId;
-
-
- @Schema(description = "瀹℃壒鐢ㄦ埛濮撳悕")
- private String userNickname;
-
-
- @Schema(description = "瀹℃壒鏃ユ湡")
- private Date operateTime;
-
-
- @Schema(description = "瀹℃壒缁撴灉")
- private String operateResult;
-
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index af018b9..2a2c008 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -1,7 +1,6 @@
package org.springblade.mdm.program.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,12 +10,10 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
@@ -35,7 +32,6 @@
@Tag(name = "绋嬪簭鑺傜偣", description = "绋嬪簭鑺傜偣")
@Slf4j
public class NcNodeController {
- private final NcProgramService ncProgramService;
private final NcNodeService ncNodeService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final FlowProgramFileService flowProgramFileService;
@@ -47,7 +43,7 @@
@Operation(summary = "鏂板鑺傜偣", description = "鑺傜偣淇℃伅,id淇濇寔绌�")
public R<Boolean> save(@RequestBody NcNodeVO vo) {
ncNodeService.saveNcCode(vo);
- return R.<Boolean>status(true);
+ return R.status(true);
}
@@ -55,21 +51,21 @@
@Operation(summary = "淇敼鑺傜偣", description = "鑺傜偣淇℃伅,蹇呴』浼犲叆ID")
public R<Boolean> update(@RequestBody NcNodeVO vo) {
ncNodeService.updateNcNode(vo);
- return R.<Boolean>status(true);
+ return R.status(true);
}
@PostMapping("/remove")
@Operation(summary = "鍒犻櫎鑺傜偣")
public R<Boolean> remove(Long id) {
ncNodeService.removeById(id);
- return R.<Boolean>status(true);
+ return R.status(true);
}
@PostMapping("/lock")
@Operation(summary = "閿佸畾鑺傜偣(绋嬪簭鍖呭悕)")
public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id,@Parameter(description="閿佸畾鍘熷洜)")String remark) {
ncNodeService.lock(id,remark);
- return R.<Boolean>status(true);
+ return R.status(true);
}
@GetMapping("/query-lock-remark")
@@ -147,4 +143,20 @@
return R.data(vo);
}
+
+ @GetMapping("/content-by-nodeid")
+ @Operation(summary = "鏍规嵁鑺傜偣鑾峰彇鏂囦欢鍐呭", description = "浠呴檺鏂囨湰鏍煎紡鐨勫唴瀹癸紝浜岃繘鍒舵枃浠跺皢杩斿洖绌轰覆")
+ public R<String> fileContentByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) {
+ try {
+ NcNode ncnode = ncNodeService.getById(nodeId);
+ if(ncnode.getFlowProgramFileId() != null) {
+ return R.data(flowProgramFileService.getFileContent(ncnode.getFlowProgramFileId()));
+ }else{
+ return R.data("鎵句笉鍒版枃浠�");
+ }
+ }catch(Exception e) {
+ log.error("鍒犻櫎鏂囦欢澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
deleted file mode 100644
index 086d095..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-
-package org.springblade.mdm.program.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
-import org.springblade.mdm.flow.vo.TaskTraceVO;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcProgramUploadVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 绋嬪簭鑺傜偣
- *
- * @author yangys
- */
-@NonDS
-@RestController
-@RequestMapping("/program/ncfile")
-@AllArgsConstructor
-@Tag(name = "鏁版帶绋嬪簭", description = "鏁版帶绋嬪簭")
-@Slf4j
-public class NcProgramController {
-
- private final NcProgramService ncProgramService;
- private final ProcessProgRefService ncProcessProgRefService;
-
- private final ApproveRecordService approveRecordService;
- private final NcNodeService ncNodeService;
- private final FlowProgramFileService flowProgramFileService;
- @PostMapping("/upload")
- @Operation(summary = "涓婁紶鏂囦欢", description = "涓婁紶绋嬪簭/闄勪欢鏂囦欢")
- public R<Boolean> upload(NcProgramUploadVO uploadVO) {
- try {
- boolean existOther = ncProgramService.programExistsUnderOtherNode(uploadVO.getNodeId(), uploadVO.getFile().getOriginalFilename());
- if (existOther) {
- //绋嬪簭瀛樺湪锛屽垯杩斿洖鎻愮ず淇℃伅
- return R.fail("绋嬪簭鍏朵粬鑺傜偣宸插瓨鍦�");
- }
- if (uploadVO.getConfirm() == null || uploadVO.getConfirm() != 1) {
- //榛樿鎯呭喌锛岄渶瑕佹鏌ョ▼搴忔槸鍚﹀瓨鍦�
- boolean exists = ncProgramService.programExistsUnderNode(uploadVO.getNodeId(), uploadVO.getFile().getOriginalFilename());
- if (exists) {
- //绋嬪簭瀛樺湪锛屽垯杩斿洖鎻愮ず淇℃伅
- return R.fail(2, "瀛樺湪閲嶅绋嬪簭鍚�");
- } else {
- ncProgramService.uploadProgramFileNew(uploadVO);
- }
- } else {
- //鍚屽悕鏂囦欢鐢ㄦ埛纭涓婁紶浜嗭紙锛�
- ncProgramService.uploadProgramFileNew(uploadVO);
- }
- }catch(Exception e) {
- log.error("绋嬪簭涓婁紶鎵ц閿欒",e);
- return R.fail("涓婁紶澶辫触:" + e.getMessage());
- }
- return R.success();
- }
-
- @PostMapping("/remove")
- @Operation(summary = "鍒犻櫎绋嬪簭鏂囦欢", description = "")
- public R<Boolean> removeFile(Long id) {
- try {
- ncProgramService.removeProgram(id);
- return R.success();
- }catch(Exception e) {
- log.error("鍒犻櫎鏂囦欢澶辫触",e);
- return R.fail(e.getMessage());
- }
- }
-
- @GetMapping("/content-by-nodeid")
- @Operation(summary = "鏍规嵁鑺傜偣鑾峰彇鏂囦欢鍐呭", description = "浠呴檺鏂囨湰鏍煎紡鐨勫唴瀹癸紝浜岃繘鍒舵枃浠跺皢杩斿洖绌轰覆")
- public R<String> fileContentByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) {
- try {
- NcNode ncnode = ncNodeService.getById(nodeId);
- if(ncnode.getFlowProgramFileId() != null) {
- return R.data(flowProgramFileService.getFileContent(ncnode.getFlowProgramFileId()));
- }else{
- return R.data("鎵句笉鍒版枃浠�");
- }
- }catch(Exception e) {
- log.error("鍒犻櫎鏂囦欢澶辫触",e);
- return R.fail(e.getMessage());
- }
- }
-
- @GetMapping("/list-by-node")
- @Operation(summary = "鑺傜偣绋嬪簭鏂囦欢鍒楄〃", description = "鏌愯妭鐐瑰唴鐨勭▼搴忓垪琛紝浠呪�樼▼搴忓寘鈥欏瓧鍏稿��60")
- public R<List<NcProgramVO>> listByNode(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long nodeId) {
- return R.data(ncProgramService.listByNode(nodeId));
- }
-
- @PostMapping("/upgrade-process-edition")
- @Operation(summary = "鍗囩増", description = "鍗囩骇宸ュ簭鐗堟")
- public R<Boolean> upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition ) {
- ncProgramService.upgradeProcessEdition(bindNcNodeId,newProcessEdition);
- return R.<Boolean>status(true);
- }
-
- @Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
- @GetMapping("/programpickpage")
- public R<IPage<NcProgramVO>> page(NcNodeProgramQueryVO query) {
- IPage<NcProgramVO> pages = ncProgramService.pageQuery(query);
- return R.data(pages);
- }
- /*
- @GetMapping("/list-by-process")
- @Operation(summary = "娴佺▼宸查�夌▼搴忔枃浠跺垪琛�", description = "娴佺▼宸查�夌▼搴忓垪琛�")
- public R<List<NcProgramVO>> listByProcess(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam String processInstanceId) {
- return R.data(ncProcessProgRefService.listByProcess(processInstanceId));
- }*/
-
- @Operation(summary = "鎿嶄綔鏃ュ織", description = "绋嬪簭鎿嶄綔鏃ュ織锛屽嵆瀹℃壒璁板綍锛屽湪涓婚〉鐐瑰嚮鏌愪竴涓▼搴忓悗鐨勪笅鏂规爣绛炬樉绀�")
- @GetMapping("approve-records")
- public R<List<ApproveRecordVO>> processTrace1(@Parameter(description = "绋嬪簭id") Long ncProgramId){
- List<TaskTraceVO> result = new ArrayList<>();
-
- return R.data(approveRecordService.listByNcProgramId(ncProgramId));
- }
-
-
- /*
- @PostMapping("/send")
- @Operation(summary = "绋嬪簭涓嬪彂", description = "宸ユ帶缃戞暟鎺х▼搴忎笅鍙戯紙鍙戦�佸埌鏈哄簥閰嶇疆鐨勪笅鍙戠洰褰曪級,鏍规嵁id")
- public R<List<NcProgramVO>> send(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long id) {
- return null;//R.data(ncProcessProgRefService.listByProcess(processInstanceId));
- }*/
-
- @PostMapping("/send-to-machine-by-nodeid")
- @Operation(summary = "绋嬪簭涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍")
- public R<Void> sendToMachineByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) {
- try {
- ncProgramService.sendByBindNodeId(nodeId);
- return R.success();
- }catch(Exception e) {
- log.error("鍒犻櫎鏂囦欢澶辫触",e);
- return R.fail(e.getMessage());
- }
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
index 3bbe281..92f20ac 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
@@ -19,7 +19,6 @@
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.NcProgramExportDNCService;
-import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
import org.springframework.web.bind.annotation.*;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramExchangeStatController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramExchangeStatController.java
deleted file mode 100644
index 2cc2f61..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/ProgramExchangeStatController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package org.springblade.mdm.program.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.program.service.NcProgramExchangeStatService;
-import org.springblade.mdm.program.vo.ProgramExchangeStatQueryVO;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 娴佺▼绠＄悊鎺ュ彛
- *
- * @author Chill
- */
-@NonDS
-@RestController
-@RequestMapping("/program/stat")
-@AllArgsConstructor
-@Tag(name = "涓嬪彂/鍥炰紶绋嬪簭缁熻", description = "涓嬪彂/鍥炰紶绋嬪簭缁熻")
-@Slf4j
-public class ProgramExchangeStatController {
-
- private final NcProgramExchangeStatService service;
-
- @Operation(summary = "鍙戦�佺▼搴忕粺璁�", description = "鍙戦�佺▼搴忕粺璁�")
- @GetMapping("/page")
- public R<IPage<MachineVO>> page(ProgramExchangeStatQueryVO query) {
- IPage<MachineVO> pages = service.distributeStatPageQuery(query);
- return R.data(pages);
- }
- //ProgramExchangeStatQueryVO
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
deleted file mode 100644
index 6f2c0d5..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.springblade.mdm.program.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-import org.springblade.core.mp.base.BizEntity;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Setter
-@Getter
-@TableName("mdm_nc_program")
-public class NcProgram extends BizEntity {
- /**
- * 鏂囦欢鍚�
- */
- private String name;
- /**
- * 瀵硅薄瀛樺偍涓殑鍚嶇О
- */
- private String ossName;
- private String code;
- /**
- * 鎵�灞炶妭鐐筰d锛屽繀椤绘湭鈥滅▼搴忓寘鍚�"鐨勮妭鐐�
- */
- private long ncNodeId;
- /**
- * 鍚屽悕缁戝畾鑺傜偣id
- */
- private Long bindNcNodeId;
- /**
- * 鏂囦欢鍦板潃
- */
- private String url;
- /**
- * 鏂囦欢绫诲瀷
- */
- private String category;
-
- /**
- * 鏄惁涓烘枃鏈被鍨�
- */
- private Boolean isTextFile;
-
- /**
- * 宸ュ簭锛屽鈥滅簿閾ｂ��
- */
- private String processName;
-
- /**
- * 宸ュ簭鍙�
- */
- private String processNo;
- /**
- * 澶囨敞
- */
- //private String remark;
- /**
- * 璁惧锛堟満搴婏級缂栫爜
- */
- private String machineCode;
- /**
- * 闆剁粍浠跺彿/鍥惧彿
- */
- private String drawingNo;
-
- /**
- * 鎻忚堪
- */
- private String description;
- /**
- * 鏄惁鍥哄寲
- */
- private Integer isCured;
- /**
- * 杩囨湡鏃ユ湡
- */
- //private LocalDate expireDate;
- /**
- * 宸ュ簭鐗堟
- */
- private String processEdition;
-
- /**
- * 宸ヨ壓鐗堟
- */
- private String craftEdition;
- /**
- * 鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟
- */
- private Integer isLastEdition = 1;
- /**
- * 鏄惁閿佸畾
- */
- private Integer isLocked = 0;
- /**
- * 鏄惁娴嬭瘯绋嬪簭
- */
- private Integer isTest = 0;
- /**
- * 浠诲姟鍒嗘淳鏃堕棿
- */
- private LocalDateTime taskAssignTime;
-
- /**
- * 鐗堟湰鍙凤紝涓婁紶涓�娆＄▼搴忥紝灏变細+1
- */
- private Integer versionNumber;
-
- /**
- * 鏄惁鍦ㄦ湁鏁堟湡鍐�
- * @param effectiveMonths 鏈夋晥鏃堕暱锛堟湀鏁帮級锛屽湪绯荤粺鍙傛暟涓厤缃�
- * @return
- */
- public boolean withinValidity(int effectiveMonths){
- //鏈夋晥鏈熸寜鐓т粈涔堟椂闂磋绠楁帹绠楋紵鏆傛椂鎸夌収浠诲姟鍒嗛厤鏃堕棿锛� 浠诲姟鍒嗛厤鏃堕棿 + 鏈夋晥鏈堜唤 < 褰撳墠鏃堕棿涓烘湁鏁�
- if(taskAssignTime == null ){
- return false;
- }
- //
- return taskAssignTime.plusMonths(effectiveMonths).isBefore(LocalDateTime.now());
- }
-
-
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
index d2af8b7..3a3adab 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
@@ -1,10 +1,8 @@
package org.springblade.mdm.program.mapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.vo.*;
import java.util.List;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
deleted file mode 100644
index 8f1d071..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.springblade.mdm.program.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcNodeProgramVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
-
-import java.util.List;
-
-public interface NcProgramMapper extends BladeMapper<NcProgram> {
-
- /**
- * 鑾峰彇鏈�鏂板浐鍖栫▼搴�
- * @param drawingNo 闆剁粍浠跺彿
- * @param machineGroupCode 鏈哄簥缁勪唬鐮�
- * @return
- */
- List<NcProgram> getCuredNcProgram( @Param("drawingNo")String drawingNo,@Param("machineGroupCode")String machineGroupCode);
-
- IPage<NcProgramVO> pageQuery(@Param("page")IPage<NcNodeProgramVO> page, @Param("query") NcNodeProgramQueryVO query);
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
deleted file mode 100644
index b77475a..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.mdm.program.mapper.NcProgramMapper">
- <resultMap id="BaseResultMap" type="org.springblade.mdm.program.entity.NcProgram">
- <id column="id" property="id"/>
- <result column="code" property="code"/>
- <result column="name" property="name"/>
- <result column="package_name" property="packageName"/>
- <result column="machine_code" property="machineCode"/>
-
- <result column="drawing_no" property="drawingNo"/>
- <result column="is_cured" property="isCured"/>
- <result column="expire_date" property="expireDate"/>
- <result column="process_edition" property="processEdition"/>
- <result column="is_last_edition" property="isLastEdition"/>
- <result column="is_locked" property="isLocked"/>
- <result column="task_assign_time" property="taskAssignTime"/>
-
- <result column="status" property="status"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
-<!--
-
- <select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
- select m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,m.manufacturer,m.operator
- from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
- ${ew.customSqlSegment}
- </select>
--->
-
-
- <!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
-<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
-<!-- </select>-->
- <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,drawing_no,is_cured,
- expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
- <select id="getCuredNcProgram" resultMap="BaseResultMap">
- select <include refid="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and drawing_no=#{drawingNo} and is_last_edition=1
- and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
- order by create_time desc
- </select>
-
- <select id="pageQuery" resultType="org.springblade.mdm.program.vo.NcProgramVO">
- select id,nc_node_id,name,machine_code,drawing_no,drawing_no_edition,process_name,craft_edition from mdm_nc_program p
- where is_deleted=0 and is_last_edition=1 and (category='program' or category='subprogram')
- <where>
-
- <if test="query.name!=null and query.name!=''">
- and p.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
- </if>
- </where>
- </select>
-
-</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
deleted file mode 100644
index 5b854c7..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.springblade.mdm.program.mapper;
-
-import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.ProcessProgRef;
-import org.springblade.mdm.program.vo.NcNodeVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
-
-import java.util.List;
-
-public interface ProcessProgRefMapper extends BladeMapper<ProcessProgRef> {
-
- List<NcProgramVO> listByProcess(String processInstanceId);
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
deleted file mode 100644
index dc83159..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.mdm.program.mapper.ProcessProgRefMapper">
-
-
- <select id="listByProcess" resultType="org.springblade.mdm.program.vo.NcProgramVO">
- select p.id,p.name,p.machine_code,url,code from mdm_process_prog_ref r join mdm_nc_program p on r.nc_program_id=p.id
- where process_instance_id=#{processInstanceId} and p.is_deleted=0
- </select>
-</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramApprovedService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramApprovedService.java
index 655ee1f..1100743 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramApprovedService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramApprovedService.java
@@ -1,43 +1,17 @@
package org.springblade.mdm.program.service;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.mapper.NcProgramApprovedMapper;
-import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
-import org.springblade.mdm.utils.CustomBinaryWriter;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
/**
* 涓嬪彂/鍥炰紶绋嬪簭缁熻
@@ -48,10 +22,7 @@
@Service
@AllArgsConstructor
public class NcProgramApprovedService extends BizServiceImpl<NcProgramApprovedMapper, NcProgramApproved> {
- private final NcProgramService progService;
- private final OssTemplate ossTemplate;
- private final ApproveRecordService approvedService;
- private final NcNodeService ncNodeService;
+
/**
* 鍒嗛〉鏌ヨ
* @param query 鏌ヨ鍙傛暟
@@ -66,8 +37,6 @@
return this.getBaseMapper().exportDncPageQuery(Condition.getPage(query),query);
}
-
-
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeStatService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeStatService.java
deleted file mode 100644
index c697351..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeStatService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package org.springblade.mdm.program.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.mapper.NcProgramMapper;
-import org.springblade.mdm.program.vo.ProgramExchangeStatQueryVO;
-import org.springframework.stereotype.Service;
-
-/**
- * 涓嬪彂/鍥炰紶绋嬪簭缁熻
- *
- * @author yangys
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class NcProgramExchangeStatService extends BizServiceImpl<NcProgramMapper, NcProgram> {
-
- private final NcProgramMapper programMapper;
-
- /**
- * 绋嬪簭涓嬪彂缁熻鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
- */
- public IPage<MachineVO> distributeStatPageQuery(ProgramExchangeStatQueryVO query) {
- //鍥犺鏄瘡娆″鍑洪兘鏈変竴涓褰曪紙閲嶅鐨勫彲浠ユ洿鏂板鍑烘椂闂达級锛岀劧鍚庢牴鎹繖涓褰曡繘琛岀粺璁★紝
- /*
- IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
-
- //MachineSpec.valueOf()
- for (MachineVO record : page.getRecords()) {
- if(record.getMachineSpec() != null){
- MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
- record.setMachineSpecName(spec.getText());
- }
-
- }
- return page;
-
- */
- return null;
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
deleted file mode 100644
index dfe1fef..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
-package org.springblade.mdm.program.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.model.BladeFile;
-import org.springblade.mdm.basesetting.machine.service.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.ProgramSeq;
-import org.springblade.mdm.program.mapper.NcProgramMapper;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.mapper.ProgramSeqMapper;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcProgramUploadVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
-import org.springblade.mdm.utils.FileContentUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * 宸ヤ綔娴佹湇鍔″疄鐜扮被
- *
- * @author Chill
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class NcProgramService extends BizServiceImpl<NcProgramMapper, NcProgram> {
-
- private final MachineService machineService;
- private final OssTemplate ossTemplate;
- private final NcNodeService nodeService;
- private final ProgramSeqMapper seqMapper;
- /**
- * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
- * @param drwaingNo
- * @param machineCode
- * @return
- */
- public List<NcProgram> getCuredNcProgram(String drwaingNo,String machineCode) {
- Machine machine = machineService.getByCode(machineCode);
- return this.getBaseMapper().getCuredNcProgram(drwaingNo,machine.getMachineGroupCode());
- }
-
- /**
- * 涓婁紶绋嬪簭鏂囦欢鍒版寚瀹氳妭鐐�
- * @param uploadVO 涓婁紶鏂囦欢琛ㄥ崟鏁版嵁
- */
- public void uploadProgramFileNew(NcProgramUploadVO uploadVO) {
-
- MultipartFile file = uploadVO.getFile();
- BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
- String link = bfile.getLink();
- //淇濆瓨profame
- NcProgram prog = new NcProgram();
- prog.setCode(generageCode());
- prog.setName(file.getOriginalFilename());
- prog.setNcNodeId(uploadVO.getNodeId());
- prog.setOssName(bfile.getName());
- prog.setDrawingNo(uploadVO.getDrawingNo());
- prog.setProcessEdition(uploadVO.getProcessEdition());
- prog.setIsLastEdition(1);
- prog.setMachineCode(uploadVO.getMachineCode());
- prog.setProcessName(uploadVO.getProcessName());
- boolean isTextFile = false;
- try {
- isTextFile = FileContentUtil.isTextFile(file.getInputStream());
- } catch (IOException e) {
- log.warn("鍒ゆ柇鏄惁鏂囨湰鏂囦欢寮傚父",e);
- }
- prog.setIsTextFile(isTextFile);
- prog.setUrl(link);
- prog.setCategory(uploadVO.getCategory());
-
- NcNode node = new NcNode();
- node.setNodeType("70");//鏂囦欢鑺傜偣
- node.setName(prog.getName());
- node.setMachineCode(uploadVO.getMachineCode());
- node.setParentId(uploadVO.getNodeId());
- node.setDrawingNo(uploadVO.getDrawingNo());
- node.setProcessName(uploadVO.getProcessName());
-
- NcNode parentNode = nodeService.getById(uploadVO.getNodeId());
- node.setParentIds(parentNode.getParentIds()+","+uploadVO.getNodeId());
- //uploadVO.getre
- //node.setDescription(uploadVO.getDrawingNo());
- nodeService.save(node);
-
- prog.setBindNcNodeId(node.getId());
- this.save(prog);
- }
-
- String generageCode(){
- ProgramSeq program = new ProgramSeq();
- seqMapper.insert(program);
-
- DecimalFormat df = new DecimalFormat("0000000000");
- return df.format(program.getId());
- }
-
- /**
- * 鍒犻櫎涓�涓▼搴�
- * @param id
- */
- public void removeProgram(Long id) {
- NcProgram prog = this.getById(id);
- ossTemplate.removeFile(prog.getOssName());
- this.getBaseMapper().deleteById(id);
- }
-
- public List<NcProgramVO> listByNode(Long nodeId) {
- NcNode node = nodeService.getById(nodeId);
- List<NcProgram> pList = this.list(Wrappers.lambdaQuery(NcProgram.class).eq(NcProgram::getNcNodeId, nodeId).eq(NcProgram::getIsLastEdition,1).orderByDesc(NcProgram::getCreateTime));
-
- List<NcProgramVO> result = new ArrayList<>();
-
- pList.forEach(prog -> {
- NcProgramVO vo = new NcProgramVO();
- BeanUtils.copyProperties(prog, vo);
- vo.setMachineCode(node.getMachineCode());
- result.add(vo);
- });
-
- return result;
- }
-
- /**
- * 鍗囩増(鍗囩骇宸ュ簭鐗堟),鍗囩骇宸ュ簭鐗堟湰锛堝寘鎷▼搴忓拰鍏朵粬闄勪欢锛�
- * @param bindNcNodeId 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
- * @param newProcessEdition 鏂扮増娆�
- */
- public void upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition) {
- //NcProgram prog = this.getById(id);
- NcProgram prog = getByBindNodeId(bindNcNodeId);
-
- //灏嗙幇鏈夌▼搴忔洿鏂颁负闈炴渶鏂扮増鏈�
- this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeId).set(NcProgram::getIsLastEdition,0));
-
- NcProgram newVerProg = new NcProgram();
- BeanUtils.copyProperties(prog, newVerProg);
- newVerProg.setId(null);
- newVerProg.setIsLastEdition(1);
- newVerProg.setProcessEdition(newProcessEdition);
-
- this.save(newVerProg);
- }
-
- /**
- * 鍒嗛〉鏌ヨ锛岀敤浜庡鎵规椂閫夋嫨绋嬪簭
- * @param query
- * @return
- */
- public IPage<NcProgramVO> pageQuery(NcNodeProgramQueryVO query) {
- return this.getBaseMapper().pageQuery(Condition.getPage(query),query);
- }
-
- /**
- * 涓嬪彂缁欎綘鏈哄簥
- * @param bindNcNodeId 涓庣▼搴忕粦瀹氱殑鑺傜偣id
- */
- public void sendByBindNodeId(Long bindNcNodeId) throws IOException {
- //NcNode node = this.nodeService.getById(bindNodeId);
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
- wrapper.eq(NcProgram::getIsLastEdition,1);
- NcProgram prog = this.getOne(wrapper);
-
- String filePath = getFilePath(prog);
- try(InputStream ins = ossTemplate.statFileStream(prog.getOssName());){
- File targetFile = new File(filePath);
- FileUtils.copyInputStreamToFile(ins, targetFile);
- }
- }
-
- String getFilePath(NcProgram prog){
- Machine machine = machineService.getByCode(prog.getMachineCode());
- String dirPath = machine.getProgSendDir();
-
- dirPath = StringUtils.removeEnd(StringUtils.removeEnd(dirPath,"/"),"\\");
- File dirs = new File(dirPath);
- if(!dirs.exists()){
- dirs.mkdirs();
- }
-
- return dirPath+File.separator+prog.getName();
- }
-
- /**
- *
- * @param bindNcNodeId
- * @return
- */
- public NcProgram getByBindNodeId(Long bindNcNodeId) {
-
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
- wrapper.eq(NcProgram::getIsLastEdition,1);
-
- Optional<NcProgram> progOpt = this.getOneOpt(wrapper);
-
- return progOpt.orElse(null);
- }
-
- /**
- * 鏍规嵁绋嬪簭鍚嶇О鑾峰彇鏈�鏂扮殑绋嬪簭鏁版嵁
- * @param name 绋嬪簭鍚嶇О
- * @return
- */
- public NcProgram getByName(String name) {
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(NcProgram::getName, name);
- wrapper.eq(NcProgram::getIsLastEdition,1);
- Optional<NcProgram> progOpt = this.getOneOpt(wrapper);
-
- return progOpt.orElse(null);
- }
-
- /**
- *
- * @param nodeId 涓婄骇鑺傜偣id
- * @param name 绋嬪簭鍚嶇О
- */
- public boolean programExistsUnderNode(Long nodeId, String name) {
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(nodeId!=null,NcProgram::getNcNodeId, nodeId);
- wrapper.eq(NcProgram::getName, name);
- wrapper.eq(NcProgram::getIsLastEdition,1);
-
- return this.count(wrapper)>0;
- }
-
- /**
- *
- * @param nodeId 涓婄骇鑺傜偣id
- * @param name 绋嬪簭鍚嶇О
- */
- public boolean programExistsUnderOtherNode(Long nodeId, String name) {
- LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
- wrapper.ne(NcProgram::getNcNodeId, nodeId);
- wrapper.eq(NcProgram::getName, name);
- wrapper.eq(NcProgram::getIsLastEdition,1);
-
- return this.count(wrapper)>0;
- }
-
- /**
- * 鏄剧ず绋嬪簭鐨勫巻鍙茶褰曞垪琛�
- * @param bindNodeId
- * @return
- */
- /*
- public List<NcProgramVO> historyByBindNode(Long bindNodeId) {
-
- NcProgram program = this.getByBindNodeId(bindNodeId);
- List<NcProgram> list = this.lambdaQuery().eq(NcProgram::getName,program.getName())
- .eq(NcProgram::getNcNodeId,program.getNcNodeId()).orderByDesc(NcProgram::getCreateTime).list();
-
- return list.stream().map(p -> {
- NcProgramVO vo = new NcProgramVO();
- BeanUtils.copyProperties(p,vo);
- return vo;}).toList();
- }*/
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
deleted file mode 100644
index ad0c4e5..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
-package org.springblade.mdm.program.service;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.mdm.flow.service.FlowCommonService;
-import org.springblade.mdm.program.entity.ProcessProgRef;
-import org.springblade.mdm.program.mapper.ProcessProgRefMapper;
-import org.springblade.mdm.program.vo.NcProgramVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 宸ヤ綔娴佹湇鍔″疄鐜扮被
- *
- * @author Chill
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {
- private final FlowCommonService flowCommonService;
- /**
- * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
- * @param processInstanceId 娴佺▼瀹炰緥id
- * @param programIds 绋嬪簭id
- * @return
- */
- @Transactional
- public void addRelations(String processInstanceId, List<Long> programIds) {
- if(programIds == null || programIds.isEmpty()) {
- return;
- }
-
- String processDefinationKey = flowCommonService.getDefinitionKey(processInstanceId);
- this.lambdaUpdate().eq(ProcessProgRef::getProcessInstanceId, processInstanceId).remove();
- List<ProcessProgRef> entities = new ArrayList<>();
- for (Long programId : programIds) {
- ProcessProgRef entity = new ProcessProgRef();
- entity.setProcessInstanceId(processInstanceId);
- entity.setNcProgramId(programId);
- entity.setProcessDefinitionKey(processDefinationKey);
- entities.add(entity);
- }
- this.saveBatch(entities);
- }
-
- /**
- * 鏌ヨ娴佺▼鍏宠仈鐨勭▼搴�
- * @param processInstanceId
- * @return
- */
- public List<NcProgramVO> listByProcess(String processInstanceId) {
- return this.getBaseMapper().listByProcess(processInstanceId);
- }
-
- /**
- *鑾峰彇鏈�鍚庝竴璋冧换鍔″垎娲剧殑鏁版嵁锛屾牴鎹▼搴廼d
- * @param ncProgramId 鏁版帶绋嬪簭id
- */
- /*
- public ProcessProgRef lastDispatchDataByNcProgramId(Long ncProgramId) {
- LambdaQueryWrapper<ProcessProgRef> query = Wrappers.lambdaQuery();
-
- query.eq(ProcessProgRef::getNcProgramId, ncProgramId).eq(ProcessProgRef::getProcessDefinitionKey, StartDispatcher.PROCESS_KEY).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 1");;
-
- List<ProcessProgRef> list = this.list(query);
- return list.isEmpty() ? null : list.get(0);
- }*/
-}
--
Gitblit v1.9.3