修改工作端获取用户首页菜单权限

epdc-cloud-api/pom.xml

@@ -206,7 +206,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>10004</server.port>
+                <server.port>17024</server.port>
 
                 <spring.redis.index>9</spring.redis.index>
                 <spring.redis.host>114.215.125.123</spring.redis.host>

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.controller.v2.ApiWorkUserV2Controller;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
@@ -123,7 +124,12 @@ public class ApiWorkUserController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
      * @Date 2019/11/20 10:42
-     **/
+     * <p>
+     * 已过时，改用新接口：
+     * {@link ApiWorkUserV2Controller#indexPanel()}
+     * -- modified by yujt on 20200901
+     */
+    @Deprecated
     @GetMapping("indexPanel")
     public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
         return workUserService.indexPanel();
@@ -169,11 +175,10 @@ public class ApiWorkUserController {
     }
 
     /**
-     *
      * 首页菜单消息数量显示
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @author liuchuang
      * @since 2019/11/28 19:56
      */
@@ -198,23 +203,23 @@ public class ApiWorkUserController {
 
 
     /**
-    * @describe: 判断是否更新头像
+     * @param []
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 13:32
+     * @describe: 判断是否更新头像
-    * @param []
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 13:32
-    */
+     */
     @GetMapping("checkUpdateAvatar")
     public Result checkUpdateAvatar() {
         return workUserService.checkUpdateAvatar();
     }
 
     /**
+     * @param [avatar]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 更新头像
      * @author wangtong
      * @date 2020/3/30 16:11
-     * @param [avatar]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("updateAvatar")
     public Result updateAvatar(String avatar) {

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkUserV2Controller.java

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.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.*;
+import com.elink.esua.epdc.service.WorkUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工作端，用户登录，用户管理相关接口
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/18 10:45
+ */
+@ApiVersion(2)
+@RestController
+@RequestMapping("work/user" + Constant.VERSION_CONTROL)
+public class ApiWorkUserV2Controller {
+
+    @Autowired
+    private WorkUserService workUserService;
+
+    /**
+     * 首页面板 获取工作端APP菜单
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
+     * @Author yinzuomei
+     * @Date 2019/11/20 10:42
+     **/
+    @GetMapping("indexPanel")
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
+        return workUserService.indexPanelV2();
+    }
+
+
+}

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

@@ -79,9 +79,22 @@ public interface AdminFeignClient {
      * @Description 首页面板 获取工作端APP菜单
      * @Date 2019/11/20 10:43
      **/
+    @Deprecated
     @GetMapping("sys/appmenu/indexPanel/{mobile}")
     Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@PathVariable("mobile") String mobile);
 
+    /**
+     * 首页面板 获取工作端、数据端首页菜单
+     *
+     * @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);
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
@@ -93,22 +106,22 @@ public interface AdminFeignClient {
     Result<DeptOption> getDeptTreeForEpiDemic();
 
     /**
-    * @describe: 判断是否更新头像
+     * @param []
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 13:43
+     * @describe: 判断是否更新头像
-    * @param []
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 13:43
-    */
+     */
     @GetMapping("sys/user/checkUpdateAvatar")
     Result checkUpdateAvatar();
 
     /**
-    * @describe: 更新头像
+     * @param [avatar]
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 16:17
+     * @describe: 更新头像
-    * @param [avatar]
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 16:17
-    */
+     */
-    @GetMapping(value="sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result updateAvatar(@RequestParam("avatar") String avatar);
 }

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

@@ -27,6 +27,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<CompleteDeptDTO> getCompleteDept(Long gridId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
     }
+
     @Override
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
@@ -47,6 +48,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", mobile);
     }
 
+    @Override
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(String category, String mobile) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", category, mobile);
+    }
+
     @Override
     public Result<DeptOption> getDeptTreeForEpiDemic() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeForEpiDemic");
