图片压缩及bug修改

zhanghua

2023-12-12 bc2da7908a227c09e5cc7b6d8dab3e9c94b784a1

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -18,12 +18,13 @@
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsRole;
import com.ycl.mapper.depart.UmsDepartMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsMenuService;
import com.ycl.utils.AesEncryptUtil;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
@@ -80,8 +81,10 @@
    @ApiOperation(value = "登录以后返回token")
    @RequestMapping(value = "/login", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult login(@Validated @RequestBody UmsAdminLoginParam umsAdminLoginParam) {
        String token = adminService.login(umsAdminLoginParam.getUsername(), umsAdminLoginParam.getPassword());
    public CommonResult login(@Validated @RequestBody UmsAdminLoginParam umsAdminLoginParam) throws Exception {
        String password = AesEncryptUtil.desEncrypt(umsAdminLoginParam.getPassword());
//        String password = umsAdminLoginParam.getPassword();
        String token = adminService.login(umsAdminLoginParam.getUsername(), password);
        if (token == null) {
            return CommonResult.validateFailed("用户名或密码错误");
        }
@@ -150,7 +153,7 @@
    public void exportUser(HttpServletResponse response) {
        List<UmsUserDto1> umsUserDtos = adminService.userExp();
        String sheetName = "用户导出";
        EasyExcelUtils.export(response, sheetName, UmsUserDto1.class, umsUserDtos);
        EasyExcelUtils.export1(response, sheetName, UmsUserDto1.class, umsUserDtos, "用户导出");
    }

    @Resource
@@ -158,9 +161,10 @@
    @Resource
    private UmsAdminMapper umsAdminMapper;
    @Resource
    private DataDictionaryMapper dataDictionaryMapper;
    private DataDictionary2Mapper dataDictionary2Mapper;
    @Resource
    private UmsDepartMapper umsDepartMapper;

    @ApiOperation("用户导入")
    @PostMapping("/import")
    public CommonResult importUser(MultipartFile file) throws IOException {
@@ -175,20 +179,20 @@
                        param.setNickName(item.getNickName());

                        String sex = item.getSex();
                        if (sex.equals("男")){
                        if (sex.equals("男")) {
                            param.setSex((byte) 1);
                        } else if (sex.equals("女")) {
                            param.setSex((byte) 0);
                        }else {
                        } else {
                            throw new RuntimeException("性别输入有误");
                        }

                        String isDy = item.getIsDy();
                        if (isDy.equals("是")){
                        if (isDy.equals("是")) {
                            param.setSex((byte) 1);
                        } else if (isDy.equals("否")) {
                            param.setSex((byte) 0);
                        }else {
                        } else {
                            throw new RuntimeException("党员输入有误");
                        }

@@ -197,27 +201,27 @@

                        String role = item.getRole();
                        UmsRole umsRole = umsRoleMapper.selectOne(new LambdaQueryWrapper<UmsRole>().eq(UmsRole::getName, role));
                        if (Objects.isNull(umsRole)){
                        if (Objects.isNull(umsRole)) {
                            param.setRoleIds(null);
                        }else {
                        } else {
                            List list = new ArrayList<>();
                            list.add(umsRole.getId());
                            param.setRoleIds(list);
                        }

                        String userType = item.getUserType();
                        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
                        if (Objects.isNull(dataDictionary)){
                        DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
                        if (Objects.isNull(dataDictionary)) {
                            throw new RuntimeException("用户类型不存在");
                        }else {
                        } else {
                            param.setUserType(dataDictionary.getId().intValue());
                        }

                        String department = item.getDepartment();
                        UmsDepart umsDepart = umsDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, department));
                        if (Objects.isNull(umsDepart)){
                        if (Objects.isNull(umsDepart)) {
                            throw new RuntimeException("部门不存在");
                        }else {
                        } else {
                            param.setDepartmentId(umsDepart.getId());
                        }

@@ -234,7 +238,6 @@
                }).sheet().doRead();
        return CommonResult.success(true, "导入成功");
    }



    @ApiOperation("获取指定用户信息")
@@ -271,7 +274,7 @@
            return CommonResult.failed("找不到该用户");
        } else if (status == -3) {
            return CommonResult.failed("旧密码错误");
        }else if (status == -4) {
        } else if (status == -4) {
            return CommonResult.failed("密码不能和登录名完全一致");
        } else {
            return CommonResult.failed();
@@ -361,4 +364,11 @@
    public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
        return CommonResult.success(adminService.getDepartUser(departId));
    }

    @GetMapping(value = "/systemInfo")
    @ResponseBody
    public String getImages(HttpServletRequest request, HttpServletResponse response) {
        return "遂昌综合执法平台";

    }
}