From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 二月 2025 14:55:56 +0800
Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java | 92 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
index e1c09c3..9e4f927 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
@@ -71,6 +71,8 @@
@Autowired
private IProcessStreamService processStreamService;
@Autowired
+ private IWorkStepService workStepService;
+ @Autowired
private IPermissionStreamService permissionStreamService;
@Autowired
private IDepartmentService departmentService;
@@ -195,16 +197,17 @@
//鏍￠獙寮�濮�
if(stream == null)
ExceptionCast.cast(CommonCode.INVALID_PARAM);
- if(!ValidateUtil.validateString(stream.getProcessId()) || !ValidateUtil.validateString(stream.getDocId())
- || !ValidateUtil.validateString(stream.getFileId()))
+ if(!ValidateUtil.validateString(stream.getAttributionId()) || !ValidateUtil.validateString(stream.getDocId())
+ || !ValidateUtil.validateString(stream.getFileId())||!ValidateUtil.validateString(stream.getAttributionType()) )
ExceptionCast.cast(ActivitiCode.ACT_BUSINESS_SAVE_ERROR);
if(!ValidateUtil.validateString(stream.getDeviceId()))
ExceptionCast.cast(ActivitiCode.ACT_ASSIGN_DEVICE_NONE);
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
- DocInfo docInfo = docInfoService.getByDocAttrAndDocId(stream.getDocId(), 5, stream.getProcessId());
+ //淇敼涓哄墠绔紶鍏�
+ DocInfo docInfo = docInfoService.getByDocAttrAndDocId(stream.getDocId(), Integer.parseInt(stream.getAttributionType()), stream.getAttributionId());
if(docInfo == null || docInfo.getDocStatus() == 3)
ExceptionCast.cast(ActivitiCode.ACT_DOC_ERROR);
DeviceInfo deviceInfo = deviceInfoService.getById(stream.getDeviceId());
@@ -315,8 +318,8 @@
public ResponseResult applyAssignFileNonActive(AssignFileStream stream) {
if(stream == null)
ExceptionCast.cast(CommonCode.INVALID_PARAM);
- if(!ValidateUtil.validateString(stream.getProcessId()) || !ValidateUtil.validateString(stream.getDocId())
- || !ValidateUtil.validateString(stream.getFileId()))
+ if(!ValidateUtil.validateString(stream.getAttributionId()) || !ValidateUtil.validateString(stream.getDocId())
+ || !ValidateUtil.validateString(stream.getFileId())||!ValidateUtil.validateString(stream.getAttributionType()))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
if(!ValidateUtil.validateString(stream.getDeviceId()))
ExceptionCast.cast(ActivitiCode.ACT_ASSIGN_DEVICE_NONE);
@@ -324,7 +327,7 @@
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
- DocInfo docInfo = docInfoService.getByDocAttrAndDocId(stream.getDocId(), 5, stream.getProcessId());
+ DocInfo docInfo = docInfoService.getByDocAttrAndDocId(stream.getDocId(), Integer.parseInt(stream.getAttributionType()), stream.getAttributionId());
if(docInfo == null || docInfo.getDocStatus() == 3)
ExceptionCast.cast(ActivitiCode.ACT_DOC_ERROR);
@@ -356,29 +359,62 @@
docFile.getFileName(), docFile.getFileSuffix());
}
}*/
- ProcessStream processStream = processStreamService.getById(stream.getProcessId());
- if(processStream == null)
- ExceptionCast.cast(CommonCode.INVALID_PARAM);
- stream.setProductId(processStream.getProductId());
- stream.setComponentId(processStream.getComponentId());
- stream.setPartsId(processStream.getPartsId());
- List<PermissionStream> permissionStreams = null;
- if(ValidateUtil.validateString(processStream.getPartsId())) {
- //杩涘叆闆朵欢
- permissionStreams = permissionStreamService.getByPartsId(stream.getProductId(), stream.getComponentId(), stream.getPartsId());
- }else if(ValidateUtil.validateString(processStream.getComponentId())) {
- //杩涘叆閮ㄤ欢鐨勫鐞�
- permissionStreams = permissionStreamService.getByComponentId(stream.getProductId(), stream.getComponentId());
- }
- if(permissionStreams == null || permissionStreams.isEmpty())
- ExceptionCast.cast(ActivitiCode.ACT_NODE_DEPART_NONE);
List<String> departIds = new ArrayList<>();
- Map<String, Department> map = departmentService.getMapByUserId(userId);
- permissionStreams.forEach(item -> {
- if(map.containsKey(item.getDepartId())) {
- departIds.add(item.getDepartId());
+ if (stream.getAttributionType().equals("5")){
+ //宸ュ簭
+ ProcessStream processStream = processStreamService.getById(stream.getAttributionId());
+ if(processStream == null)
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ stream.setProductId(processStream.getProductId());
+ stream.setComponentId(processStream.getComponentId());
+ stream.setPartsId(processStream.getPartsId());
+ stream.setProcessId(stream.getAttributionId());
+ List<PermissionStream> permissionStreams = null;
+ if(ValidateUtil.validateString(processStream.getPartsId())) {
+ //杩涘叆闆朵欢
+ permissionStreams = permissionStreamService.getByPartsId(stream.getProductId(), stream.getComponentId(), stream.getPartsId());
+ }else if(ValidateUtil.validateString(processStream.getComponentId())) {
+ //杩涘叆閮ㄤ欢鐨勫鐞�
+ permissionStreams = permissionStreamService.getByComponentId(stream.getProductId(), stream.getComponentId());
}
- });
+ if(permissionStreams == null || permissionStreams.isEmpty())
+ ExceptionCast.cast(ActivitiCode.ACT_NODE_DEPART_NONE);
+ Map<String, Department> map = departmentService.getMapByUserId(userId);
+ permissionStreams.forEach(item -> {
+ if(map.containsKey(item.getDepartId())) {
+ departIds.add(item.getDepartId());
+ }
+ });
+ }else{
+ //宸ユ
+ WorkStep workStep=workStepService.getById(stream.getAttributionId());
+ 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.setProcessId(stream.getAttributionId());
+ List<PermissionStream> permissionStreams = null;
+ if(ValidateUtil.validateString(workStep.getProcessId())) {
+ //杩涘叆宸ュ簭
+ permissionStreams=permissionStreamService.getByProcessId(stream.getProductId(), stream.getComponentId(), stream.getPartsId(),stream.getProcessId());
+ }else if(ValidateUtil.validateString(workStep.getPartsId())) {
+ //杩涘叆闆朵欢
+ permissionStreams = permissionStreamService.getByPartsId(stream.getProductId(), stream.getComponentId(), stream.getPartsId());
+ }else if(ValidateUtil.validateString(workStep.getComponentId())) {
+ //杩涘叆閮ㄤ欢鐨勫鐞�
+ permissionStreams = permissionStreamService.getByComponentId(stream.getProductId(), stream.getComponentId());
+ }
+ if(permissionStreams == null || permissionStreams.isEmpty())
+ ExceptionCast.cast(ActivitiCode.ACT_NODE_DEPART_NONE);
+ Map<String, Department> map = departmentService.getMapByUserId(userId);
+ permissionStreams.forEach(item -> {
+ if(map.containsKey(item.getDepartId())) {
+ departIds.add(item.getDepartId());
+ }
+ });
+ }
if(departIds.isEmpty())
ExceptionCast.cast(ActivitiCode.ACT_USER_NOT_PERM);
//deviceDoc = docInfoService.findByAttrAndDocName(docInfo.getDocName(), 4, stream.getDeviceId());
--
Gitblit v1.9.3