@@ -59,6 +65,6 @@ public class AdminFeignClientFallback implements AdminFeignClient {
 
     @Override
     public Result updateAvatar(String avatar) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar",avatar);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar", avatar);
     }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -89,8 +89,11 @@ public interface WorkUserService {
      * @Author yinzuomei
      * @Date 2019/11/20 10:43
      **/
+    @Deprecated
     Result<List<EpdcAppIndexPanelResultDTO>> indexPanel();
 
+    Result<List<EpdcAppIndexPanelResultDTO>> indexPanelV2();
+
     /**
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
@@ -121,11 +124,10 @@ public interface WorkUserService {
     Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 
     /**
-     *
      * 首页菜单消息数量显示
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO>>
      * @author liuchuang
      * @since 2019/11/28 20:03
      */
@@ -141,20 +143,21 @@ public interface WorkUserService {
     Result logout(Long userId);
 
     /**
-    * @describe: 判断是否更新头像
+     * @param
-    * @author wangtong
+     * @return
-    * @date 2020/3/30 13:32
+     * @describe: 判断是否更新头像
-    * @param
+     * @author wangtong
-    * @return
+     * @date 2020/3/30 13:32
-    */
+     */
     Result checkUpdateAvatar();
 
     /**
-    * @describe: 更新头像
+     * @param [avatar]
-    * @author wangtong
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @date 2020/3/30 16:13
+     * @describe: 更新头像
-    * @param [avatar]
+     * @author wangtong
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @date 2020/3/30 16:13
-    */
+     */
     Result updateAvatar(String avatar);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
+import com.elink.esua.epdc.enums.AppMenuCategoryEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
@@ -155,9 +156,9 @@ public class WorkUserServiceImpl implements WorkUserService {
             if (CollUtil.isEmpty(deptIdList)) {
                 return new Result().error("获取用户部门权限失败");
             }
-            if(deptIdList != null && deptIdList.size() > 0){
+            if (deptIdList != null && deptIdList.size() > 0) {
                 fromDto.setGridIdList(user.getDeptIdList());
-            }else {
+            } else {
                 return new Result<Integer>().error("用户信息有误，请重新登陆");
             }
             fromDto.setGridIdList(user.getDeptIdList());
@@ -201,7 +202,17 @@ public class WorkUserServiceImpl implements WorkUserService {
         if (StringUtils.isBlank(mobile)) {
             return new Result().error("获取用户信息失败");
         }
-        return adminFeignClient.indexPanel(mobile);
+//        return adminFeignClient.indexPanel
+        return adminFeignClient.indexPanel(AppMenuCategoryEnum.WORK.getValue(), mobile);
+    }
+
+    @Override
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanelV2() {
+        String mobile = SecurityUser.getUser().getMobile();
+        if (StringUtils.isBlank(mobile)) {
+            throw new RenException("获取用户信息失败");
+        }
+        return adminFeignClient.indexPanel(AppMenuCategoryEnum.WORK.getValue(), mobile);
     }
 
     /**
@@ -240,7 +251,7 @@ public class WorkUserServiceImpl implements WorkUserService {
             return new Result<List<WorkAppMenuStatisticsResultDTO>>().error("获取当前登录用户信息失败");
         }
         // 获取当前用户菜单信息
-        Result<List<EpdcAppIndexPanelResultDTO>> adminResult = adminFeignClient.indexPanel(SecurityUser.getUser().getMobile());
+        Result<List<EpdcAppIndexPanelResultDTO>> adminResult = adminFeignClient.indexPanel(AppMenuCategoryEnum.WORK.getValue(), SecurityUser.getUser().getMobile());
         if (!adminResult.success()) {
             return new Result<List<WorkAppMenuStatisticsResultDTO>>().error(adminResult.getMsg());
         }
@@ -333,16 +344,15 @@ public class WorkUserServiceImpl implements WorkUserService {
      **/
     @Override
     public Result logout(Long userId) {
-        return resourceFeignClient.logoutUser(userId+"");
+        return resourceFeignClient.logoutUser(userId + "");
     }
 
     /**
-    * @describe: 判断是否更新头像
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
-    * @author wangtong
+     * @describe: 判断是否更新头像
-    * @date 2020/3/30 13:42
+     * @author wangtong
-    * @param []
+     * @date 2020/3/30 13:42
-    * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
-    */
     @Override
     public Result checkUpdateAvatar() {
         return adminFeignClient.checkUpdateAvatar();