数据端首页菜单接口修改

epdc-cloud-analysis/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>epdc-cloud-analysis-client</artifactId>
             <version>${epdc-cloud-client.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-cloud-admin-client</artifactId>
+            <version>${epdc-cloud-client.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.esua.epdc.yushan</groupId>
             <artifactId>epdc-commons-tools</artifactId>
@@ -30,6 +35,11 @@
             <artifactId>epdc-commons-mybatis</artifactId>
             <version>${epdc-cloud-commons.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-commons-api-version-control</artifactId>
+            <version>${epdc-cloud-commons.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -28,7 +29,20 @@ public interface AdminFeignClient {
      * @Description 首页面板 获取数据端APP菜单
      * @Date 2020/03/18 10:42
      **/
+    @Deprecated
     @GetMapping("sys/analysismenu/analysisIndexPanel/{userId}")
     Result<List<EpdcAppChildNavResultDTO>> analysisIndexPanel(@PathVariable("userId") String userId);
 
+    /**
+     * 首页面板 获取工作端、数据端首页菜单
+     *
+     * @param category {@link com.elink.esua.epdc.enums.AppMenuCategoryEnum}
+     * @param mobile   管理员手机号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/9/1 17:30
+     */
+    @GetMapping("sys/appmenu/v2/indexPanel/${category}/{mobile}")
+    Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@PathVariable("category") String category, @PathVariable("mobile") String mobile);
+
 }

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
@@ -24,4 +25,8 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "analysisIndexPanel", userId);
     }
 
+    @Override
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(String category, String mobile) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", category, mobile);
+    }
 }

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/HomeController.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.organize.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.organize.result.StreetListResultDTO;
 import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.modules.organize.controller.v2.HomeV2Controller;
 import com.elink.esua.epdc.modules.organize.service.HomeService;
 import com.elink.esua.epdc.modules.organize.service.MetaSysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,12 @@ public class HomeController {
         List<StreetListResultDTO> streetListResultDTOList = metaSysDeptService.getAllStreetInfo();
         return new Result<List<StreetListResultDTO>>().ok(streetListResultDTOList);
     }
+
+    /**
+     * 已过时，改用新接口
+     * {@link HomeV2Controller#getIndexPanel()}
+     * -- modified by yujt on 20200902
+     */
     @GetMapping("getIndexPanel")
     public Result<List<EpdcAppChildNavResultDTO>> getIndexPanel(){
         Result<List<EpdcAppChildNavResultDTO>> data = homeService.getIndexPanel();

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/v2/HomeV2Controller.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.modules.organize.controller.v2;
+
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.dto.organize.result.StreetListResultDTO;
+import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.modules.organize.service.HomeService;
+import com.elink.esua.epdc.modules.organize.service.MetaSysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author songyunpeng
+ * @Description 街道结构列表和首页权限
+ * @create 2020-03-10
+ */
+@ApiVersion(2)
+@RestController
+@RequestMapping("home" + Constant.VERSION_CONTROL)
+public class HomeV2Controller {
+
+    @Autowired
+    private HomeService homeService;
+
+    /**
+     * 数据端获取用户首页按钮权限
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/9/2 09:23
+     */
+    @GetMapping("getIndexPanel")
+    public Result<List<EpdcAppIndexPanelResultDTO>> getIndexPanel() {
+        return homeService.getIndexPanelV2();
+    }
+}

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/HomeService.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.organize.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
 
 import java.util.List;
@@ -38,6 +39,15 @@ public interface HomeService {
      * @author generator
      * @date 2020-02-20
      */
+    @Deprecated
     Result<List<EpdcAppChildNavResultDTO>> getIndexPanel();
 
+    /**
+     * 首页面板 获取工作端、数据端首页菜单
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/9/2 09:20
+     */
+    Result<List<EpdcAppIndexPanelResultDTO>> getIndexPanelV2();
 }

epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/impl/HomeServiceImpl.java

@@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.organize.service.impl;
 
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.user.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.enums.AppMenuCategoryEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.organize.service.HomeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,12 @@ public class HomeServiceImpl implements HomeService {
     private AdminFeignClient adminFeignClient;
 
     @Override
-    public Result<List<EpdcAppChildNavResultDTO>> getIndexPanel(){
+    public Result<List<EpdcAppChildNavResultDTO>> getIndexPanel() {
         return adminFeignClient.analysisIndexPanel(SecurityUser.getUserId().toString());
     }
+
+    @Override
+    public Result<List<EpdcAppIndexPanelResultDTO>> getIndexPanelV2() {
+        return adminFeignClient.indexPanel(AppMenuCategoryEnum.ANALYSIS.getValue(), SecurityUser.getUser().getMobile());
+    }
 }