java110 5 år sedan
förälder
incheckning
67bf287f59

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/menuGroup/MenuGroupDto.java

@@ -14,6 +14,7 @@ public class MenuGroupDto extends PageDto implements Serializable {
     private String description;
     private String statusCd;
     private String groupType;
+    private String storeTypeCd;
 
     public String getGId() {
         return gId;
@@ -86,4 +87,12 @@ public class MenuGroupDto extends PageDto implements Serializable {
     public void setGroupType(String groupType) {
         this.groupType = groupType;
     }
+
+    public String getStoreTypeCd() {
+        return storeTypeCd;
+    }
+
+    public void setStoreTypeCd(String storeTypeCd) {
+        this.storeTypeCd = storeTypeCd;
+    }
 }

+ 12 - 0
java110-bean/src/main/java/com/java110/vo/api/menuGroup/ApiMenuGroupDataVo.java

@@ -12,6 +12,18 @@ public class ApiMenuGroupDataVo implements Serializable {
     private String description;
     private String groupType;
 
+
+    private String storeTypeCd;
+
+    public String getStoreTypeCd() {
+        return storeTypeCd;
+    }
+
+    public void setStoreTypeCd(String storeTypeCd) {
+        this.storeTypeCd = storeTypeCd;
+    }
+
+
     public String getGId() {
         return gId;
     }

+ 12 - 3
java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存路由信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveMenuGroupInfo" parameterType="Map">
         insert into m_menu_group(
-        g_id,name,icon,label,seq,description,group_type
+        g_id,name,icon,label,seq,description,group_type,store_type_cd
         ) values (
-        #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType}
+        #{gId},#{name},#{icon},#{label},#{seq},#{description},#{groupType},#{storeTypeCd}
         )
 
     </insert>
@@ -18,7 +18,7 @@
 
     <!-- 查询路由信息 add by wuxw 2018-07-03 -->
     <select id="getMenuGroupInfo" parameterType="Map" resultType="Map">
-        select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType
+        select t.g_id,t.name,t.icon,t.label,t.seq,t.description,t.g_id gId,t.group_type groupType,t.store_type_cd storeTypeCd
         from m_menu_group t
         where t.status_cd= '0'
         <if test="gId !=null and gId != ''">
@@ -36,6 +36,9 @@
         <if test="groupType !=null and groupType != ''">
             and t.group_type= #{groupType}
         </if>
+        <if test="storeTypeCd !=null and storeTypeCd != ''">
+            and t.store_type_cd= #{storeTypeCd}
+        </if>
         <if test="seq !=null">
             and t.seq= #{seq}
         </if>
@@ -73,6 +76,9 @@
             <if test="seq !=null ">
                 t.seq= #{seq},
             </if>
+            <if test="storeTypeCd !=null and storeTypeCd != ''">
+                t.store_type_cd= #{storeTypeCd},
+            </if>
             <if test="description !=null and description != ''">
                 t.description= #{description}
             </if>
@@ -107,6 +113,9 @@
         <if test="seq !=null">
             and t.seq= #{seq}
         </if>
+        <if test="storeTypeCd !=null and storeTypeCd != ''">
+            and t.store_type_cd= #{storeTypeCd}
+        </if>
         <if test="description !=null and description != ''">
             and t.description= #{description}
         </if>

+ 4 - 4
service-front/src/main/java/com/java110/front/smo/impl/MenuServiceSMOImpl.java

@@ -1,10 +1,10 @@
 package com.java110.front.smo.impl;
 
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
 import com.java110.core.component.BaseComponentSMO;
+import com.java110.core.context.IPageData;
 import com.java110.front.smo.IMenuServiceSMO;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@ public class MenuServiceSMOImpl extends BaseComponentSMO implements IMenuService
         Assert.hasLength(pd.getUserId(), "用户还没有登录");
 
         responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/query.menu.info?userId=" + pd.getUserId()+"&groupType=P_WEB", HttpMethod.GET);
+                ServiceConstant.SERVICE_API_URL + "/api/query.menu.info?userId=" + pd.getUserId() + "&groupType=P_WEB", HttpMethod.GET);
         return responseEntity;
     }