文档

fuliqi

2024-03-01 a7c0dac0284663184d19806730380e3c5198db14

文档

 document/2023Ä깫°²¿ÆÐŹ¤×÷ÊУ¨ÖÝ£©¼¨Ð§ÆÀ¹ÀϸÔò¼°½âÊÍ£¨2023.4.13£©.docx

Binary files differ

 document/Ò»¡¢¶þ¡¢ÈýÆÚºÏͬ¿¼ºËÒªÇó.xlsx

Binary files differ

 document/Ò»»úÒ»µµ.xls

Binary files differ

 document/¸±±¾1020×Ô¹±ÊоÖÔËά¿¼ºËƽ̨.xlsx

Binary files differ

 document/ÉãÏñ»ú.xlsx

Binary files differ

 document/¹ÊÕÏÀàÐÍ.xlsx

Binary files differ

 document/×Ô¹±ÌìÍøÔËÐÐά»¤·½°¸.docx

Binary files differ

 document/×Ô¹±ÊоÖÔËά¿¼ºËƽ̨ÐèÇóÎĵµ.docx

Binary files differ

 ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java

@@ -58,6 +58,8 @@
    /** æœ€åŽç™»å½•æ—¶é—´ */
    private Date loginDate;

    /** æ˜¯å¦ä¸ºç¬¬ä¸€æ¬¡ç™»å½• 0为第一次登录需要修改密码 */
    private Short firstLogin;
    /** éƒ¨é—¨å¯¹è±¡ */
    private SysDept dept;

@@ -76,6 +78,14 @@
    public SysUser()
    {

    }

    public Short getFirstLogin() {
        return firstLogin;
    }

    public void setFirstLogin(Short firstLogin) {
        this.firstLogin = firstLogin;
    }

    public SysUser(Long userId)
@@ -303,6 +313,7 @@
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .append("dept", getDept())
            .append("firstLogin",getFirstLogin())
            .toString();
    }
}

 ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java

@@ -4,6 +4,7 @@
import com.ycl.config.PlatformConfig;
import com.ycl.system.AjaxResult;
import com.ycl.system.entity.SysUser;
import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.service.ISysUserService;
import com.ycl.system.service.TokenService;
@@ -12,30 +13,33 @@
import com.ycl.utils.file.MimeTypeUtils;
import enumeration.BusinessType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import utils.StringUtils;

/**
 * ä¸ªäººä¿¡æ¯ ä¸šåŠ¡å¤„理
 * 
 *
 * @author ruoyi
 */
@RestController
@RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController{
public class SysProfileController extends BaseController {
    @Autowired
    private ISysUserService userService;

    @Autowired
    private TokenService tokenService;

    @Autowired
    private SysUserMapper userMapper;

    /**
     * ä¸ªäººä¿¡æ¯
     */
    @GetMapping
    public AjaxResult profile()
    {
    public AjaxResult profile() {
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        AjaxResult ajax = AjaxResult.success(user);
@@ -49,24 +53,20 @@
     */
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult updateProfile(@RequestBody SysUser user)
    {
    public AjaxResult updateProfile(@RequestBody SysUser user) {
        LoginUser loginUser = getLoginUser();
        SysUser currentUser = loginUser.getUser();
        currentUser.setNickName(user.getNickName());
        currentUser.setEmail(user.getEmail());
        currentUser.setPhonenumber(user.getPhonenumber());
        currentUser.setSex(user.getSex());
        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
        {
        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser)) {
            return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
        }
        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
        {
        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser)) {
            return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
        }
        if (userService.updateUserProfile(currentUser) > 0)
        {
        if (userService.updateUserProfile(currentUser) > 0) {
            // æ›´æ–°ç¼“存用户信息
            tokenService.setLoginUser(loginUser);
            return success();
@@ -79,26 +79,30 @@
     */
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
    public AjaxResult updatePwd(String oldPassword, String newPassword)
    {
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updatePwd(String oldPassword, String newPassword, Short firstLogin) {
        LoginUser loginUser = getLoginUser();
        String userName = loginUser.getUsername();
        String password = loginUser.getPassword();
        if (!SecurityUtils.matchesPassword(oldPassword, password))
        {
        if (firstLogin != 0 && !SecurityUtils.matchesPassword(oldPassword, password)) {
            return error("修改密码失败，旧密码错误");
        }
        if (SecurityUtils.matchesPassword(newPassword, password))
        {
        if (SecurityUtils.matchesPassword(newPassword, password)) {
            return error("新密码不能与旧密码相同");
        }
        newPassword = SecurityUtils.encryptPassword(newPassword);
        if (userService.resetUserPwd(userName, newPassword) > 0)
        {
        if (userService.resetUserPwd(userName, newPassword) > 0) {
            // æ›´æ–°ç¼“存用户密码
            loginUser.getUser().setPassword(newPassword);
            tokenService.setLoginUser(loginUser);
            return success();
        }
        //将状态改为已修改过密码
        if (firstLogin == 0) {
            SysUser user = new SysUser();
            user.setUserId(loginUser.getUserId());
            user.setFirstLogin((short) 1);
            userMapper.updateUser(user);
        }
        return error("修改密码异常，请联系管理员");
    }
@@ -108,14 +112,11 @@
     */
    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
    @PostMapping("/avatar")
    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
    {
        if (!file.isEmpty())
        {
    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception {
        if (!file.isEmpty()) {
            LoginUser loginUser = getLoginUser();
            String avatar = FileUploadUtils.upload(PlatformConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
            {
            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
                AjaxResult ajax = AjaxResult.success();
                ajax.put("imgUrl", avatar);
                // æ›´æ–°ç¼“存用户头像

 ycl-server/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java

@@ -53,7 +53,7 @@

    @Autowired
    private ISysConfigService configService;
    //TODO:无法注入

    @Autowired
    protected Validator validator;


 ycl-server/src/main/resources/application-dev.yml

@@ -60,14 +60,12 @@
spring.data:
  redis:
    # åœ°å€
    host: 162.14.79.111
    host: localhost
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379
    password: 234#Wersdf!
    password: 123456
    # æ•°æ®åº“索引
    database: 0
    # å¯†ç (如没有密码请注释掉)
    # password:
    # è¿žæŽ¥è¶…时时间
    timeout: 10s
    # æ˜¯å¦å¼€å¯ssl

 ycl-server/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,6 +23,7 @@
        <result property="updateBy"     column="update_by"    />
        <result property="updateTime"   column="update_time"  />
        <result property="remark"       column="remark"       />
        <result property="firstLogin"   column="first_login"       />
        <association property="dept"    javaType="com.ycl.system.entity.SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
@@ -47,7 +48,7 @@
    </resultMap>
    
    <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.first_login,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        from sys_user u
@@ -190,6 +191,7 @@
             <if test="loginDate != null">login_date = #{loginDate},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="firstLogin !=null ">first_login = #{firstLogin}</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}