From caf455ecaf600e2cb62d69db1b72031d89b97f1b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 27 六月 2025 17:59:50 +0800
Subject: [PATCH] art: 数据库设计修改
---
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 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 37f72de..89a4838 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -20,6 +21,8 @@
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.common.util.oConvertUtils;
+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.system.entity.*;
import org.jeecg.modules.system.mapper.*;
@@ -79,13 +82,9 @@
@Autowired
SysRoleIndexMapper sysRoleIndexMapper;
@Resource
- MdcUserProductionMapper mdcUserProductionMapper;
+ UserFactoryMapper userFactoryMapper;
@Resource
private ISysDictService sysDictService;
- @Resource
- private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
- @Resource
- private DncDevicePermissionMapper dncDevicePermissionMapper;
@Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -519,7 +518,7 @@
// 2. 鍒犻櫎鐢ㄦ埛閮ㄩ棬鍏崇郴
line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
// 3. 鍒犻櫎鐢ㄦ埛浜х嚎鍏崇郴
- line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
+ line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
//3. 鍒犻櫎鐢ㄦ埛瑙掕壊鍏崇郴
line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
//4.鍚屾鍒犻櫎绗笁鏂笰pp鐨勭敤鎴�
@@ -588,22 +587,22 @@
//step.4 淇濆瓨鎵�灞炰骇绾�
if (oConvertUtils.isNotEmpty(selectedProductions)) {
arr = selectedProductions.split(",");
- for (String productionId : arr) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : arr) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//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
@@ -658,26 +657,26 @@
array = productions.split(",");
}
//鍏堝垹鍚庡姞
- mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::getUserId, user.getId()));
+ userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
if (oConvertUtils.isNotEmpty(productions)) {
- for (String productionId : array) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : array) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//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");
@@ -806,4 +805,17 @@
(existing, replacement) -> existing // 閲嶅閿鐞�
));
}
+
+
+ /**
+ * 鏍规嵁鐝粍Id鏌ヨ
+ * @param page
+ * @param groupId 鐝粍id
+ * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+ * @return
+ */
+ @Override
+ public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
+ return userMapper.getUserByGroupId(page,groupId,username);
+ }
}
--
Gitblit v1.9.3