From 5648a998a4bdb6c12672665bb6974920f11ba3e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 12:09:55 +0800
Subject: [PATCH] 用户表增加unitId字段，新建运维单位账号绑定unitId
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 6 ++++--
ycl-server/src/main/resources/mapper/system/SysUserMapper.xml | 8 ++++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwUnitForm.java | 9 +++++----
ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java | 11 +++++++++++
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwUnitForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwUnitForm.java
index 43c9b45..1d53838 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwUnitForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwUnitForm.java
@@ -31,19 +31,20 @@
@ApiModelProperty("鍗曚綅鍚嶇О")
private String unitName;
- @NotBlank(message = "鍗曚綅鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍗曚綅鑱旂郴浜�")
private String unitContact;
- @NotBlank(message = "鍗曚綅鑱旂郴浜虹數璇濅笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍗曚綅鑱旂郴浜虹數璇�")
private String unitContactPhone;
- @NotBlank(message = "鍗曚綅绠＄悊鍛樿处鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @NotBlank(message = "鍗曚綅璐﹀彿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍗曚綅绠＄悊鍛樿处鍙�")
private String unitAdminAccount;
- @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotBlank(message = "璐﹀彿瀵嗙爜涓嶈兘涓虹┖")
+ @ApiModelProperty("璐﹀彿瀵嗙爜")
+ private String password;
+
@ApiModelProperty("澶囨敞")
private String remark;
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
index d940ce4..7020079 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
@@ -22,6 +22,9 @@
/** 鐢ㄦ埛ID */
private Long userId;
+ /** 鍗曚綅ID */
+ private Integer unitId;
+
/** 閮ㄩ棬ID */
private Long deptId;
@@ -80,6 +83,14 @@
}
+ public Integer getUnitId() {
+ return unitId;
+ }
+
+ public void setUnitId(Integer unitId) {
+ this.unitId = unitId;
+ }
+
public Short getFirstLogin() {
return firstLogin;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 401cd20..1b5c7fa 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -65,14 +65,16 @@
// 鏂板杩愮淮浜哄憳璐﹀彿
SysUser sysUser = new SysUser();
sysUser.setDeptId(null);
+ sysUser.setUnitId(entity.getId());
sysUser.setUserName(entity.getUnitAdminAccount());
sysUser.setNickName(entity.getUnitContact());
sysUser.setPhonenumber(entity.getUnitContactPhone());
- sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
+ sysUser.setPassword(SecurityUtils.encryptPassword(form.getPassword()));
+ sysUser.setDelFlag(0);
sysUserMapper.insertUser(sysUser);
// 鑾峰彇杩愮淮浜哄憳瑙掕壊
SysRole sysRole = sysRoleMapper.selectRoleByKey("yw_user");
- if (Objects.isNull(sysRole)) { return Result.error("杩愮淮瑙掕壊涓嶅瓨鍦�"); }
+ if (Objects.isNull(sysRole)) { throw new RuntimeException("杩愮淮瑙掕壊涓嶅瓨鍦�"); }
// 缁戝畾璐﹀彿瑙掕壊鍏崇郴
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(sysRole.getRoleId());
diff --git a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
index 08466cf..ff8aebf 100644
--- a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="com.ycl.system.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
+ <result property="unitId" column="unit_id" />
<result property="deptId" column="dept_id" />
<result property="userName" column="user_name" />
<result property="nickName" column="nick_name" />
@@ -50,7 +51,7 @@
<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, 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
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.unit_id
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -58,7 +59,7 @@
</sql>
<select id="selectUserList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+ select u.user_id, u.unit_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = 0
<if test="userId != null and userId != 0">
@@ -164,6 +165,7 @@
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
+ <if test="unitId != null">unit_id,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -178,6 +180,7 @@
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
+ <if test="unitId != null">#{unitId},</if>
sysdate()
)
</insert>
@@ -198,6 +201,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="unitId != null">unit_id = #{unitId},</if>
<if test="firstLogin !=null ">first_login = #{firstLogin}</if>
</set>
where user_id = #{userId}
--
Gitblit v1.8.0