From fe20260305eaa4c3ffc59ca11d770e2038c18fa9 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 18 二月 2025 13:52:12 +0800
Subject: [PATCH] 修改pom
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java
index d55f9d9..c75b3d9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java
@@ -22,6 +22,7 @@
import org.jeecg.modules.system.entity.MdcProductionEquipment;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.IMdcUserProductionService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.dnc.response.DeviceCode;
import org.jeecg.modules.dnc.response.DeviceGroupCode;
@@ -68,7 +69,8 @@
private IMdcEquipmentService mdcEquipmentService;
@Autowired
private IMdcProductionEquipmentService mdcProductionEquipmentService;
-
+ @Autowired
+ private IMdcUserProductionService mdcUserProductionService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addDeviceInfo(DeviceInfo deviceInfo) {
@@ -243,13 +245,13 @@
}
@Override
- public List<UserDepartExt> getUserPermsList(Integer nodeType, String paramId) {
+ public List<SysUser> getUserPermsList(Integer nodeType, String paramId) {
if(!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
return null;
if(nodeType == 1) {
- return deviceGroupPermissionService.getUserPermsByGroupId(paramId);
+ return mdcUserProductionService.getUserPermsByGroupId(paramId);
}else if(nodeType == 2) {
- return devicePermissionService.getUserPermsByDeviceId(paramId);
+ return mdcUserProductionService.getUserPermsByDeviceId(paramId);
}else {
return null;
}
@@ -260,9 +262,9 @@
if(!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
return null;
if(nodeType == 1) {
- return deviceGroupPermissionService.getUserNonPermsByGroupId(paramId);
+ return mdcUserProductionService.getUserNonPermsByGroupId(paramId);
}else if(nodeType == 2) {
- return devicePermissionService.getUserNonPermsByDeviceId(paramId);
+ return mdcUserProductionService.getUserNonPermsByDeviceId(paramId);
}else {
return null;
}
@@ -296,14 +298,14 @@
ExceptionCast.cast(DeviceGroupCode.DEVICE_GROUP_PERM_ERROR);
}
//鑾峰彇鍒嗙粍涓嬫墍鏈夌殑瀛愬垎缁�
- List<MdcProduction> childrenList = mdcProductionService.queryProdByPid(mdcProduction.getId());
+ List<MdcProduction> childrenList = mdcProductionService.recursionChildrenByPid(mdcProduction.getId());
List<String> childrenIds = new ArrayList<>();
if(childrenList != null && !childrenList.isEmpty()) {
childrenList.forEach(item -> {
childrenIds.add(item.getId());
boolean b = checkDevicePerm(1, item.getId());
if(b) {
- b = deviceGroupPermissionService.assignAddUser(mdcProduction, userList);
+ b = deviceGroupPermissionService.assignAddUser(item, userList);
if(!b) {
ExceptionCast.cast(DeviceGroupCode.DEVICE_GROUP_PERM_ERROR);
}
@@ -486,14 +488,14 @@
ExceptionCast.cast(DeviceGroupCode.DEVICE_GROUP_PERM_ERROR);
}
//鑾峰彇鍒嗙粍涓嬫墍鏈夌殑瀛愬垎缁�
- List<MdcProduction> childrenList = mdcProductionService.queryProdByPid(mdcProduction.getId());
+ List<MdcProduction> childrenList = mdcProductionService.recursionChildrenByPid(mdcProduction.getId());
List<String> childrenIds = new ArrayList<>();
if(childrenList != null && !childrenList.isEmpty()) {
childrenList.forEach(item -> {
childrenIds.add(item.getId());
boolean b = checkDevicePerm(1, item.getId());
if(b) {
- b = deviceGroupPermissionService.assignRemoveUser(mdcProduction, userList);
+ b = deviceGroupPermissionService.assignRemoveUser(item, userList);
if(!b) {
ExceptionCast.cast(DeviceGroupCode.DEVICE_GROUP_PERM_ERROR);
}
--
Gitblit v1.9.3