Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit c2370434 authored by 吴卿华's avatar 吴卿华
Browse files
Options

系统用户与员工信息合并

parent 2876ff16
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 79 deletions
danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TStaffController.java
View file @ c2370434
......@@ -3,12 +3,16 @@ package com.zehong.web.controller.safetyManagement;
import java.util.List;
import java.util.stream.Collectors;
import com.zehong.common.constant.UserConstants;
import com.zehong.common.core.domain.entity.SysRole;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.SecurityUtils;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.form.TStaffForm;
import com.zehong.system.domain.vo.TStaffVo;
import com.zehong.system.service.ISysPostService;
import com.zehong.system.service.ISysRoleService;
import com.zehong.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -30,7 +34,7 @@ import com.zehong.common.core.page.TableDataInfo;
/**
* 员工信息管理Controller
*
*
* @author zehong
* @date 2022-06-17
*/
......@@ -47,6 +51,9 @@ public class TStaffController extends BaseController
@Autowired
private ISysPostService postService;
@Autowired
private ISysUserService userService;
/**
* 查询员工信息管理列表
*/
......@@ -91,6 +98,16 @@ public class TStaffController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody TStaff tStaff)
{
SysUser user=new SysUser();
user.setPhonenumber(tStaff.getPhonenumber());
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(tStaff.getUserName()))) {
return AjaxResult.error("新增用户'" + tStaff.getUserName() + "'失败，登录账号已存在");
} else if (StringUtils.isNotEmpty(tStaff.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return AjaxResult.error("新增用户'" + tStaff.getUserName() + "'失败，手机号码已存在");
}
//密码加密
tStaff.setPassword(SecurityUtils.encryptPassword(tStaff.getPassword()));
return toAjax(tStaffService.insertTStaff(tStaff));
}
......
danger-manage-system/src/main/java/com/zehong/system/domain/TStaff.java
View file @ c2370434
......@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 员工信息管理对象 t_staff
*
*
* @author zehong
* @date 2022-06-17
*/
......@@ -20,6 +20,12 @@ public class TStaff extends BaseEntity
/** 员工id */
private Integer staffId;
/**用户账号*/
private String userName;
/**用户密码*/
private String password;
/** 姓名 */
@Excel(name = "姓名")
private String staffName;
......@@ -77,6 +83,30 @@ public class TStaff extends BaseEntity
@Excel(name = "删除标志", readConverterExp = "0=正常，1删除")
private String isDel;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public void setStaffId(Integer staffId) {
this.staffId = staffId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public void setStaffId(int staffId)
{
this.staffId = staffId;
......@@ -86,30 +116,30 @@ public class TStaff extends BaseEntity
{
return staffId;
}
public void setStaffName(String staffName)
public void setStaffName(String staffName)
{
this.staffName = staffName;
}
public String getStaffName()
public String getStaffName()
{
return staffName;
}
public void setStaffCode(String staffCode)
public void setStaffCode(String staffCode)
{
this.staffCode = staffCode;
}
public String getStaffCode()
public String getStaffCode()
{
return staffCode;
}
public void setSex(String sex)
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
public String getSex()
{
return sex;
}
......@@ -122,12 +152,12 @@ public class TStaff extends BaseEntity
{
return deptId;
}
public void setPhonenumber(String phonenumber)
public void setPhonenumber(String phonenumber)
{
this.phonenumber = phonenumber;
}
public String getPhonenumber()
public String getPhonenumber()
{
return phonenumber;
}
......@@ -149,91 +179,90 @@ public class TStaff extends BaseEntity
{
return roleId;
}
public void setPositionalTitles(String positionalTitles)
public void setPositionalTitles(String positionalTitles)
{
this.positionalTitles = positionalTitles;
}
public String getPositionalTitles()
public String getPositionalTitles()
{
return positionalTitles;
}
public void setProfession(String profession)
public void setProfession(String profession)
{
this.profession = profession;
}
public String getProfession()
public String getProfession()
{
return profession;
}
public void setSpecialOperators(String specialOperators)
public void setSpecialOperators(String specialOperators)
{
this.specialOperators = specialOperators;
}
public String getSpecialOperators()
public String getSpecialOperators()
{
return specialOperators;
}
public void setCertificateUrl(String certificateUrl)
public void setCertificateUrl(String certificateUrl)
{
this.certificateUrl = certificateUrl;
}
public String getCertificateUrl()
public String getCertificateUrl()
{
return certificateUrl;
}
public void setCertificateName(String certificateName)
public void setCertificateName(String certificateName)
{
this.certificateName = certificateName;
}
public String getCertificateName()
public String getCertificateName()
{
return certificateName;
}
public void setEffectiveDate(Date effectiveDate)
public void setEffectiveDate(Date effectiveDate)
{
this.effectiveDate = effectiveDate;
}
public Date getEffectiveDate()
public Date getEffectiveDate()
{
return effectiveDate;
}
public void setIsDel(String isDel)
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
public String getIsDel()
{
return isDel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("staffId", getStaffId())
.append("staffName", getStaffName())
.append("staffCode", getStaffCode())
.append("sex", getSex())
.append("deptId", getDeptId())
.append("phonenumber", getPhonenumber())
.append("postId", getPostId())
.append("roleId", getRoleId())
.append("positionalTitles", getPositionalTitles())
.append("profession", getProfession())
.append("specialOperators", getSpecialOperators())
.append("certificateUrl", getCertificateUrl())
.append("certificateName", getCertificateName())
.append("effectiveDate", getEffectiveDate())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("isDel", getIsDel())
.toString();
return "TStaff{" +
"staffId=" + staffId +
", userName='" + userName + '\'' +
", password='" + password + '\'' +
", staffName='" + staffName + '\'' +
", staffCode='" + staffCode + '\'' +
", sex='" + sex + '\'' +
", deptId=" + deptId +
", phonenumber='" + phonenumber + '\'' +
", postId=" + postId +
", roleId=" + roleId +
", positionalTitles='" + positionalTitles + '\'' +
", profession='" + profession + '\'' +
", specialOperators='" + specialOperators + '\'' +
", certificateUrl='" + certificateUrl + '\'' +
", certificateName='" + certificateName + '\'' +
", effectiveDate=" + effectiveDate +
", isDel='" + isDel + '\'' +
'}';
}
}
danger-manage-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ c2370434
......@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
<resultMap id="deptResult" type="SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
......@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="leader" column="leader" />
<result property="status" column="dept_status" />
</resultMap>
<resultMap id="RoleResult" type="SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
......@@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dataScope" column="data_scope" />
<result property="status" column="role_status" />
</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,
d.dept_id, d.parent_id, 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
......@@ -54,11 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_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, 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'
where u.del_flag = '0' and u.user_staff='0'
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
......@@ -82,32 +82,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
group by u.user_id desc
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_name = #{userName}
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
</select>
<select id="checkUserNameUnique" parameterType="String" resultType="int">
select count(1) from sys_user where user_name = #{userName} limit 1
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} limit 1
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
user_staff,
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
......@@ -122,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null and remark != ''">remark,</if>
create_time
)values(
'0',
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
......@@ -137,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sysdate()
)
</insert>
<update id="updateUser" parameterType="SysUser">
update sys_user
<set>
......@@ -158,28 +161,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set>
where user_id = #{userId}
</update>
<update id="updateUserStatus" parameterType="SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
<update id="updateUserAvatar" parameterType="SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
<update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
<delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</foreach>
</delete>
<select id="getAllUserName" parameterType="SysUser" resultMap="SysUserResult">
......@@ -189,5 +192,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.user_id
from sys_user u
</select>
</mapper>
\ No newline at end of file
</mapper>
danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml
View file @ c2370434
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TStaffMapper">
<resultMap type="TStaffVo" id="TStaffResult">
<result property="staffId" column="staff_id" />
<result property="staffName" column="staff_name" />
......@@ -33,17 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<sql id="selectTStaffVo">
select t.staff_id, t.staff_name, t.staff_code, t.sex, t.dept_id, t.phonenumber, t.post_id, t.role_id, t.positional_titles, t.profession, t.special_operators, t.certificate_url, t.certificate_name, t.effective_date, t.create_time, t.update_time, t.remark, t.is_del,
select t.user_id as staff_id, t.staff_name, t.staff_code, t.sex, t.dept_id, t.phonenumber, t.post_id, t.role_id, t.positional_titles, t.profession, t.special_operators, t.certificate_url, t.certificate_name, t.effective_date, t.create_time, t.update_time, t.remark, t.is_del,
d.dept_name, r.role_name, p.post_name
from t_staff t
from sys_user t
left join sys_dept d on t.dept_id = d.dept_id
left join sys_role r on t.role_id = r.role_id
left join sys_post p on t.post_id = p.post_id
</sql>
<select id="selectTStaffList" parameterType="TStaffForm" resultMap="TStaffResult">
<include refid="selectTStaffVo"/>
<where> t.is_del = '0'
select t.user_id as staff_id, t.staff_name, t.staff_code, t.sex, t.dept_id, t.phonenumber, t.post_id, t.role_id, t.positional_titles, t.profession, t.special_operators, t.certificate_url, t.certificate_name, t.effective_date, t.create_time, t.update_time, t.remark, t.is_del,
d.dept_name, r.role_name, p.post_name
from sys_user t
left join sys_dept d on t.dept_id = d.dept_id
left join sys_role r on t.role_id = r.role_id
left join sys_post p on t.post_id = p.post_id
<where> t.is_del = '0' and t.user_staff='1'
<if test="staffName != null and staffName != ''"> and t.staff_name like concat('%', #{staffName}, '%')</if>
<if test="staffCode != null and staffCode != ''"> and t.staff_code = #{staffCode}</if>
<if test="sex != null and sex != ''"> and t.sex = #{sex}</if>
......@@ -59,15 +64,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="selectTStaffById" parameterType="Long" resultMap="TStaffResult">
<include refid="selectTStaffVo"/>
where t.staff_id = #{staffId}
where t.user_id = #{staffId}
</select>
<insert id="insertTStaff" parameterType="TStaff">
insert into t_staff
insert into sys_user
<trim prefix="(" suffix=")" suffixOverrides=",">
user_staff,
<if test="password != null">password,</if>
<if test="userName != null">user_name,</if>
<if test="staffName != null">nick_name,</if>
<if test="staffName != null">staff_name,</if>
<if test="staffCode != null">staff_code,</if>
<if test="sex != null">sex,</if>
......@@ -87,6 +96,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDel != null">is_del,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
'1',
<if test="password != null">#{password},</if>
<if test="userName != null">#{userName},</if>
<if test="staffName != null">#{staffName},</if>
<if test="staffName != null">#{staffName},</if>
<if test="staffCode != null">#{staffCode},</if>
<if test="sex != null">#{sex},</if>
......@@ -108,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<update id="updateTStaff" parameterType="TStaff">
update t_staff
update sys_user
<trim prefix="SET" suffixOverrides=",">
<if test="staffName != null">staff_name = #{staffName},</if>
<if test="staffCode != null">staff_code = #{staffCode},</if>
......@@ -128,17 +141,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="isDel != null">is_del = #{isDel},</if>
</trim>
where staff_id = #{staffId}
where user_id = #{staffId}
</update>
<delete id="deleteTStaffById" parameterType="Long">
delete from t_staff where staff_id = #{staffId}
delete from sys_user where user_id = #{staffId}
</delete>
<delete id="deleteTStaffByIds" parameterType="String">
delete from t_staff where staff_id in
delete from sys_user where user_id in
<foreach item="staffId" collection="array" open="(" separator="," close=")">
#{staffId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
danger-manage-web/src/views/safetyManagement/staff/index.vue
View file @ c2370434
......@@ -171,6 +171,18 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.staffName==null">
<el-col :span="11">
<el-form-item label="账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输账号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="密码" prop="password" label-width="140px">
<el-input v-model="form.password" placeholder="请输入密码" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="手机号码" prop="phonenumber">
......@@ -356,6 +368,12 @@ export default {
staffName: [
{ required: true, message: "姓名不能为空", trigger: "blur" }
],
userName: [
{ required: true, message: "账号不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "密码不能为空", trigger: "blur" }
],
phonenumber: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment