panel修改

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.excel.AppMenuExcel;
 import com.elink.esua.epdc.service.AppMenuService;
@@ -126,4 +127,15 @@ public class AppMenuController {
     public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@PathVariable("mobile") String mobile) {
         return appMenuService.indexPanel(mobile);
     }
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    @GetMapping("/analysisIndexPanel/{userId}")
+    public Result<List<EpdcAppChildNavResultDTO>> analysisIndexPanel(@PathVariable("userId") String userId) {
+        return appMenuService.getAnalysisIndexPanel(userId);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -78,4 +79,13 @@ public interface AppMenuDao extends BaseDao<AppMenuEntity> {
 	 * @Date 2019/11/20 11:10
 	 **/
 	List<EpdcAppIndexPanelResultDTO> indexPanelByMobile(String mobile);
+
+	/**
+	 * @param userId
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+	 * @Author lpf
+	 * @Description 首页面板 获取数据端APP菜单
+	 * @Date 2020/03/18 10:42
+	 **/
+	List<EpdcAppChildNavResultDTO> getAnalysisIndexPanel(String userId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 
@@ -143,4 +144,12 @@ public interface AppMenuService extends BaseService<AppMenuEntity> {
      * @Date 2019/11/20 10:42
      **/
     Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(String mobile);
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
+     * @Author lpf
+     * @Description 首页面板 获取数据端APP菜单
+     * @Date 2020/03/18 10:42
+     **/
+    Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java

@@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.AppMenuDao;
 import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.entity.AppMenuEntity;
 import com.elink.esua.epdc.enums.MenuTableEnum;
@@ -171,6 +172,14 @@ public class AppMenuServiceImpl extends BaseServiceImpl<AppMenuDao, AppMenuEntit
         List<EpdcAppIndexPanelResultDTO> indexPanelResultDTOList = this.baseDao.indexPanelByMobile(mobile);
         return new Result().ok(indexPanelResultDTOList);
     }
+    @Override
+    public Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户Id不能为空");
+        }
+        List<EpdcAppChildNavResultDTO> list = this.baseDao.getAnalysisIndexPanel(userId);
+        return new Result().ok(list);
+    }
 
 
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml

@@ -23,7 +23,6 @@ spring:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
         ip: @nacos.ip@
-        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-admin-server-fescar-service-group

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml

@@ -124,4 +124,43 @@
             AND m.pid != 0
             )order by mp.sort asc,mc.sort asc
     </select>
+    <resultMap id="AnalysisIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO">
+        <id column="label" property="label"/>
+        <result column="navCode" property="navCode"/>
+        <result column="remark" property="remark"/>
+        <result column="icon" property="icon"/>
+        <result column="className" property="className"/>
+        <result column="numFlag" property="numFlag"/>
+    </resultMap>
+    <select id="getAnalysisIndexPanel" resultMap="AnalysisIndexPanelResultDTOMap">
+         SELECT
+            lc.field_value AS label,
+            mc.menu_code AS navCode,
+            mc.remark,
+            mc.class_name AS className,
+            mc.icon,
+			mc.num_flag as numFlag
+        FROM
+            sys_app_menu mp
+            LEFT JOIN sys_language lp ON lp.table_id = mp.id
+            LEFT JOIN sys_app_menu mc ON mp.id = mc.pid
+            LEFT JOIN sys_language lc ON lc.table_id = mc.id
+        WHERE
+            mc.id IN (
+        SELECT
+            m.id meauId
+        FROM
+            sys_user u
+            LEFT JOIN sys_role_user ru ON ru.user_id = u.id
+            LEFT JOIN sys_app_role_menu am ON am.role_id = ru.role_id
+            LEFT JOIN sys_app_menu m ON am.menu_id = m.id  and m.del_flag = 0
+			LEFT JOIN sys_app_menu m1 ON m1.id = m.pid and m1.del_flag = 0
+        WHERE
+			u.id =#{userId}
+			and u.del_flag = 0
+            and am.menu_id IS NOT NULL
+            AND m.pid != 0
+			and m1.menu_code = 10010
+            )order by mp.sort asc,mc.sort asc
+    </select>
 </mapper>