From 5bc596e3da2a2abf457488413340b5062c35ff50 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 25 一月 2024 21:01:12 +0800
Subject: [PATCH] 加入权限管理
---
service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java | 15 ++++---
java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java | 71 +++++++++++++++++++++++------------
service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java | 1
java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java | 10 +++++
java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml | 9 +++-
java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java | 7 +--
6 files changed, 74 insertions(+), 39 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java b/java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java
index 71305c5..f437bbe 100644
--- a/java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/menu/MenuCatalogDto.java
@@ -28,6 +28,8 @@
private String statusCd = "0";
+ private String privId;
+
public String getStoreType() {
return storeType;
@@ -101,4 +103,12 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public String getPrivId() {
+ return privId;
+ }
+
+ public void setPrivId(String privId) {
+ this.privId = privId;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java b/java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java
index 0c327cb..4651d3a 100644
--- a/java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java
+++ b/java110-bean/src/main/java/com/java110/po/menu/MenuCatalogPo.java
@@ -28,62 +28,85 @@
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;
+ }
}
diff --git a/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml
index e594556..fe93b98 100644
--- a/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml
+++ b/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>
diff --git a/java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java
index 394cbae..5e53571 100644
--- a/java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/user/IMenuCatalogV1InnerServiceSMO.java
@@ -41,17 +41,16 @@
@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 瀵硅薄鏁版嵁
diff --git a/service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java b/service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java
index ffae73a..3160b8c 100644
--- a/service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java
+++ b/service-dev/src/main/java/com/java110/dev/cmd/menuCatalog/SaveMenuCatalogCmd.java
@@ -59,7 +59,6 @@
Assert.hasKeyAndValue(reqJson, "seq", "璇锋眰鎶ユ枃涓湭鍖呭惈seq");
Assert.hasKeyAndValue(reqJson, "url", "璇锋眰鎶ユ枃涓湭鍖呭惈url");
Assert.hasKeyAndValue(reqJson, "isShow", "璇锋眰鎶ユ枃涓湭鍖呭惈isShow");
-
}
@Override
diff --git a/service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java b/service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java
index d408174..3e0758a 100644
--- a/service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java
+++ b/service-user/src/main/java/com/java110/user/dao/impl/MenuCatalogV1ServiceDaoImpl.java
@@ -22,6 +22,7 @@
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 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 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;
}
--
Gitblit v1.8.0