加入权限管理

java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java

@@ -28,6 +28,8 @@ public class MenuCatalogDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String privId;
+
 
     public String getStoreType() {
         return storeType;
@@ -101,4 +103,12 @@ public class MenuCatalogDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPrivId() {
+        return privId;
+    }
+
+    public void setPrivId(String privId) {
+        this.privId = privId;
+    }
 }

java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java

@@ -28,62 +28,85 @@ import java.io.Serializable;
 public class MenuCatalogPo implements Serializable {
 
     private String storeType;
-private String caId;
-private String name;
-private String icon;
-private String statusCd = "0";
-private String seq;
-private String url;
-private String isShow;
-public String getStoreType() {
+    private String caId;
+    private String name;
+    private String icon;
+    private String statusCd = "0";
+    private String seq;
+    private String url;
+    private String isShow;
+
+    private String privId;
+
+    public String getStoreType() {
         return storeType;
     }
-public void setStoreType(String storeType) {
+
+    public void setStoreType(String storeType) {
         this.storeType = storeType;
     }
-public String getCaId() {
+
+    public String getCaId() {
         return caId;
     }
-public void setCaId(String caId) {
+
+    public void setCaId(String caId) {
         this.caId = caId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getIcon() {
+
+    public String getIcon() {
         return icon;
     }
-public void setIcon(String icon) {
+
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
-public String getUrl() {
+
+    public String getUrl() {
         return url;
     }
-public void setUrl(String url) {
+
+    public void setUrl(String url) {
         this.url = url;
     }
-public String getIsShow() {
+
+    public String getIsShow() {
         return isShow;
     }
-public void setIsShow(String isShow) {
+
+    public void setIsShow(String isShow) {
         this.isShow = isShow;
     }
 
+    public String getPrivId() {
+        return privId;
+    }
 
-
+    public void setPrivId(String privId) {
+        this.privId = privId;
+    }
 }

java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存菜单目录信息 add by wuxw 2018-07-03 -->
     <insert id="saveMenuCatalogInfo" parameterType="Map">
         insert into m_menu_catalog(
-        store_type,ca_id,name,icon,seq,url,is_show
+        store_type,ca_id,name,icon,seq,url,is_show,priv_id
         ) values (
-        #{storeType},#{caId},#{name},#{icon},#{seq},#{url},#{isShow}
+        #{storeType},#{caId},#{name},#{icon},#{seq},#{url},#{isShow},#{privId}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <!-- 查询菜单目录信息 add by wuxw 2018-07-03 -->
     <select id="getMenuCatalogInfo" parameterType="Map" resultType="Map">
         select t.store_type,t.store_type storeType,t.ca_id,t.ca_id caId,t.name,t.icon,t.status_cd,t.status_cd
-        statusCd,t.seq,t.url,t.is_show,t.is_show isShow
+        statusCd,t.seq,t.url,t.is_show,t.is_show isShow,t.priv_id privId
         from m_menu_catalog t
         where 1 =1
         <if test="storeType !=null and storeType != ''">
@@ -74,6 +74,9 @@
         <if test="url !=null and url != ''">
             , t.url= #{url}
         </if>
+        <if test="privId !=null and privId != ''">
+            , t.priv_id = #{privId}
+        </if>
         <if test="isShow !=null and isShow != ''">
             , t.is_show= #{isShow}
         </if>

java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java

@@ -41,18 +41,17 @@ public interface IMenuCatalogV1InnerServiceSMO {
 
 
     @RequestMapping(value = "/saveMenuCatalog", method = RequestMethod.POST)
-    public int saveMenuCatalog(@RequestBody  MenuCatalogPo menuCatalogPo);
+    int saveMenuCatalog(@RequestBody MenuCatalogPo menuCatalogPo);
 
     @RequestMapping(value = "/updateMenuCatalog", method = RequestMethod.POST)
-    public int updateMenuCatalog(@RequestBody  MenuCatalogPo menuCatalogPo);
+    int updateMenuCatalog(@RequestBody MenuCatalogPo menuCatalogPo);
 
     @RequestMapping(value = "/deleteMenuCatalog", method = RequestMethod.POST)
-    public int deleteMenuCatalog(@RequestBody  MenuCatalogPo menuCatalogPo);
+    int deleteMenuCatalog(@RequestBody MenuCatalogPo menuCatalogPo);
 
     /**
      * <p>查询小区楼信息</p>
      *
-     *
      * @param menuCatalogDto 数据对象分享
      * @return MenuCatalogDto 对象数据
      */

service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java

@@ -59,7 +59,6 @@ public class SaveMenuCatalogCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
         Assert.hasKeyAndValue(reqJson, "url", "请求报文中未包含url");
         Assert.hasKeyAndValue(reqJson, "isShow", "请求报文中未包含isShow");
-
     }
 
     @Override

service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java

@@ -22,6 +22,7 @@ import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
 import com.java110.user.dao.IMenuCatalogV1ServiceDao;
+import com.java110.utils.util.ListUtil;
 import org.slf4j.Logger;
 
 import org.springframework.stereotype.Service;
@@ -72,9 +73,9 @@ public class MenuCatalogV1ServiceDaoImpl extends BaseServiceDao implements IMenu
     public List<Map> getMenuCatalogInfo(Map info) throws DAOException {
         logger.debug("查询 getMenuCatalogInfo 入参 info : {}",info);
 
-        List<Map> businessMenuCatalogInfos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.getMenuCatalogInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.getMenuCatalogInfo",info);
 
-        return businessMenuCatalogInfos;
+        return infos;
     }
 
 
@@ -101,21 +102,21 @@ public class MenuCatalogV1ServiceDaoImpl extends BaseServiceDao implements IMenu
     public int queryMenuCatalogsCount(Map info) {
         logger.debug("查询 queryMenuCatalogsCount 入参 info : {}",info);
 
-        List<Map> businessMenuCatalogInfos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.queryMenuCatalogsCount", info);
-        if (businessMenuCatalogInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.queryMenuCatalogsCount", info);
+        if (ListUtil.isNull(infos)) {
             return 0;
         }
 
-        return Integer.parseInt(businessMenuCatalogInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> queryMenus(Map info) {
         logger.debug("查询 queryMenus 入参 info : {}",info);
 
-        List<Map> businessMenuCatalogInfos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.queryMenus",info);
+        List<Map> infos = sqlSessionTemplate.selectList("menuCatalogV1ServiceDaoImpl.queryMenus",info);
 
-        return businessMenuCatalogInfos;
+        return infos;
     }