From c800257cb6c8b45e7edc20e2e9018cd90b230806 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 09 七月 2025 19:50:00 +0800
Subject: [PATCH] art: 技术状态鉴定-基础代码生成
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 058a528..a3a94d7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -15,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.aspect.annotation.PermissionData;
@@ -26,9 +27,7 @@
import org.jeecg.common.util.*;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.model.*;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
@@ -98,6 +97,12 @@
@Resource
private IMdcUserProductionService userProductionService;
+ @Resource
+ private IEamBaseRepairDepartUserService eamBaseRepairDepartUserService;
+
+ @Resource
+ private IBaseFactoryUserService iBaseFactoryUserService;
+
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃鏁版嵁
*
@@ -157,9 +162,12 @@
if (userIds != null && userIds.size() > 0) {
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
Map<String, String> useProNames = sysUserService.getProNamesByUserIds(userIds);
+ Map<String, String> useRepDepNames = sysUserService.getRepDepNamesByUserIds(userIds);
pageList.getRecords().forEach(item -> {
item.setOrgCodeTxt(useDepNames.get(item.getId()));
item.setProductionName(useProNames.get(item.getId()));
+ item.setRepairDepartName(useRepDepNames.get(item.getId()));
+ item.setEamFactoryIds( String.join(",",iBaseFactoryUserService.queryEamCenterIdsByUserId(item.getId())));
});
}
result.setSuccess(true);
@@ -176,9 +184,13 @@
String selectedRoles = jsonObject.getString("selectedroles");
String selectedDeparts = jsonObject.getString("selecteddeparts");
String selectedProductions = jsonObject.getString("selectedProduction");
+ String selectedRepairDeparts = jsonObject.getString("selectedRepairDeparts");
+ String factoryIds=jsonObject.getString("selectedBaseFactory");
try {
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
user.setCreateTime(new Date());//璁剧疆鍒涘缓鏃堕棿
+ user.setPasswordTime(new Date());//璁剧疆瀵嗙爜鏃堕棿
+ user.setPasswordFlag(CommonConstant.DEL_FLAG_1);//璁剧疆瀵嗙爜棣栨鏍囪瘑
String salt = oConvertUtils.randomGen(8);
user.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
@@ -188,7 +200,10 @@
//鐢ㄦ埛琛ㄥ瓧娈祇rg_code涓嶈兘鍦ㄨ繖閲岃缃粬鐨勫��
user.setOrgCode(null);
// 淇濆瓨鐢ㄦ埛璧颁竴涓猻ervice 淇濊瘉浜嬪姟
- sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions);
+ sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions, selectedRepairDeparts);
+ if (oConvertUtils.isNotEmpty(factoryIds)) {
+ iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
+ }
baseCommonService.addLog("娣诲姞鐢ㄦ埛锛寀sername锛� " + user.getUsername(), CommonConstant.LOG_TYPE_2, 2);
result.success("娣诲姞鎴愬姛锛�");
} catch (Exception e) {
@@ -216,6 +231,8 @@
String roles = jsonObject.getString("selectedroles");
String departs = jsonObject.getString("selecteddeparts");
String productions = jsonObject.getString("selectedProduction");
+ String repairDeparts = jsonObject.getString("selectedRepairDeparts");
+ String factoryIds=jsonObject.getString("selectedBaseFactory");
if (oConvertUtils.isEmpty(departs)) {
//vue3.0鍓嶇鍙紶閫掍簡departIds
departs = user.getDepartIds();
@@ -223,10 +240,16 @@
if (oConvertUtils.isNotEmpty(productions)) {
productions = user.getProductionIds();
}
+ if (oConvertUtils.isNotEmpty(repairDeparts)) {
+ repairDeparts = user.getRepairDepartIds();
+ }
+ if (oConvertUtils.isNotEmpty(factoryIds)) {
+ iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
+ }
//鐢ㄦ埛琛ㄥ瓧娈祇rg_code涓嶈兘鍦ㄨ繖閲岃缃粬鐨勫��
user.setOrgCode(null);
// 淇敼鐢ㄦ埛璧颁竴涓猻ervice 淇濊瘉浜嬪姟
- sysUserService.editUser(user, roles, departs, productions);
+ sysUserService.editUser(user, roles, departs, productions, repairDeparts);
result.success("淇敼鎴愬姛!");
}
} catch (Exception e) {
@@ -352,7 +375,7 @@
/**
* 淇敼瀵嗙爜
*/
- //@RequiresRoles({"admin"})
+ @RequiresRoles({"admin"})
@RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
public Result<?> changePassword(@RequestBody SysUser sysUser) {
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
@@ -407,6 +430,54 @@
result.setSuccess(true);
result.setMessage("鏌ユ壘鎴愬姛");
result.setResult(proIdModelList);
+ } else {
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘澶辫触");
+ }
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘杩囩▼涓嚭鐜颁簡寮傚父: " + e.getMessage());
+ return result;
+ }
+ }
+
+ @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
+ @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
+ @GetMapping(value = "/userRepairDepartList")
+ public Result<List<RepairDepartIdModel>> userRepairDepartList(@RequestParam(name = "userId", required = true) String userId) {
+ Result<List<RepairDepartIdModel>> result = new Result<>();
+ try {
+ List<RepairDepartIdModel> repDepIdModelList = this.eamBaseRepairDepartUserService.queryRepairDepartIdsOfUser(userId);
+ if (repDepIdModelList != null && !repDepIdModelList.isEmpty()) {
+ result.setSuccess(true);
+ result.setMessage("鏌ユ壘鎴愬姛");
+ result.setResult(repDepIdModelList);
+ } else {
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘澶辫触");
+ }
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘杩囩▼涓嚭鐜颁簡寮傚父: " + e.getMessage());
+ return result;
+ }
+ }
+
+ @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�")
+ @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�")
+ @GetMapping(value = "/userBaseFactoryList")
+ public Result<List<EamBaseFactoryIdModel>> userBaseFactoryList(@RequestParam(name = "userId", required = true) String userId) {
+ Result<List<EamBaseFactoryIdModel>> result = new Result<>();
+ try {
+ List<EamBaseFactoryIdModel> repDepIdModelList = this.iBaseFactoryUserService.queryEamBaseFactoryIdsOfUser(userId);
+ if (repDepIdModelList != null && !repDepIdModelList.isEmpty()) {
+ result.setSuccess(true);
+ result.setMessage("鏌ユ壘鎴愬姛");
+ result.setResult(repDepIdModelList);
} else {
result.setSuccess(false);
result.setMessage("鏌ユ壘澶辫触");
@@ -638,17 +709,17 @@
String oldpassword = json.getString("oldpassword");
String password = json.getString("password");
String confirmpassword = json.getString("confirmpassword");
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (!sysUser.getUsername().equals(username)) {
- return Result.error("鍙厑璁镐慨鏀硅嚜宸辩殑瀵嗙爜锛�");
- }
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ //if (!sysUser.getUsername().equals(username)) {
+ // return Result.error("鍙厑璁镐慨鏀硅嚜宸辩殑瀵嗙爜锛�");
+ //}
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
if (user == null) {
return Result.error("鐢ㄦ埛涓嶅瓨鍦紒");
}
//update-begin---author:wangshuai ---date:20220316 for锛歔VUEN-234]淇敼瀵嗙爜娣诲姞鏁忔劅鏃ュ織------------
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- baseCommonService.addLog("淇敼瀵嗙爜锛寀sername锛� " + loginUser.getUsername(), CommonConstant.LOG_TYPE_2, 2);
+ //LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ baseCommonService.addLog("淇敼瀵嗙爜锛寀sername锛� " + username, CommonConstant.LOG_TYPE_2, 2);
//update-end---author:wangshuai ---date:20220316 for锛歔VUEN-234]淇敼瀵嗙爜娣诲姞鏁忔劅鏃ュ織------------
return sysUserService.resetPassword(username, oldpassword, password, confirmpassword);
}
--
Gitblit v1.9.3