From b231e345300e34c9c918cbd7e2db44d334eb4937 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期六, 28 六月 2025 21:55:44 +0800 Subject: [PATCH] 供应商管理、线边库管理、产线人员绑定 --- src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 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 b1de9f0..a438754 100644 --- a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -25,6 +25,7 @@ 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.UserFactory; import org.jeecg.modules.base.entity.UserGroup; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.service.IUserFactoryService; @@ -35,6 +36,7 @@ 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.SysUserFactoryVO; import org.jeecg.modules.system.vo.SysUserGroupVO; import org.jeecg.modules.system.vo.SysUserRoleVO; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -1690,4 +1692,98 @@ return result; } + @RequestMapping(value = "/userFactoryList", method = RequestMethod.GET) + public Result<IPage<SysUser>> userFactoryList(@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 factoryId = req.getParameter("factoryId"); + String username = req.getParameter("username"); + IPage<SysUser> pageList = sysUserService.getUserByFactoryId(page, factoryId, username); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 缁欐寚瀹氫骇绾挎坊鍔犱汉鍛� + * + * @param + * @return + */ + //@RequiresRoles({"admin"}) + @RequestMapping(value = "/addBaseUserFactory", method = RequestMethod.POST) + public Result<String> addBaseUserFactory(@RequestBody SysUserFactoryVO sysUserFactoryVO) { + Result<String> result = new Result<String>(); + try { + String factoryId = sysUserFactoryVO.getFactoryId(); + for (String userId : sysUserFactoryVO.getUserIdList()) { + UserFactory userFactory = new UserFactory(factoryId,userId); + QueryWrapper<UserFactory> queryWrapper = new QueryWrapper<UserFactory>(); + queryWrapper.eq("factory_id", factoryId).eq("user_id", userId); + UserFactory one = userFactoryService.getOne(queryWrapper); + if (one == null) { + userFactoryService.save(userFactory); + } + + } + 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 = "/deleteUserFactory", method = RequestMethod.DELETE) + public Result<UserFactory> deleteUserFactory(@RequestParam(name = "factoryId") String factoryId, + @RequestParam(name = "userId", required = true) String userId + ) { + Result<UserFactory> result = new Result<UserFactory>(); + try { + QueryWrapper<UserFactory> queryWrapper = new QueryWrapper<UserFactory>(); + queryWrapper.eq("factory_id", factoryId).eq("user_id", userId); + userFactoryService.remove(queryWrapper); + result.success("鍒犻櫎鎴愬姛!"); + } catch (Exception e) { + log.error(e.getMessage(), e); + result.error500("鍒犻櫎澶辫触锛�"); + } + return result; + } + + /** + * 鎵归噺鍒犻櫎鎸囧畾浜х嚎鐨勪汉鍛樺叧绯� + * + * @param + * @return + */ + //@RequiresRoles({"admin"}) + @RequestMapping(value = "/deleteUserFactoryBatch", method = RequestMethod.DELETE) + public Result<UserFactory> deleteUserFactoryBatch( + @RequestParam(name = "factoryId") String factoryId, + @RequestParam(name = "userIds", required = true) String userIds) { + Result<UserFactory> result = new Result<UserFactory>(); + try { + QueryWrapper<UserFactory> queryWrapper = new QueryWrapper<UserFactory>(); + queryWrapper.eq("factory_id", factoryId).in("user_id", Arrays.asList(userIds.split(","))); + userFactoryService.remove(queryWrapper); + result.success("鍒犻櫎鎴愬姛!"); + } catch (Exception e) { + log.error(e.getMessage(), e); + result.error500("鍒犻櫎澶辫触锛�"); + } + return result; + } + } -- Gitblit v1.9.3