From 5444251fcbd3cde26c44122e4721ded4b19e1844 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 21 六月 2025 09:11:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 5 +++++
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 10 +++++++---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 7 +++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 5 ++++-
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 15 +++++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java | 5 ++---
7 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c0da812..1fab943 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -236,6 +236,21 @@
}
/**
+ * 修改用户签名
+ */
+ // @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @ApiOperation(value = "修改用户签名")
+ @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
+ @PostMapping("/api/system/user/editSignPicture")
+ public R editSignPicture(@RequestBody String param)
+ {
+ Long userId = tokenService.getLoginUser().getUserId();
+ SysUser user = JSON.parseObject(param,SysUser.class);
+ user.setUserId(userId);
+ return R.ok(userService.editSignPicture(user));
+ }
+
+ /**
* 删除用户
*/
// @PreAuthorize("@ss.hasPermi('system:user:remove')")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java
index c02d68a..1263a1a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java
@@ -8,7 +8,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -23,7 +22,7 @@
@Api(tags = "服务器文件上传")
@RestController
@CrossOrigin
-@RequestMapping("/file/")
+@RequestMapping("/open/file/")
public class FileController {
@Autowired
@@ -39,7 +38,7 @@
}
String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date());
// String realPath = fileUploadConfig.getLocation() + TimeDir;
- String realPath = "C:\\Users\\Admin\\Desktop\\qrcode\\" + TimeDir;
+ String realPath = "D:\\file\\laboratory\\" + TimeDir;
File file = new File(realPath);
// 没有目录就创建
if (!file.exists()) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index b804721..f93a76b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -131,7 +131,6 @@
private String roleName;
@TableField(exist = false)
private String deptName;
- @ApiModelProperty(value = "部门id集合")
@TableField(exist = false)
private List<String> deptIds;
@@ -139,6 +138,10 @@
@TableField("business_dept_id")
private String businessDeptId;
+ @ApiModelProperty(value = "签名照")
+ @TableField("sign_picture")
+ private String signPicture;
+
public Integer getRoleType() {
return roleType;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 9f93354..738ab7e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -180,4 +180,6 @@
List<SysUser> listByRole(@Param("userIds")List<Long> userIds, @Param("nickName")String nickName);
List<SysUser> selectListByNameAndUserIds(@Param("nickName")String nickName, @Param("userIds")List<Long> userIds);
+
+ int editSignPicture(SysUser user);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 80da1cf..b8b35bd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -275,4 +275,11 @@
* @return
*/
List<SysUser> listByRole(List<Long> userIds, String nickName);
+
+ /**
+ * 修改用户签名
+ * @param user
+ * @return
+ */
+ Integer editSignPicture(SysUser user);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index a2b20e0..27019cb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -693,6 +693,11 @@
return userMapper.listByRole(userIds,nickName);
}
+ @Override
+ public Integer editSignPicture(SysUser user) {
+ return userMapper.editSignPicture(user);
+ }
+
// @Override
// public UserInfoVo userInfo(Long userId) {
// return userMapper.userInfo(userId);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index f5f1826..732a8c1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -26,6 +26,7 @@
<result property="ifBlack" column="ifBlack" />
<result property="districtId" column="districtId" />
<result property="roleType" column="role_type" />
+ <result property="signPicture" column="sign_picture" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -50,7 +51,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,
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.sign_picture AS signPicture,
u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.role_type,
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
@@ -134,7 +135,7 @@
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack,
- u.districtId AS districtId,
+ u.districtId AS districtId,u.sign_picture AS signPicture,
ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -226,7 +227,7 @@
<select id="pageList" resultType="com.ruoyi.system.vo.SysUserVO">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,u.disable_remark AS disableRemark,
u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,u.role_type AS roleType,
r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -381,6 +382,9 @@
<update id="updatePassword">
update sys_user set password = #{s} where user_id = #{id}
</update>
+ <update id="editSignPicture" parameterType="SysUser">
+ update sys_user set sign_picture = #{signPicture} where user_id = #{userId}
+ </update>
<delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
--
Gitblit v1.7.1