>
* @Author yinzuomei
* @Date 2019/11/20 10:42
- **/
+ *
+ * 已过时，改用新接口：
+ * {@link ApiWorkUserV2Controller#indexPanel()}
+ * -- modified by yujt on 20200901
+ */
+ @Deprecated
@GetMapping("indexPanel")
public Result> indexPanel() {
return workUserService.indexPanel();
@@ -169,11 +175,10 @@ public class ApiWorkUserController {
}
/**
- *
* 首页菜单消息数量显示
*
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params []
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author liuchuang
* @since 2019/11/28 19:56
*/
@@ -198,23 +203,23 @@ public class ApiWorkUserController {
/**
- * @describe: 判断是否更新头像
- * @author wangtong
- * @date 2020/3/30 13:32
- * @param []
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- */
+ * @param []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @describe: 判断是否更新头像
+ * @author wangtong
+ * @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) {
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkUserV2Controller.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkUserV2Controller.java
new file mode 100644
index 0000000..a852430
--- /dev/null
+++ b/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>
+ * @Author yinzuomei
+ * @Date 2019/11/20 10:42
+ **/
+ @GetMapping("indexPanel")
+ public Result> indexPanel() {
+ return workUserService.indexPanelV2();
+ }
+
+
+}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index f48914a..80abcff 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/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> 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>
+ * @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);
+
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -93,22 +106,22 @@ public interface AdminFeignClient {
Result getDeptTreeForEpiDemic();
/**
- * @describe: 判断是否更新头像
- * @author wangtong
- * @date 2020/3/30 13:43
- * @param []
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- */
+ * @param []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @describe: 判断是否更新头像
+ * @author wangtong
+ * @date 2020/3/30 13:43
+ */
@GetMapping("sys/user/checkUpdateAvatar")
Result checkUpdateAvatar();
/**
- * @describe: 更新头像
- * @author wangtong
- * @date 2020/3/30 16:17
- * @param [avatar]
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- */
- @GetMapping(value="sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
+ * @param [avatar]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @describe: 更新头像
+ * @author wangtong
+ * @date 2020/3/30 16:17
+ */
+ @GetMapping(value = "sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
Result updateAvatar(@RequestParam("avatar") String avatar);
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index b8ccb3b..ba5917a 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/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 getCompleteDept(Long gridId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
}
+
@Override
public Result 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> indexPanel(String category, String mobile) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", category, mobile);
+ }
+
@Override
public Result 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);
}
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
index e30ff25..e636bbb 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
+++ b/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> indexPanel();
+ Result> indexPanelV2();
+
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result>
@@ -121,11 +124,10 @@ public interface WorkUserService {
Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
/**
- *
* 首页菜单消息数量显示
*
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params []
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @author liuchuang
* @since 2019/11/28 20:03
*/
@@ -141,20 +143,21 @@ public interface WorkUserService {
Result logout(Long userId);
/**
- * @describe: 判断是否更新头像
- * @author wangtong
- * @date 2020/3/30 13:32
- * @param
- * @return
- */
+ * @param
+ * @return
+ * @describe: 判断是否更新头像
+ * @author wangtong
+ * @date 2020/3/30 13:32
+ */
Result checkUpdateAvatar();
/**
- * @describe: 更新头像
- * @author wangtong
- * @date 2020/3/30 16:13
- * @param [avatar]
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- */
+ * @param [avatar]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @describe: 更新头像
+ * @author wangtong
+ * @date 2020/3/30 16:13
+ */
Result updateAvatar(String avatar);
+
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index 6ea6a68..92fdcab 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/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().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> 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>().error("获取当前登录用户信息失败");
}
// 获取当前用户菜单信息
- Result> adminResult = adminFeignClient.indexPanel(SecurityUser.getUser().getMobile());
+ Result> adminResult = adminFeignClient.indexPanel(AppMenuCategoryEnum.WORK.getValue(), SecurityUser.getUser().getMobile());
if (!adminResult.success()) {
return new Result>().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: 判断是否更新头像
- * @author wangtong
- * @date 2020/3/30 13:42
- * @param []
- * @return com.elink.esua.epdc.commons.tools.utils.Result
- */
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @describe: 判断是否更新头像
+ * @author wangtong
+ * @date 2020/3/30 13:42
+ */
@Override
public Result checkUpdateAvatar() {
return adminFeignClient.checkUpdateAvatar();