From 0eb2de47356408212a2641801ac7fd1aed7f5c33 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 20 二月 2025 09:41:57 +0800
Subject: [PATCH] 优化分配权限代码 默认新增添加管理员权限
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 66a807d..d785c97 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -104,7 +104,7 @@
private ISysParamsService ISysParamsService;
@Resource
- private DncDevicePermissionMapper dncDevicePermissionMapper;
+ private IDncDevicePermissionService iDncDevicePermissionService;
@Value("${fileNCPath}")
private String fileNCPath;
@@ -158,11 +158,7 @@
this.save(mdcEquipment);
//DNC娣诲姞璁惧鏉冮檺
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(mdcEquipment.getId());
- dncDevicePermission.setUserId(userId);
- dncDevicePermissionMapper.insert(dncDevicePermission);
+ iDncDevicePermissionService.addDevicePermission(mdcEquipment.getId(), user.getId());
//step.2 淇濆瓨鎵�灞為儴闂�
if (oConvertUtils.isNotEmpty(selectedDeparts)) {
String[] arr = selectedDeparts.split(",");
@@ -228,7 +224,7 @@
}
}
//鍒犻櫎鎵�鏈夎澶囨潈闄�
- dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getDeviceId, mdcEquipment.getId()));
+ iDncDevicePermissionService.remove(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getDeviceId, mdcEquipment.getId()));
//step.3 淇敼浜х嚎
String productions = mdcEquipment.getSelectedProduction();
String[] array = {};
@@ -253,14 +249,10 @@
addDevicePermission(mdcEquipment);
//step.4 淇敼璁惧鏉冮檺
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- List<DncDevicePermission> dncDevicePermissions=dncDevicePermissionMapper.selectList(new LambdaQueryWrapper<DncDevicePermission>()
- .eq(DncDevicePermission::getDeviceId, mdcEquipment.getId()).eq(DncDevicePermission ::getUserId, userId));
+ List<DncDevicePermission> dncDevicePermissions=iDncDevicePermissionService.list(new LambdaQueryWrapper<DncDevicePermission>()
+ .eq(DncDevicePermission::getDeviceId, mdcEquipment.getId()).eq(DncDevicePermission ::getUserId, user.getId()));
if (CollectionUtils.isEmpty(dncDevicePermissions)){
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(mdcEquipment.getId());
- dncDevicePermission.setUserId(userId);
- dncDevicePermissionMapper.insert(dncDevicePermission);
+ iDncDevicePermissionService.addDevicePermission(mdcEquipment.getId(), user.getId());
}
}
@@ -270,10 +262,7 @@
.stream().map(MdcProductionEquipment::getProductionId).collect(Collectors.toList());
List<MdcUserProduction> mdcUserProductionList=mdcUserProductionService.queryByProductionIds(productionIds);
mdcUserProductionList.forEach(item->{
- DncDevicePermission devicePermission=new DncDevicePermission();
- devicePermission.setDeviceId(mdcEquipment.getId());
- devicePermission.setUserId(item.getUserId());
- dncDevicePermissionMapper.insert(devicePermission);
+ iDncDevicePermissionService.addDevicePermission(mdcEquipment.getId(), item.getUserId());
});
}
@@ -288,7 +277,7 @@
// 3. 鍒犻櫎璁惧浜х嚎鍏崇郴
line += mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getEquipmentId, id));
// 4. 鍒犻櫎璁惧鏉冮檺
- line += dncDevicePermissionMapper.delete(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId, id));
+ line += iDncDevicePermissionService.remove(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId, id))? 1 : 0;
return line != 0;
}
@@ -330,7 +319,7 @@
public void removeEquipmentForProduction(String productionId, String equipmentId) {
mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId).eq(MdcProductionEquipment::getEquipmentId, equipmentId));
//绉婚櫎璁惧鏉冮檺
- dncDevicePermissionMapper.delete(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId, equipmentId));
+ iDncDevicePermissionService.remove(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId, equipmentId));
}
@Override
--
Gitblit v1.9.3