From 92cba17961ebb7d5b0a9e1c8c3b88197984a5e4b Mon Sep 17 00:00:00 2001 From: tamguo Date: Tue, 31 Jul 2018 15:04: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 --- .../config/dao/MyMetaObjectHandler.java | 6 +++ .../modules/sys/model/SysMenuEntity.java | 51 +++++++++---------- .../sys/model/enums/SysMenuStatusEnum.java | 34 +++++++++++++ .../modules/sys/service/ISysMenuService.java | 3 ++ .../sys/service/impl/SysMenuServiceImpl.java | 32 ++++++++++++ .../modules/sys/web/SysMenuController.java | 13 +++++ .../resources/mappers/sys/SysMenuMapper.xml | 1 - .../templates/modules/sys/menu/add.html | 17 +++---- .../templates/modules/sys/menu/index.html | 3 -- 9 files changed, 119 insertions(+), 41 deletions(-) create mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysMenuStatusEnum.java diff --git a/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java b/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java index 6f83dc4..f066a23 100644 --- a/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java @@ -1,6 +1,8 @@ package com.tamguo.config.dao; import com.baomidou.mybatisplus.mapper.MetaObjectHandler; +import com.tamguo.modules.sys.utils.ShiroUtils; + import org.apache.ibatis.reflection.MetaObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +18,10 @@ public class MyMetaObjectHandler extends MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { logger.info("新增的时候干点不可描述的事情"); + Object testType = getFieldValByName("createBy", metaObject); + if (testType == null) { + setFieldValByName("createBy", ShiroUtils.getUser() , metaObject); //mybatis-plus版本2.0.9+ + } } @Override diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java index 91d80f9..9ccff44 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java @@ -4,7 +4,11 @@ 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.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum; /** @@ -15,6 +19,7 @@ import com.baomidou.mybatisplus.annotations.TableName; public class SysMenuEntity implements Serializable { private static final long serialVersionUID = 1L; + @TableId private String menuCode; private String createBy; private Date createDate; @@ -25,14 +30,15 @@ public class SysMenuEntity implements Serializable { private String menuName; private String menuTarget; private String menuType; - private String moduleCodes; private String parentCode; private String parentCodes; private String permission; private String remarks; - private String status; + + @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private SysMenuStatusEnum status; private String sysCode; - private String treeLeaf; + private Boolean treeLeaf; private BigDecimal treeLevel; private String treeNames; private BigDecimal treeSort; @@ -124,14 +130,6 @@ public class SysMenuEntity implements Serializable { this.menuType = menuType; } - public String getModuleCodes() { - return this.moduleCodes; - } - - public void setModuleCodes(String moduleCodes) { - this.moduleCodes = moduleCodes; - } - public String getParentCode() { return this.parentCode; } @@ -164,13 +162,6 @@ public class SysMenuEntity implements Serializable { this.remarks = remarks; } - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status = status; - } public String getSysCode() { return this.sysCode; @@ -180,14 +171,6 @@ public class SysMenuEntity implements Serializable { this.sysCode = sysCode; } - public String getTreeLeaf() { - return this.treeLeaf; - } - - public void setTreeLeaf(String treeLeaf) { - this.treeLeaf = treeLeaf; - } - public BigDecimal getTreeLevel() { return this.treeLevel; } @@ -249,4 +232,20 @@ public class SysMenuEntity implements Serializable { return getMenuCode(); } + public SysMenuStatusEnum getStatus() { + return status; + } + + public void setStatus(SysMenuStatusEnum status) { + this.status = status; + } + + public Boolean getTreeLeaf() { + return treeLeaf; + } + + public void setTreeLeaf(Boolean treeLeaf) { + this.treeLeaf = treeLeaf; + } + } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysMenuStatusEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysMenuStatusEnum.java new file mode 100644 index 0000000..b9af8c0 --- /dev/null +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysMenuStatusEnum.java @@ -0,0 +1,34 @@ +package com.tamguo.modules.sys.model.enums; + +import java.io.Serializable; +import com.baomidou.mybatisplus.enums.IEnum; + +/** + * 用户状态 + */ +public enum SysMenuStatusEnum implements IEnum { + NORMAL("0", "正常"), + DELETE("1" , "删除"), + DISABLED("2" , "停用"); + + private String value; + private String desc; + + SysMenuStatusEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + + public Serializable getValue() { + return this.value; + } + + public String getDesc(){ + return this.desc; + } + + @Override + public String toString() { + return this.value; + } +} 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 index 07efee3..cb432aa 100644 --- 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 @@ -14,5 +14,8 @@ public interface ISysMenuService extends IService{ /** 树形结构*/ JSONArray treeData(String excludeId); + + /** 新增菜单*/ + void save(SysMenuEntity menu); } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java index 82cff76..fb70adf 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java @@ -1,5 +1,7 @@ package com.tamguo.modules.sys.service.impl; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +15,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.tamguo.modules.sys.dao.SysMenuMapper; import com.tamguo.modules.sys.model.SysMenuEntity; import com.tamguo.modules.sys.model.condition.SysMenuCondition; +import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum; import com.tamguo.modules.sys.service.ISysMenuService; +import com.tamguo.modules.sys.utils.ShiroUtils; @Service public class SysMenuServiceImpl extends ServiceImpl implements ISysMenuService { @@ -57,4 +61,32 @@ public class SysMenuServiceImpl extends ServiceImpl
  • 主导航菜单
    • @@ -52,11 +52,10 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
    - - + + + +