1.得分计算部分调整； 2.大屏得分计算；

mitao

2024-04-15 ce7e6574a1f9942fc090d989b52aceaa11ba8f3e

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,7 +1,7 @@
package com.ruoyi.web.controller.system;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
@@ -11,9 +11,10 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.dto.SysUserDTO;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
import com.ruoyi.system.dto.update.SysUserPwdUpdDTO;
import com.ruoyi.system.dto.update.SysUserUpdDTO;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.ISysDeptService;
@@ -71,8 +72,8 @@
    @ApiOperation(value = "获取用户列表")
    @PostMapping("/list")
    public AjaxResult list(@RequestBody SysUserQuery query) {
        PageInfo<SysUserVO> list = userService.pageList(query);
        return AjaxResult.success(list);
        PageDTO<SysUserVO> page = userService.pageList(query);
        return AjaxResult.success(page);
    }

    @ApiOperation(value = "获取用户列表-不分页")
@@ -210,7 +211,7 @@
    /**
     * 获取用户数量统计
     */
    @ApiOperation(value = "获取用户数量统计")
//    @ApiOperation(value = "获取用户数量统计")
    @PostMapping("/getUserCount")
    public AjaxResult getUserCount() {
        Map<String, Integer> map = new HashMap<>();
@@ -288,11 +289,12 @@
        }
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        user.setNickName(user.getUserName());
        userService.insertUser(user);
        SysUserRole sysUserRole = new SysUserRole();
   /*     SysUserRole sysUserRole = new SysUserRole();
        sysUserRole.setUserId(user.getUserId());
        sysUserRole.setRoleId(dto.getRoleId());
        userRoleMapper.insertUserRole(sysUserRole);
        userRoleMapper.insertUserRole(sysUserRole);*/
        return AjaxResult.success();
    }

@@ -303,20 +305,34 @@
    @ApiOperation(value = "修改用户管理")
    @Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@Validated @RequestBody SysUser user) {
        user.setUserName(user.getPhoneNumber());
    public AjaxResult edit(@Validated @RequestBody SysUserUpdDTO dto) {
        SysUser user = this.userService.selectUserById(dto.getUserId());
        user.setUserName(dto.getUserName());
        user.setNickName(dto.getUserName());
        user.setPhoneNumber(dto.getPhoneNumber());
        user.setRoleId(dto.getRoleId());
//        userService.checkUserAllowed(user);
//        userService.checkUserDataScope(user.getUserId());
        if (!userService.checkUserNameUnique(user)) {
        /*if (!userService.checkUserNameUnique(user)) {
            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
        } else if (StringUtils.isNotEmpty(user.getPhoneNumber()) && !userService.checkPhoneUnique(
        } else*/
        if (StringUtils.isNotEmpty(user.getPhoneNumber()) && !userService.checkPhoneUnique(
                user)) {
            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }

        user.setUpdateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        return AjaxResult.success(userService.updateUser(user));
    }

    @ApiOperation(value = "修改密码")
    @Log(title = "用户信息-修改密码", businessType = BusinessType.UPDATE)
    @PostMapping("/edit-password")
    public AjaxResult editPassword(@Validated @RequestBody SysUserPwdUpdDTO dto) {
        SysUser user = this.userService.getById(dto.getUserId());
        user.setUpdateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        return AjaxResult.success(userService.updateById(user));
    }

    /**
@@ -342,7 +358,7 @@
     * 重置密码
     */
    // @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
    @ApiOperation(value = "重置密码")
//    @ApiOperation(value = "重置密码")
    @Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
    @PostMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody SysUser user) {