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 d40bbe92..12b84df0 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 @@ -39,6 +39,9 @@ public class SysUser extends BaseEntity @Excel(name = "用户名称") private String nickName; + /** 用户类型(00系统用户) */ + private String userType; + /** 用户邮箱 */ @Excel(name = "用户邮箱") private String email; @@ -146,6 +149,14 @@ public class SysUser extends BaseEntity this.nickName = nickName; } + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @@ -321,6 +332,7 @@ public class SysUser extends BaseEntity .append("deptId", getDeptId()) .append("userName", getUserName()) .append("nickName", getNickName()) + .append("userType", getUserType()) .append("email", getEmail()) .append("phonenumber", getPhonenumber()) .append("sex", getSex()) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 6e31ce71..ba4d680d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -9,6 +9,7 @@ + @@ -47,7 +48,7 @@ - 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.user_type, 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.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 @@ -57,7 +58,7 @@ + + + and device_id = #{deviceId} + and device_name like concat('%', #{deviceName}, '%') + and release_content = #{releaseContent} + and release_status = #{releaseStatus} + and release_time = #{releaseTime} + and release_dept_name like concat('%', #{releaseDeptName}, '%') + and release_dept_id = #{releaseDeptId} + and release_user_name like concat('%', #{releaseUserName}, '%') + and release_user_id = #{releaseUserId} + and release_ip = #{releaseIp} + and platform = #{platform} + + + + + + + insert into dc_board_release_log + + device_id, + device_name, + release_content, + release_status, + release_dept_name, + release_dept_id, + release_user_name, + release_user_id, + release_ip, + platform, + release_time + + + #{deviceId}, + #{deviceName}, + #{releaseContent}, + #{releaseStatus}, + #{releaseDeptName}, + #{releaseDeptId}, + #{releaseUserName}, + #{releaseUserId}, + #{releaseIp}, + #{platform}, + now() + + + + + update dc_board_release_log + + device_id = #{deviceId}, + device_name = #{deviceName}, + release_content = #{releaseContent}, + release_status = #{releaseStatus}, + release_dept_name = #{releaseDeptName}, + release_dept_id = #{releaseDeptId}, + release_user_name = #{releaseUserName}, + release_user_id = #{releaseUserId}, + release_ip = #{releaseIp}, + platform = #{platform}, + + where id = #{id} + + + + delete from dc_board_release_log where id = #{id} + + + + delete from dc_board_release_log where id in + + #{id} + + + \ No newline at end of file diff --git a/zc-business/src/main/resources/mapper/business/DcInfoBoardVocabularyMapper.xml b/zc-business/src/main/resources/mapper/business/DcInfoBoardVocabularyMapper.xml new file mode 100644 index 00000000..4f828c67 --- /dev/null +++ b/zc-business/src/main/resources/mapper/business/DcInfoBoardVocabularyMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + select id, word, create_time from dc_info_board_vocabulary + + + + + + + + insert into dc_info_board_vocabulary + + word, + create_time, + + + #{word}, + #{createTime}, + + + + + update dc_info_board_vocabulary + + word = #{word}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from dc_info_board_vocabulary where id = #{id} + + + + delete from dc_info_board_vocabulary where id in + + #{id} + + + \ No newline at end of file