From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java | 84 ++++--------------------------------------
1 files changed, 8 insertions(+), 76 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
index 49e51e3..3bfd2bb 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
@@ -44,7 +44,6 @@
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
-import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,10 +74,6 @@
@Autowired
private IProcessStreamService processStreamService;
@Autowired
- private IWorkStepService workStepService;
- @Autowired
- private IPermissionStreamNewService permissionStreamNewService;
- @Autowired
private IDocClassificationService classificationService;
@Autowired
private IToEquipmentTaskService equipmentTaskService;
@@ -105,9 +100,9 @@
@Autowired
private IFlowTaskService flowTaskService;
@Autowired
- private IDeviceTypeService deviceTypeService;
- @Autowired
private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private PermissionService permissionService;
@Value("${securedoc.whether}")
private String whether;
@@ -332,16 +327,10 @@
if(!b)
ExceptionCast.cast(ActivitiCode.ACT_APPROVE_ERROR);
if(up.getStatus() == 2) {
- DocInfo docInfo;
//鍚屾剰鎿嶄綔
- if (StrUtil.isNotEmpty(en.getStepId())){
- //宸ユ涓嬭澶囩被鎸囨淳
- docInfo = docInfoService.getByDocAttrAndDocId(en.getDocId(), 6, en.getDeviceTypeId());
- }else {
- docInfo = docInfoService.getByDocAttrAndDocId(en.getDocId(), 5, en.getDeviceTypeId());
- }
- if(docInfo == null || docInfo.getDocStatus() == 3)
- ExceptionCast.cast(ActivitiCode.ACT_DOC_ERROR);
+ DocInfo docInfo = docInfoService.getByDocAttrAndDocId(en.getDocId(), Integer.valueOf(en.getAttributionType()), en.getAttributionId());
+ if(docInfo == null )
+ ExceptionCast.cast(ActivitiCode.ACT_DOC_ERROR);
MdcEquipment mdcEquipment = iMdcEquipmentService.getById(en.getDeviceId());
if(mdcEquipment == null)
ExceptionCast.cast(ActivitiCode.ACT_ASSIGN_DEVICE_NONE);
@@ -593,69 +582,12 @@
}
private PermissionStreamNew getPermissionStreams(AssignFileStream stream) {
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- DeviceType deviceType = deviceTypeService.getById(stream.getAttributionId());
- String attributionId = deviceType != null ? deviceType.getAttributionId() : stream.getAttributionId();
-
- PermissionStreamNew permissionStreams;
- if (stream.getAttributionType().equals("5")) {
- // 宸ュ簭
- permissionStreams = handleProcess(stream, attributionId, user);
- } else {
- // 宸ユ
- permissionStreams = handleWorkStep(stream, attributionId, user);
- }
- if (permissionStreams == null) {
+ PermissionStreamNew permissionStreamNew = permissionService.getPermissionStreams(stream);
+ if (permissionStreamNew == null) {
ExceptionCast.cast(ActivitiCode.ACT_NODE_DEPART_NONE);
}
- return permissionStreams;
+ return permissionStreamNew ;
}
-
- private PermissionStreamNew handleProcess(AssignFileStream stream, String attributionId, LoginUser user) {
- ProcessStream processStream = processStreamService.getById(attributionId);
- if (processStream == null) {
- ExceptionCast.cast(CommonCode.INVALID_PARAM);
- }
- stream.setProductId(processStream.getProductId());
- stream.setComponentId(processStream.getComponentId());
- stream.setPartsId(processStream.getPartsId());
- stream.setProcessId(processStream.getProcessId());
- if (deviceTypeService.getById(stream.getAttributionId()) != null) {
- stream.setDeviceTypeId(deviceTypeService.getById(stream.getAttributionId()).getId());
- }
- return permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), user.getId(), "5");
- }
-
- private PermissionStreamNew handleWorkStep(AssignFileStream stream, String attributionId, LoginUser user) {
- WorkStep workStep = workStepService.getById(attributionId);
- if (workStep == null) {
- ExceptionCast.cast(CommonCode.INVALID_PARAM);
- }
- stream.setProductId(workStep.getProductId());
- stream.setComponentId(workStep.getComponentId());
- stream.setPartsId(workStep.getPartsId());
- stream.setProcessId(workStep.getProcessId());
- stream.setStepId(workStep.getId());
- if (deviceTypeService.getById(stream.getAttributionId()) != null) {
- stream.setDeviceTypeId(deviceTypeService.getById(stream.getAttributionId()).getId());
- }
- return permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(), user.getId(), "6");
- }
-
- //鑾峰彇閮ㄩ棬淇℃伅
- //todo 淇敼
- private List<String> getDepartIds(List<PermissionStream> permissionStreams, String userId) {
- Map<String, MdcProduction> map = iMdcProductionService.getUserAssignedDepart(userId);
- List<String> departIds = permissionStreams.stream()
- .filter(item -> map.containsKey(item.getDepartId()))
- .map(PermissionStream::getDepartId)
- .collect(Collectors.toList());
- if (departIds.isEmpty()) {
- ExceptionCast.cast(ActivitiCode.ACT_USER_NOT_PERM);
- }
- return departIds;
- }
-
//灏佽鏁版嵁
private void saveBusinessObject(AssignFileStream stream, String userId) {
--
Gitblit v1.9.3