From 904727f59b7e10a291ce7d1576e33192a619f2f2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 05 八月 2025 17:08:39 +0800
Subject: [PATCH] MDC设备树和设备权限改造

---
 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java |   75 ++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 35ecc9a..b38d527 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -24,6 +24,8 @@
 import org.jeecg.modules.base.entity.UserFactory;
 import org.jeecg.modules.base.mapper.UserFactoryMapper;
 import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.mdc.entity.MdcUserProduction;
+import org.jeecg.modules.mdc.mapper.MdcUserProductionMapper;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -84,11 +86,9 @@
 	@Resource
 	UserFactoryMapper userFactoryMapper;
 	@Resource
+	MdcUserProductionMapper mdcUserProductionMapper;
+	@Resource
 	private ISysDictService sysDictService;
-	@Resource
-	private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
-	@Resource
-	private DncDevicePermissionMapper dncDevicePermissionMapper;
 
     @Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -591,22 +591,22 @@
 		//step.4 淇濆瓨鎵�灞炰骇绾�
 		if (oConvertUtils.isNotEmpty(selectedProductions)) {
 			arr = selectedProductions.split(",");
-			for (String factoryId : arr) {
-				UserFactory userFactory = new UserFactory(user.getId(), factoryId);
-				userFactoryMapper.insert(userFactory);
+			for (String productionId : arr) {
+				UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
+				userFactoryMapper.insert(mdcUserProduction);
 			}
 		}
 		//step.5 淇濆瓨璁惧鏉冮檺
-		List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
-				.stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
-		if (oConvertUtils.isNotEmpty(EquipmentIds)) {
-			for (String equipmentId : EquipmentIds) {
-				DncDevicePermission dncDevicePermission=new DncDevicePermission();
-				dncDevicePermission.setDeviceId(equipmentId);
-				dncDevicePermission.setUserId(user.getId());
-				dncDevicePermissionMapper.insert(dncDevicePermission);
-			}
-		}
+//		List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
+//				.stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+//		if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+//			for (String equipmentId : EquipmentIds) {
+//				DncDevicePermission dncDevicePermission=new DncDevicePermission();
+//				dncDevicePermission.setDeviceId(equipmentId);
+//				dncDevicePermission.setUserId(user.getId());
+//				dncDevicePermissionMapper.insert(dncDevicePermission);
+//			}
+//		}
 	}
 
 	@Override
@@ -663,24 +663,25 @@
 		//鍏堝垹鍚庡姞
 		userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
 		if (oConvertUtils.isNotEmpty(productions)) {
-			for (String factoryId : array) {
-				UserFactory userFactory = new UserFactory(user.getId(), factoryId);
-				userFactoryMapper.insert(userFactory);
+			for (String productionId : array) {
+				UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
+				userFactoryMapper.insert(mdcUserProduction);
 			}
 		}
+
 		//step.5 淇敼璁惧鏉冮檺
 		//鍏堝垹鍚庡姞
-		dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
-		List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
-				.stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
-		if (oConvertUtils.isNotEmpty(EquipmentIds)) {
-			for (String equipmentId : EquipmentIds) {
-				DncDevicePermission dncDevicePermission=new DncDevicePermission();
-				dncDevicePermission.setDeviceId(equipmentId);
-				dncDevicePermission.setUserId(user.getId());
-				dncDevicePermissionMapper.insert(dncDevicePermission);
-			}
-		}
+//		dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
+//		List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
+//				.stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+//		if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+//			for (String equipmentId : EquipmentIds) {
+//				DncDevicePermission dncDevicePermission=new DncDevicePermission();
+//				dncDevicePermission.setDeviceId(equipmentId);
+//				dncDevicePermission.setUserId(user.getId());
+//				dncDevicePermissionMapper.insert(dncDevicePermission);
+//			}
+//		}
 		//step.6 淇敼鎵嬫満鍙峰拰閭
 		// 鏇存柊鎵嬫満鍙枫�侀偖绠辩┖瀛楃涓蹭负 null
 		userMapper.updateNullByEmptyString("email");
@@ -822,4 +823,16 @@
 	public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
 		return userMapper.getUserByGroupId(page,groupId,username);
 	}
+
+	/**
+	 * 鏍规嵁浜х嚎Id鏌ヨ
+	 * @param page
+	 * @param factoryId 鐝粍id
+	 * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+	 * @return
+	 */
+	@Override
+	public IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username) {
+		return userMapper.getUserByFactoryId(page,factoryId,username);
+	}
 }

--
Gitblit v1.9.3