统计修改

zhanghua

2023-03-18 87a395a6024278594a0a80d25a24ba4ca5993513

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

@@ -4,15 +4,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.dto.*;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsRole;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsRoleService;
import com.ycl.service.user.UmsMenuService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
@@ -21,12 +21,16 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.HashMap;
import java.util.List;
@@ -47,7 +51,7 @@
    @Autowired
    private UmsAdminService adminService;
    @Autowired
    private UmsRoleService roleService;
    UmsMenuService umsMenuService;
    @Resource
    private RedisService redisService;

@@ -101,13 +105,12 @@
        }
        String username = principal.getName();
        UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        Map<String, Object> data = new HashMap<>();
        data.put("userId", umsAdmin.getId());
        data.put("username", umsAdmin.getUsername());
        data.put("menus", roleService.getMenuList(umsAdmin.getId()));
        data.put("icon", umsAdmin.getIcon());
        data.put("user", umsAdmin);
        data.put("menus", umsMenuService.ListTreeMyself(user.getUserId()));
        List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
        if (CollUtil.isNotEmpty(roleList)) {    
        if (CollUtil.isNotEmpty(roleList)) {
            List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
            data.put("roles", roles);
        }
@@ -130,6 +133,24 @@
        IPage<UmsAdmin> page = adminService.pageUser(pageUserVO);
        return CommonResult.success(page);
    }


    @ApiOperation("用户导出")
    @PostMapping("/export")
    public void exportUser(HttpServletResponse response) {
        List<UmsUserDto> umsUserDtos = adminService.userExp();
        String sheetName = "用户导出";
        EasyExcelUtils.export(response, sheetName, UmsUserDto.class, umsUserDtos);
    }

    @ApiOperation("用户导入")
    @PostMapping("/import")
    public CommonResult importUser(MultipartFile file) throws IOException {
        EasyExcelUtils.importDepartFile(file);
        return CommonResult.success(true, "导入成功");
    }



    @ApiOperation("获取指定用户信息")
    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@@ -160,11 +181,13 @@
        if (status > 0) {
            return CommonResult.success(status);
        } else if (status == -1) {
            return CommonResult.failed("提交参数不合法");
            return CommonResult.failed("密码长度8到16位且密码中的字符必须包含字母（大写或者小写）和必须包含数字，不能包含空格");
        } else if (status == -2) {
            return CommonResult.failed("找不到该用户");
        } else if (status == -3) {
            return CommonResult.failed("旧密码错误");
        }else if (status == -4) {
            return CommonResult.failed("密码不能和登录名完全一致");
        } else {
            return CommonResult.failed();
        }