update

Lius

8 天以前 9af27ed8da6b5710025fb080f96a7dd9e80467a4

 src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -12,6 +12,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import liquibase.pro.packaged.I;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -25,16 +26,20 @@
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;
import org.jeecg.modules.base.service.IUserGroupService;
import org.jeecg.modules.mdc.model.ProductionIdModel;
import org.jeecg.modules.mdc.service.IMdcUserProductionService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
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.SysUserFactoryVO;
import org.jeecg.modules.system.vo.SysUserGroupVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -102,6 +107,9 @@

    @Resource
    private IUserFactoryService userFactoryService;

    @Resource
    private IMdcUserProductionService userProductionService;

    @Resource
    private IUserGroupService userGroupService;
@@ -471,10 +479,10 @@
    @AutoLog(value = "用户表-查询指定用户和产线关联的数据")
    @ApiOperation(value = "用户表-查询指定用户和产线关联的数据", notes = "用户表-查询指定用户和产线关联的数据")
    @GetMapping(value = "/userProductionList")
    public Result<List<FactoryIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
        Result<List<FactoryIdModel>> result = new Result<>();
    public Result<List<ProductionIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
        Result<List<ProductionIdModel>> result = new Result<>();
        try {
            List<FactoryIdModel> proIdModelList = this.userFactoryService.queryFactoryIdsOfUser(userId);
            List<ProductionIdModel> proIdModelList = this.userProductionService.queryProductionIdsOfUser(userId);
            if (proIdModelList != null && !proIdModelList.isEmpty()) {
                result.setSuccess(true);
                result.setMessage("查找成功");
@@ -1690,4 +1698,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;
    }

}