diff --git a/epdc-cloud-analysis/pom.xml b/epdc-cloud-analysis/pom.xml index 0798767..f2a0519 100644 --- a/epdc-cloud-analysis/pom.xml +++ b/epdc-cloud-analysis/pom.xml @@ -20,6 +20,11 @@ epdc-cloud-analysis-client ${epdc-cloud-client.version} + + com.esua.epdc.yushan + epdc-cloud-admin-client + ${epdc-cloud-client.version} + com.esua.epdc.yushan epdc-commons-tools @@ -30,6 +35,11 @@ epdc-commons-mybatis ${epdc-cloud-commons.version} + + com.esua.epdc.yushan + epdc-commons-api-version-control + ${epdc-cloud-commons.version} + org.springframework.boot diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index d78c60b..cb4ca90 100644 --- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/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> 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> + * @author work@yujt.net.cn + * @date 2020/9/1 17:30 + */ + @GetMapping("sys/appmenu/v2/indexPanel/${category}/{mobile}") + Result> indexPanel(@PathVariable("category") String category, @PathVariable("mobile") String mobile); + } diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index c2e79a7..8a2f699 100644 --- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/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> indexPanel(String category, String mobile) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", category, mobile); + } } diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/HomeController.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/HomeController.java index 47337e5..154202c 100644 --- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/HomeController.java +++ b/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 streetListResultDTOList = metaSysDeptService.getAllStreetInfo(); return new Result>().ok(streetListResultDTOList); } + + /** + * 已过时，改用新接口 + * {@link HomeV2Controller#getIndexPanel()} + * -- modified by yujt on 20200902 + */ @GetMapping("getIndexPanel") public Result> getIndexPanel(){ Result> data = homeService.getIndexPanel(); diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/v2/HomeV2Controller.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/controller/v2/HomeV2Controller.java new file mode 100644 index 0000000..45702da --- /dev/null +++ b/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> + * @author work@yujt.net.cn + * @date 2020/9/2 09:23 + */ + @GetMapping("getIndexPanel") + public Result> getIndexPanel() { + return homeService.getIndexPanelV2(); + } +} diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/HomeService.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/HomeService.java index 9286786..ebbe15d 100644 --- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/HomeService.java +++ b/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> getIndexPanel(); + /** + * 首页面板 获取工作端、数据端首页菜单 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/9/2 09:20 + */ + Result> getIndexPanelV2(); } \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/impl/HomeServiceImpl.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/impl/HomeServiceImpl.java index 005a9b7..18befc8 100644 --- a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/organize/service/impl/HomeServiceImpl.java +++ b/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> getIndexPanel(){ + public Result> getIndexPanel() { return adminFeignClient.analysisIndexPanel(SecurityUser.getUserId().toString()); } + + @Override + public Result> getIndexPanelV2() { + return adminFeignClient.indexPanel(AppMenuCategoryEnum.ANALYSIS.getValue(), SecurityUser.getUser().getMobile()); + } } \ No newline at end of file