From 2166b1661ca1e94fae6e4631799a9997418bff43 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 26 六月 2025 11:40:37 +0800
Subject: [PATCH] 基础数据，产线，班次，班组
---
src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index ba318e0..b1de9f0 100644
--- a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -25,13 +25,17 @@
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.*;
+import org.jeecg.modules.base.entity.UserGroup;
import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.base.service.IUserFactoryService;
+import org.jeecg.modules.base.service.IUserGroupService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
+import org.jeecg.modules.base.model.FactoryIdModel;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
+import org.jeecg.modules.system.vo.SysUserGroupVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -97,7 +101,10 @@
private BaseCommonService baseCommonService;
@Resource
- private IMdcUserProductionService userProductionService;
+ private IUserFactoryService userFactoryService;
+
+ @Resource
+ private IUserGroupService userGroupService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃鏁版嵁
@@ -464,10 +471,10 @@
@AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
@ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
@GetMapping(value = "/userProductionList")
- public Result<List<ProductionIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
- Result<List<ProductionIdModel>> result = new Result<>();
+ public Result<List<FactoryIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
+ Result<List<FactoryIdModel>> result = new Result<>();
try {
- List<ProductionIdModel> proIdModelList = this.userProductionService.queryProductionIdsOfUser(userId);
+ List<FactoryIdModel> proIdModelList = this.userFactoryService.queryFactoryIdsOfUser(userId);
if (proIdModelList != null && !proIdModelList.isEmpty()) {
result.setSuccess(true);
result.setMessage("鏌ユ壘鎴愬姛");
@@ -1588,4 +1595,99 @@
return ls;
}
+
+ @RequestMapping(value = "/userGroupList", method = RequestMethod.GET)
+ public Result<IPage<SysUser>> userGroupList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+ Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+ String groupId = req.getParameter("groupId");
+ String username = req.getParameter("username");
+ IPage<SysUser> pageList = sysUserService.getUserByGroupId(page, groupId, username);
+ result.setSuccess(true);
+ result.setResult(pageList);
+ return result;
+ }
+
+ /**
+ * 缁欐寚瀹氱彮缁勬坊鍔犱汉鍛�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/addBaseUserGroup", method = RequestMethod.POST)
+ public Result<String> addBaseUserGroup(@RequestBody SysUserGroupVO sysUserGroupVO) {
+ Result<String> result = new Result<String>();
+ try {
+ String groupId = sysUserGroupVO.getGroupId();
+ for (String userId : sysUserGroupVO.getUserIdList()) {
+ UserGroup userGroup = new UserGroup(groupId,userId);
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).eq("user_id", userId);
+ UserGroup one = userGroupService.getOne(queryWrapper);
+ if (one == null) {
+ userGroupService.save(userGroup);
+ }
+
+ }
+ result.setMessage("娣诲姞鎴愬姛!");
+ result.setSuccess(true);
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("鍑洪敊浜�: " + e.getMessage());
+ return result;
+ }
+ }
+
+ /**
+ * 鍒犻櫎鎸囧畾鐝粍鐨勪汉鍛樺叧绯�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/deleteUserGroup", method = RequestMethod.DELETE)
+ public Result<UserGroup> deleteUserGroup(@RequestParam(name = "groupId") String groupId,
+ @RequestParam(name = "userId", required = true) String userId
+ ) {
+ Result<UserGroup> result = new Result<UserGroup>();
+ try {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).eq("user_id", userId);
+ userGroupService.remove(queryWrapper);
+ result.success("鍒犻櫎鎴愬姛!");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鍒犻櫎澶辫触锛�");
+ }
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎸囧畾鐝粍鐨勪汉鍛樺叧绯�
+ *
+ * @param
+ * @return
+ */
+ //@RequiresRoles({"admin"})
+ @RequestMapping(value = "/deleteUserGroupBatch", method = RequestMethod.DELETE)
+ public Result<UserGroup> deleteUserGroupBatch(
+ @RequestParam(name = "groupId") String groupId,
+ @RequestParam(name = "userIds", required = true) String userIds) {
+ Result<UserGroup> result = new Result<UserGroup>();
+ try {
+ QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<UserGroup>();
+ queryWrapper.eq("group_id", groupId).in("user_id", Arrays.asList(userIds.split(",")));
+ userGroupService.remove(queryWrapper);
+ result.success("鍒犻櫎鎴愬姛!");
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鍒犻櫎澶辫触锛�");
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.3