基础数据，产线，班次，班组

cuijian

2025-06-26 2166b1661ca1e94fae6e4631799a9997418bff43

 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;
    }

}