From 957dc48d0fe0f9d98d11741d5cd97c8b1d893705 Mon Sep 17 00:00:00 2001 From: tamguo Date: Tue, 24 Jul 2018 17:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tamguo/config/shiro/UserRealm.java | 35 +- .../tamguo/modules/sys/dao/SysUserMapper.java | 2 +- .../modules/sys/model/SysCompanyEntity.java | 210 +++++++--- .../modules/sys/model/SysUserEntity.java | 366 ++++++++++++++---- .../sys/service/ISysCompanyService.java | 3 +- .../modules/sys/service/ISysMenuService.java | 65 ---- .../modules/sys/service/ISysUserService.java | 2 +- .../service/impl/SysCompanyServiceImpl.java | 33 +- .../sys/service/impl/SysMenuServiceImpl.java | 117 ------ .../sys/service/impl/SysUserServiceImpl.java | 4 +- .../tamguo/modules/sys/utils/ShiroUtils.java | 4 +- .../modules/sys/web/CompanyController.java | 3 +- .../resources/mappers/SysCompanyMapper.xml | 28 +- .../main/resources/mappers/SysUserMapper.xml | 54 +-- .../templates/modules/sys/user/index.html | 52 +-- .../templates/modules/sys/user/list.html | 187 ++++++--- 16 files changed, 647 insertions(+), 518 deletions(-) delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysMenuService.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java diff --git a/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java b/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java index 8730edf..5b26aa1 100644 --- a/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java @@ -1,11 +1,5 @@ package com.tamguo.config.shiro; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; @@ -18,12 +12,8 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; - -import com.tamguo.modules.sys.model.SysMenuEntity; import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; -import com.tamguo.modules.sys.service.ISysMenuService; import com.tamguo.modules.sys.service.ISysUserService; /** @@ -31,8 +21,6 @@ import com.tamguo.modules.sys.service.ISysUserService; * */ public class UserRealm extends AuthorizingRealm { - @Autowired - private ISysMenuService sysMenuService; @Autowired private ISysUserService sysUserService; @@ -42,27 +30,8 @@ public class UserRealm extends AuthorizingRealm { */ @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - SysUserEntity user = (SysUserEntity)principals.getPrimaryPrincipal(); - String userId = user.getId(); - - List permsList = null; - - List menuList = sysMenuService.getUserMenuList(userId); - permsList = new ArrayList<>(); - for(SysMenuEntity menu : menuList){ - permsList.add(menu.getPerms()); - } - //用户权限列表 - Set permsSet = new HashSet(); - for(String perms : permsList){ - if(StringUtils.isEmpty(perms)){ - continue; - } - permsSet.addAll(Arrays.asList(perms.trim().split(","))); - } - SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); - info.setStringPermissions(permsSet); + // info.setStringPermissions(permsSet); return info; } @@ -77,7 +46,7 @@ public class UserRealm extends AuthorizingRealm { String password = new String((char[]) token.getCredentials()); //查询用户信息 - SysUserEntity user = sysUserService.queryByUserName(username); + SysUserEntity user = sysUserService.queryByLoginCode(username); //账号不存在 if(user == null) { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java index 3a5bd75..b3abef3 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java @@ -11,7 +11,7 @@ import com.tamguo.modules.sys.model.condition.SysUserCondition; public interface SysUserMapper extends SuperMapper{ - SysUserEntity queryByUserName(String username); + SysUserEntity queryByLoginCode(@Param(value="loginCode")String loginCode); List queryPage(@Param(value="userName")String userName , Page page); diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java index 0e42a4c..ffaf67d 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java @@ -1,13 +1,11 @@ package com.tamguo.modules.sys.model; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum; + /** * The persistent class for the sys_company database table. @@ -17,90 +15,188 @@ import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum; public class SysCompanyEntity implements Serializable { private static final long serialVersionUID = 1L; - private String id; - private String name; + private String companyCode; + private String areaCode; + private String companyName; + private String corpCode; + private String corpName; + private String createBy; + private Date createDate; private String fullName; - private String type; + private String parentCode; + private String parentCodes; private String remarks; - private String parentId; - private Boolean isLeaf; - private Integer treeLevel; + private String status; + private String treeLeaf; + private BigDecimal treeLevel; + private String treeNames; + private BigDecimal treeSort; + private String treeSorts; + private String updateBy; private Date updateDate; - - @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) - private SysCompanyStatusEnum status; - - @TableField(exist=false) - private String parentName; - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; + private String viewCode; + + public SysCompanyEntity() { + } + + public String getCompanyCode() { + return this.companyCode; + } + + public void setCompanyCode(String companyCode) { + this.companyCode = companyCode; + } + + public String getAreaCode() { + return this.areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getCompanyName() { + return this.companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getCorpCode() { + return this.corpCode; + } + + public void setCorpCode(String corpCode) { + this.corpCode = corpCode; } + + public String getCorpName() { + return this.corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getCreateBy() { + return this.createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateDate() { + return this.createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + public String getFullName() { - return fullName; + return this.fullName; } + public void setFullName(String fullName) { this.fullName = fullName; } - public String getType() { - return type; + + public String getParentCode() { + return this.parentCode; } - public void setType(String type) { - this.type = type; + + public void setParentCode(String parentCode) { + this.parentCode = parentCode; } - public static long getSerialversionuid() { - return serialVersionUID; + + public String getParentCodes() { + return this.parentCodes; } + + public void setParentCodes(String parentCodes) { + this.parentCodes = parentCodes; + } + public String getRemarks() { - return remarks; + return this.remarks; } + public void setRemarks(String remarks) { this.remarks = remarks; } - public Integer getTreeLevel() { - return treeLevel; + + public String getStatus() { + return this.status; } - public void setTreeLevel(Integer treeLevel) { + + public void setStatus(String status) { + this.status = status; + } + + public String getTreeLeaf() { + return this.treeLeaf; + } + + public void setTreeLeaf(String treeLeaf) { + this.treeLeaf = treeLeaf; + } + + public BigDecimal getTreeLevel() { + return this.treeLevel; + } + + public void setTreeLevel(BigDecimal treeLevel) { this.treeLevel = treeLevel; } - public Boolean getIsLeaf() { - return isLeaf; + + public String getTreeNames() { + return this.treeNames; } - public void setIsLeaf(Boolean isLeaf) { - this.isLeaf = isLeaf; + + public void setTreeNames(String treeNames) { + this.treeNames = treeNames; } - public Date getUpdateDate() { - return updateDate; + + public BigDecimal getTreeSort() { + return this.treeSort; } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; + + public void setTreeSort(BigDecimal treeSort) { + this.treeSort = treeSort; } - public SysCompanyStatusEnum getStatus() { - return status; + + public String getTreeSorts() { + return this.treeSorts; } - public void setStatus(SysCompanyStatusEnum status) { - this.status = status; + + public void setTreeSorts(String treeSorts) { + this.treeSorts = treeSorts; } - public String getParentName() { - return parentName; + + public String getUpdateBy() { + return this.updateBy; } - public void setParentName(String parentName) { - this.parentName = parentName; + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } - public String getId() { - return id; + + public Date getUpdateDate() { + return this.updateDate; } - public void setId(String id) { - this.id = id; + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; } - public String getParentId() { - return parentId; + + public String getViewCode() { + return this.viewCode; } - public void setParentId(String parentId) { - this.parentId = parentId; + + public void setViewCode(String viewCode) { + this.viewCode = viewCode; } } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 1409997..c56b045 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -1,51 +1,184 @@ package com.tamguo.modules.sys.model; import java.io.Serializable; +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.TableName; -import com.tamguo.config.dao.SuperEntity; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; /** - * The persistent class for the reaps_sys_user database table. + * The persistent class for the sys_user database table. * */ @TableName(value="sys_user") -public class SysUserEntity extends SuperEntity implements Serializable { +public class SysUserEntity implements Serializable { private static final long serialVersionUID = 1L; - private String userName; - private String nickName; - private String name; - private String mobile; + private String userCode; + private String avatar; + private String corpCode; + private String corpName; + private String createBy; + private Date createDate; private String email; + private String freezeCause; + private Date freezeDate; + private Date lastLoginDate; + private String lastLoginIp; + private String loginCode; + private String mgrType; + private String mobile; + private String mobileImei; private String password; - private String roleIds; - private String companyId; - private String companyIds; - private Date createDate; - private Date updateDate; - - @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private String phone; + private Date pwdQuestUpdateDate; + private String pwdQuestion; + private String pwdQuestion2; + private String pwdQuestion3; + private String pwdQuestionAnswer; + private String pwdQuestionAnswer2; + private String pwdQuestionAnswer3; + private BigDecimal pwdSecurityLevel; + private Date pwdUpdateDate; + private String pwdUpdateRecord; + private String refCode; + private String refName; + private String remarks; + private String sex; + private String sign; private SysUserStatusEnum status; - - private String safeKeyValue; - private Long createTime; - - @TableField(exist=false) - private List roleIdList; - - @TableField(exist=false) - private String companyName; - + private String updateBy; + private Date updateDate; + private String userName; + private String userType; + private BigDecimal userWeight; + private String wxOpenid; + public SysUserEntity() { } + public String getUserCode() { + return this.userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public String getAvatar() { + return this.avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getCorpCode() { + return this.corpCode; + } + + public void setCorpCode(String corpCode) { + this.corpCode = corpCode; + } + + public String getCorpName() { + return this.corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getCreateBy() { + return this.createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateDate() { + return this.createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getFreezeCause() { + return this.freezeCause; + } + + public void setFreezeCause(String freezeCause) { + this.freezeCause = freezeCause; + } + + public Date getFreezeDate() { + return this.freezeDate; + } + + public void setFreezeDate(Date freezeDate) { + this.freezeDate = freezeDate; + } + + public Date getLastLoginDate() { + return this.lastLoginDate; + } + + public void setLastLoginDate(Date lastLoginDate) { + this.lastLoginDate = lastLoginDate; + } + + public String getLastLoginIp() { + return this.lastLoginIp; + } + + public void setLastLoginIp(String lastLoginIp) { + this.lastLoginIp = lastLoginIp; + } + + public String getLoginCode() { + return this.loginCode; + } + + public void setLoginCode(String loginCode) { + this.loginCode = loginCode; + } + + public String getMgrType() { + return this.mgrType; + } + + public void setMgrType(String mgrType) { + this.mgrType = mgrType; + } + + public String getMobile() { + return this.mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getMobileImei() { + return this.mobileImei; + } + + public void setMobileImei(String mobileImei) { + this.mobileImei = mobileImei; + } + public String getPassword() { return this.password; } @@ -54,125 +187,188 @@ public class SysUserEntity extends SuperEntity implements Seriali this.password = password; } - public String getRoleIds() { - return this.roleIds; + public String getPhone() { + return this.phone; } - public void setRoleIds(String roleIds) { - this.roleIds = roleIds; + public void setPhone(String phone) { + this.phone = phone; } - public String getUserName() { - return userName; + public Date getPwdQuestUpdateDate() { + return this.pwdQuestUpdateDate; } - public void setUserName(String userName) { - this.userName = userName; + public void setPwdQuestUpdateDate(Date pwdQuestUpdateDate) { + this.pwdQuestUpdateDate = pwdQuestUpdateDate; } - public String getNickName() { - return nickName; + public String getPwdQuestion() { + return this.pwdQuestion; } - public void setNickName(String nickName) { - this.nickName = nickName; + public void setPwdQuestion(String pwdQuestion) { + this.pwdQuestion = pwdQuestion; } - public String getMobile() { - return mobile; + public String getPwdQuestion2() { + return this.pwdQuestion2; } - public void setMobile(String mobile) { - this.mobile = mobile; + public void setPwdQuestion2(String pwdQuestion2) { + this.pwdQuestion2 = pwdQuestion2; } - public String getEmail() { - return email; + public String getPwdQuestion3() { + return this.pwdQuestion3; } - public void setEmail(String email) { - this.email = email; + public void setPwdQuestion3(String pwdQuestion3) { + this.pwdQuestion3 = pwdQuestion3; } - public Long getCreateTime() { - return createTime; + public String getPwdQuestionAnswer() { + return this.pwdQuestionAnswer; } - public void setCreateTime(Long createTime) { - this.createTime = createTime; + public void setPwdQuestionAnswer(String pwdQuestionAnswer) { + this.pwdQuestionAnswer = pwdQuestionAnswer; } - public List getRoleIdList() { - return roleIdList; + public String getPwdQuestionAnswer2() { + return this.pwdQuestionAnswer2; } - public void setRoleIdList(List roleIdList) { - this.roleIdList = roleIdList; + public void setPwdQuestionAnswer2(String pwdQuestionAnswer2) { + this.pwdQuestionAnswer2 = pwdQuestionAnswer2; } - public String getSafeKeyValue() { - return safeKeyValue; + public String getPwdQuestionAnswer3() { + return this.pwdQuestionAnswer3; } - public void setSafeKeyValue(String safeKeyValue) { - this.safeKeyValue = safeKeyValue; + public void setPwdQuestionAnswer3(String pwdQuestionAnswer3) { + this.pwdQuestionAnswer3 = pwdQuestionAnswer3; } - public SysUserStatusEnum getStatus() { - return status; + public BigDecimal getPwdSecurityLevel() { + return this.pwdSecurityLevel; } - public void setStatus(SysUserStatusEnum status) { - this.status = status; + public void setPwdSecurityLevel(BigDecimal pwdSecurityLevel) { + this.pwdSecurityLevel = pwdSecurityLevel; + } + + public Date getPwdUpdateDate() { + return this.pwdUpdateDate; + } + + public void setPwdUpdateDate(Date pwdUpdateDate) { + this.pwdUpdateDate = pwdUpdateDate; + } + + public String getPwdUpdateRecord() { + return this.pwdUpdateRecord; + } + + public void setPwdUpdateRecord(String pwdUpdateRecord) { + this.pwdUpdateRecord = pwdUpdateRecord; } - public String getName() { - return name; + public String getRefCode() { + return this.refCode; } - public void setName(String name) { - this.name = name; + public void setRefCode(String refCode) { + this.refCode = refCode; } - public String getCompanyName() { - return companyName; + public String getRefName() { + return this.refName; } - public void setCompanyName(String companyName) { - this.companyName = companyName; + public void setRefName(String refName) { + this.refName = refName; } - public String getCompanyId() { - return companyId; + public String getRemarks() { + return this.remarks; } - public void setCompanyId(String companyId) { - this.companyId = companyId; + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getSex() { + return this.sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getSign() { + return this.sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public SysUserStatusEnum getStatus() { + return this.status; + } + + public void setStatus(SysUserStatusEnum status) { + this.status = status; + } + + public String getUpdateBy() { + return this.updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; } public Date getUpdateDate() { - return updateDate; + return this.updateDate; } public void setUpdateDate(Date updateDate) { this.updateDate = updateDate; } - public Date getCreateDate() { - return createDate; + public String getUserName() { + return this.userName; } - public void setCreateDate(Date createDate) { - this.createDate = createDate; + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserType() { + return this.userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + public BigDecimal getUserWeight() { + return this.userWeight; } - public String getCompanyIds() { - return companyIds; + public void setUserWeight(BigDecimal userWeight) { + this.userWeight = userWeight; } - public void setCompanyIds(String companyIds) { - this.companyIds = companyIds; + public String getWxOpenid() { + return this.wxOpenid; } + public void setWxOpenid(String wxOpenid) { + this.wxOpenid = wxOpenid; + } } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java index 54f6d69..bb40693 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java @@ -2,6 +2,7 @@ package com.tamguo.modules.sys.service; import java.util.List; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.service.IService; import com.tamguo.modules.sys.model.SysCompanyEntity; import com.tamguo.modules.sys.model.condition.SysCompanyCondition; @@ -9,7 +10,7 @@ import com.tamguo.modules.sys.model.condition.SysCompanyCondition; public interface ISysCompanyService extends IService{ /** 公司树形结构*/ - List treeData(String excludeId); + JSONArray treeData(String excludeId); /** 查询公司列表*/ List listData(SysCompanyCondition condition); diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysMenuService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysMenuService.java deleted file mode 100644 index ee19fc5..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysMenuService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.tamguo.modules.sys.service; - -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.plugins.Page; -import com.tamguo.modules.sys.model.SysMenuEntity; - -public interface ISysMenuService { - - /** - * 获取用户菜单权限 - * @param userId - * @return - */ - List getUserMenuList(String userId); - - /** - * 获取菜单树 - * @param menus - * @return - */ - List getUserMenuTree(List menus); - - /** - * 菜单列表 - * @param hashMap - * @param page - * @param limit - * @return - */ - Page queryList(Map hashMap, Page page); - - /** - * 查询不是按钮的菜单 - * @return - */ - List queryNotButtonList(); - - /** - * 根据父菜单查询菜单 - * @param parentId - * @return - */ - SysMenuEntity select(String parentId); - - /** - * 保存数据 - * @param menu - */ - void save(SysMenuEntity menu); - - /** - * 修改 - * @param menu - */ - void update(SysMenuEntity menu); - - /** - * 删除 - * @param menuIds - */ - void deleteBatch(String[] menuIds); - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java index 9ba514c..f36cdae 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java @@ -6,7 +6,7 @@ import com.tamguo.modules.sys.model.condition.SysUserCondition; public interface ISysUserService { - public SysUserEntity queryByUserName(String username); + public SysUserEntity queryByLoginCode(String loginCode); public Page listData(SysUserCondition condition); } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java index 480492c..6671441 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java @@ -4,7 +4,10 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.tamguo.modules.sys.dao.SysCompanyMapper; @@ -20,10 +23,14 @@ public class SysCompanyServiceImpl extends ServiceImpl treeData(String excludeId) { - - List companyList = sysCompanyMapper.selectList(Condition.create().notLike("parent_ids", excludeId).ne("id", excludeId)); - return companyList; + public JSONArray treeData(String excludeId) { + List companyList = null; + if(StringUtils.isEmpty(excludeId)) { + companyList = sysCompanyMapper.selectList(Condition.EMPTY); + }else { + companyList = sysCompanyMapper.selectList(Condition.create().notLike("parent_codes", excludeId).ne("company_code", excludeId)); + } + return turnZTreeData(companyList); } @Override @@ -36,4 +43,22 @@ public class SysCompanyServiceImpl extends ServiceImpl companyList) { + if(companyList != null) { + JSONArray nodes = new JSONArray(); + for(int i=0 ; i implements ISysMenuService { - - @Autowired - private SysMenuMapper sysMenuMapper; - @Autowired - private SysUserMapper sysUserMapper; - @Autowired - private SysRoleMapper sysRoleMapper; - - @Override - public List getUserMenuList(String userId) { - SysUserEntity user = sysUserMapper.selectById(userId); - List roleIds = Arrays.asList(user.getRoleIds().split(",")); - // 获取用户角色 - List roles = sysRoleMapper.selectBatchIds(roleIds); - // 有权限的菜单 - List menuIds = new ArrayList<>(); - if(!CollectionUtils.isEmpty(roles)) { - for(int i=0 ; i mIds = Arrays.asList(role.getPerms().split(",")); - menuIds.addAll(mIds); - } - } - } - List menuList = sysMenuMapper.selectBatchIds(menuIds); - - return menuList; - } - - public List getUserMenuTree(List menus){ - List pMenuList = new ArrayList<>(); - for(int i=0 ; i childMenus = new ArrayList<>(); - for(int k=0 ; k queryList(Map hashMap, Page page) { - List pageList = (List) sysMenuMapper.queryList(hashMap , page); - page.setRecords(pageList); - return page; - } - - @Override - public List queryNotButtonList() { - return sysMenuMapper.queryNotButtonList(); - } - - @Override - public SysMenuEntity select(String parentId) { - return sysMenuMapper.queryByUid(parentId); - } - - @Transactional(readOnly=false) - @Override - public void save(SysMenuEntity menu) { - sysMenuMapper.insert(menu); - } - - @Transactional(readOnly=false) - @Override - public void update(SysMenuEntity menu) { - sysMenuMapper.updateById(menu); - } - - @Transactional(readOnly=false) - @Override - public void deleteBatch(String[] menuIds) { - sysMenuMapper.deleteBatchIds(Arrays.asList(menuIds)); - } - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index 11da7a7..0701b6d 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -19,8 +19,8 @@ public class SysUserServiceImpl implements ISysUserService{ @Transactional(readOnly=false) @Override - public SysUserEntity queryByUserName(String username) { - return sysUserMapper.queryByUserName(username); + public SysUserEntity queryByLoginCode(String loginCode) { + return sysUserMapper.queryByLoginCode(loginCode); } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java index c7894aa..d2604ef 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java @@ -20,8 +20,8 @@ public class ShiroUtils { return (SysUserEntity)SecurityUtils.getSubject().getPrincipal(); } - public static String getId() { - return getUser().getId(); + public static String getUserCode() { + return getUser().getUserCode(); } public static void setSessionAttribute(Object key, Object value) { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java index 9307ac8..429cc3a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSONArray; import com.tamguo.modules.sys.model.SysCompanyEntity; import com.tamguo.modules.sys.model.condition.SysCompanyCondition; import com.tamguo.modules.sys.service.ISysCompanyService; @@ -50,7 +51,7 @@ public class CompanyController { @RequestMapping(path="treeData") @ResponseBody - public List treeData(String excludeId) { + public JSONArray treeData(String excludeId) { return iSysCompanyService.treeData(excludeId); } } diff --git a/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml b/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml index f4308f6..1b9a995 100644 --- a/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml +++ b/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml @@ -4,23 +4,14 @@ SELECT - c.id, - c.parent_id, - c.is_leaf, - c.tree_level, - c.name, - c.full_name, - c.type, - c.update_date, - c.create_date, - c.`status`, - cp.name as parent_name + c.* FROM sys_company c - LEFT JOIN sys_company cp on cp.id = c.parent_id WHERE - c.id = #{id} + c.company_code = #{id} \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml index 6358e26..fc0b0b8 100644 --- a/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml +++ b/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml @@ -2,64 +2,20 @@ - SELECT - u.id, - u.user_name, - u.role_ids, - u.password, - u.status, - u.nick_name, - u.mobile, - u.email + u.* FROM sys_user u WHERE - u.user_name = #{username} + u.login_code = #{loginCode} \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/index.html index 2bbcbbd..5d08888 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/user/index.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/index.html @@ -5,19 +5,19 @@ content="no-cache, no-store, must-revalidate"/> 用户管理 - JeeSite Demo - - - + + + - - - - - - - - - + + + + + + + + +
@@ -45,18 +45,18 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
- - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + +
@@ -26,7 +26,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
查询 - 新增 + 新增
@@ -43,13 +43,13 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
- +
- +
@@ -64,23 +64,116 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+
+ +
+ +
+
- +
+
+ +
+ +
+
-
- - - - - -
+
+ + + +
- - - - - - - - - - + + + + + + + + + + +