pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
main
tamguo 7 years ago
parent c28f8089ce
commit 7c1a4b8c71
6 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File

37
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java
Unescape View File

@ -5,10 +5,14 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum;
import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
import com.tamguo.modules.sys.model.enums.SysUserTypeEnum;
/**
@ -36,7 +40,10 @@ public class SysUserEntity implements Serializable {
private Date lastLoginDate;
private String lastLoginIp;
private String loginCode;
private String mgrType;
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysUserMgrTypeEnum mgrType;
private String mobile;
private String mobileImei;
private String password;
@ -60,12 +67,18 @@ public class SysUserEntity implements Serializable {
private String remarks;
private String sex;
private String sign;
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysUserStatusEnum status;
private String updateBy;
private Date updateDate;
private String userName;
private String empName;
private String userType;
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysUserTypeEnum userType;
private BigDecimal userWeight;
private String wxOpenid;
private String userNameEn;
@ -358,14 +371,6 @@ public class SysUserEntity implements Serializable {
this.userName = userName;
}
public String getUserType() {
return this.userType;
}
public void setUserType(String userType) {
this.userType = userType;
}
public BigDecimal getUserWeight() {
return this.userWeight;
}
@ -414,11 +419,11 @@ public class SysUserEntity implements Serializable {
this.companyName = companyName;
}
public String getMgrType() {
public SysUserMgrTypeEnum getMgrType() {
return mgrType;
}
public void setMgrType(String mgrType) {
public void setMgrType(SysUserMgrTypeEnum mgrType) {
this.mgrType = mgrType;
}
@ -454,5 +459,13 @@ public class SysUserEntity implements Serializable {
this.userRoleString = userRoleString;
}
public SysUserTypeEnum getUserType() {
return userType;
}
public void setUserType(SysUserTypeEnum userType) {
this.userType = userType;
}
}

6
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserMgrTypeEnum.java
Unescape View File

@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.enums.IEnum;
* 用户状态
*/
public enum SysUserMgrTypeEnum implements IEnum {
NONEADMIN("0", "非系统管理员"),
SYSTEMADMIN("1", "系统管理员"),
SECADMIN("2" , "二级管理员");
NONE_ADMIN("0", "非系统管理员"),
SYSTEM_ADMIN("1", "系统管理员"),
SEC_ADMIN("2" , "二级管理员");
private String value;
private String desc;

2
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java
Unescape View File

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.enums.IEnum;
*/
public enum SysUserStatusEnum implements IEnum {
NORMAL("0", "正常"),
DELETE("1" , "禁用"),
DELETE("1" , "删除"),
DISABLED("2" , "禁用"),
LOCKED("3", "锁定"),;

10
tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
Unescape View File

@ -5,7 +5,6 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -21,9 +20,12 @@ import com.tamguo.modules.sys.model.SysUserEntity;
import com.tamguo.modules.sys.model.SysUserPostEntity;
import com.tamguo.modules.sys.model.SysUserRoleEntity;
import com.tamguo.modules.sys.model.condition.SysUserCondition;
import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum;
import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
import com.tamguo.modules.sys.model.enums.SysUserTypeEnum;
import com.tamguo.modules.sys.service.ISysUserService;
import com.tamguo.modules.sys.utils.ShiroUtils;
import com.tamguo.modules.sys.utils.TamguoConstant;
@Service
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity> implements ISysUserService{
@ -114,9 +116,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
user.setCreateDate(new Date());
user.setStatus(SysUserStatusEnum.NORMAL);
// 设置初始密码
user.setPassword(new Sha256Hash("123456").toHex());
user.setUserType("employee");
user.setMgrType("0");
user.setPassword(TamguoConstant.INIT_PASSWORD);
user.setUserType(SysUserTypeEnum.EMPLOYEE);
user.setMgrType(SysUserMgrTypeEnum.NONE_ADMIN);
user.setUpdateBy(ShiroUtils.getUserCode());
user.setUpdateDate(new Date());
sysUserMapper.insert(user);

3
tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/TamguoConstant.java
Unescape View File

@ -119,4 +119,7 @@ public class TamguoConstant {
/** 题目审核失败*/
public static final String TEACHER_ROLE_ID = "2";
/** 初始密码*/
public static final String INIT_PASSWORD = "123456";
}

14
tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
Unescape View File

@ -295,7 +295,7 @@ $('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'登录账号', name:'loginCode', index:'u.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
return '<a href="/js/a/sys/empUser/form?userCode='+row.userCode+'&op=edit" class="btnList" data-title="编辑用户">'+(val||row.id)+'</a>';
return '<a href="sys/user/update?userCode='+row.userCode+'&op=edit" class="btnList" data-title="编辑用户">'+(val||row.id)+'</a>';
}},
{header:'用户昵称', name:'userName', index:'u.user_name', width:200, align:"center"},
{header:'员工姓名', name:'refName', index:'u.ref_name', width:200, align:"center"},
@ -306,7 +306,17 @@ $('#dataGrid').dataGrid({
{header:'办公电话', name:'phone', index:'u.phone', width:200, align:"center"},
{header:'更新时间', name:'updateDate', index:'u.update_date', width:200, align:"center"},
{header:'状态', name:'status', index:'u.status', width:140, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true);
if(val == "0"){
return "<span>正常</span>";
}else if(val == "1"){
return "<span style='color:red;'>删除</span>";
}else if(val == "2"){
return "<span style='color:red;'>禁用</span>";
}else if(val == "3"){
return "<span style='color:red;'>锁定</span>";
}else{
return "<span style='color:red;'>"+val+"</span>";
}
}},
{header:'操作', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];

Write Preview
Loading…
Cancel
Save