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/dnc/service/impl/PartsInfoServiceImpl.java | 68 +++++++++++++++-------------------
1 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
index bd53894..414797d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
@@ -21,6 +22,7 @@
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.entity.*;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.apache.commons.collections4.ListUtils;
@@ -53,6 +55,8 @@
private IDocInfoService docInfoService;
@Autowired
private INcLogInfoService iNcLogInfoService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addPartsInfo(PartsInfo partsInfo) {
@@ -125,30 +129,23 @@
b = partsPermissionService.save(permission);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞榛樿宸ュ簭
- ProcessStream processStream = new ProcessStream();
- processStream.setProductId(partsInfo.getProductId());
- processStream.setComponentId(partsInfo.getComponentId());
- processStream.setPartsId(partsInfo.getPartsId());
- processStream.setProcessCode("1");
- b = processStreamService.save(processStream);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
+// if(!b)
+// ExceptionCast.cast(CommonCode.FAIL);
//娣诲姞鐢ㄦ埛鏉冮檺
PermissionStream stream = new PermissionStream();
stream.setProductId(partsInfo.getProductId());
stream.setComponentId(partsInfo.getComponentId());
stream.setPartsId(partsInfo.getPartsId());
stream.setUserId(userId);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfogx = new NcLogInfo();
- //妯″潡
- ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfogx.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfogx.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
+// //娣诲姞鏃ュ織
+// NcLogInfo ncLogInfogx = new NcLogInfo();
+// //妯″潡
+// ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
+// //绫诲瀷
+// ncLogInfogx.setOperateType(2);
+// //鏃ュ織鍐呭
+// ncLogInfogx.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
+// iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
return permissionStreamService.save(stream);
}
@@ -279,6 +276,11 @@
if(processStreams != null && !processStreams.isEmpty())
ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST);
boolean b = partsPermissionService.deleteByPartsId(partsInfo.getPartsId());
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","3").eq("attribution_id",partsId));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(PartsInfoCode.PARTS_DOC_EXIST);
+ }
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
b = partsDepartmentService.deleteByPartsId(partsInfo.getPartsId());
@@ -290,18 +292,6 @@
b = permissionStreamService.deleteDepartPermsByPartsId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId());
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = docInfoService.deleteByPartsId(partsInfo.getPartsId());
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
return super.removeById(partsInfo.getPartsId());
}
@@ -383,23 +373,24 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean assignAddDepart(PartsInfo partsInfo, Collection<Department> departmentList) {
+ public boolean assignAddDepart(PartsInfo partsInfo, Collection<MdcProduction> departmentList) {
if(partsInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsDepartment> partsDepartments = new ArrayList<>();
List<PermissionStream> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
- PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getDepartId());
+ PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getId());
if(en == null) {
en = new PartsDepartment();
- en.setDepartId(item.getDepartId());
+ en.setDepartId(item.getId());
en.setPartsId(partsInfo.getPartsId());
partsDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId(), item.getDepartId());
+ PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(),
+ partsInfo.getPartsId(), item.getId());
if(stream == null) {
stream = new PermissionStream();
- stream.setDepartId(item.getDepartId());
+ stream.setDepartId(item.getId());
stream.setProductId(partsInfo.getProductId());
stream.setComponentId(partsInfo.getComponentId());
stream.setPartsId(partsInfo.getPartsId());
@@ -423,17 +414,18 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean assignRemoveDepart(PartsInfo partsInfo, Collection<Department> departmentList) {
+ public boolean assignRemoveDepart(PartsInfo partsInfo, Collection<MdcProduction> departmentList) {
if(partsInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<PartsDepartment> partsDepartments = new ArrayList<>();
List<PermissionStream> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
- PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getDepartId());
+ PartsDepartment en = partsDepartmentService.getByPartsIdAndDepartId(partsInfo.getPartsId(), item.getId());
if(en != null) {
partsDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(), partsInfo.getPartsId(), item.getDepartId());
+ PermissionStream stream = permissionStreamService.getByPartsIdAndDepartId(partsInfo.getProductId(), partsInfo.getComponentId(),
+ partsInfo.getPartsId(), item.getId());
if(stream != null) {
permissionStreamList.add(stream);
}
--
Gitblit v1.9.3