工作日志修改

5 years ago · 47568691f5
7 changed files with 230 additions and 0 deletions
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
@ -0,0 +1,61 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
+import com.elink.esua.epdc.service.AdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 工作日志相关
+ *
+ * @author songyunpeng
+ * @date 2021/1/27 10:30
+ */
+@RestController
+@RequestMapping("plugins/workLog")
+public class ApiWorkLogController {
+    @Autowired
+    private AdminService adminService;
+    /**
+     * @Description  获取用户信息
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    @PostMapping("getUserInfo")
+    public Result<EpdcWorkLogUserDetailDTO> getUserInfo(){
+        return adminService.getUserInfo();
+    }
+
+     /**
+     * @Description  获取用户部门权限
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    @PostMapping("getUserDeptOptionByUserId")
+    public Result<DeptOption> getUserDeptOptionByUserId(){
+        return adminService.getUserDeptOptionByUserId();
+    }
+
+    /**
+     * @Description  获取customId
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping("getCustomId")
+    public Result<String> getCustomId(){
+        return adminService.getCustomId();
+    }
+
+
+}
--- 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
@ -13,6 +13,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
@ -124,4 +125,25 @@ public interface AdminFeignClient {
     */
    @GetMapping(value = "sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
    Result updateAvatar(@RequestParam("avatar") String avatar);
+
+    /**
+     * 获取用户部门多层结构，用户前端显示，请求需携带token  --  工作日志使用
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 14:31
+     */
+    @PostMapping(value = "sys/user/deptOptions/getUserDeptOptionByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<DeptOption> getUserDeptOptionByUserId();
+
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @Author yinzuomei
+     * @Description 获取所有组织机构信息
+     * @Date 2020/1/28 12:15
+     **/
+    @GetMapping("sys/dept/party/getDeptTree")
+    Result<DeptOption> getAllDeptTree();
+
 }
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@ -0,0 +1,30 @@
+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.feign.fallback.AnalysisFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 数据分析模块调用
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/9 15:41
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+public interface AnalysisFeignClient {
+
+    /**
+     * @Description  组织机构编码获取
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping(value = "analysis/workLog/getCustomId", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> getCustomId();
+
+
+}
--- 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
@ -67,4 +67,14 @@ public class AdminFeignClientFallback implements AdminFeignClient {
    public Result updateAvatar(String avatar) {
        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar", avatar);
    }
+
+    @Override
+    public Result<DeptOption> getUserDeptOptionByUserId() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserDeptOptionByUserId");
+    }
+
+    @Override
+    public Result<DeptOption> getAllDeptTree() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree");
+    }
 }
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@ -0,0 +1,20 @@
+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.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author：songyunpeg
+ * @Date：2020/9/9 15:42
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+    @Override
+    public Result getCustomId() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCustomId");
+    }
+}
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java
@ -1,6 +1,8 @@
 package com.elink.esua.epdc.service;

 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;

 /**
 * 管理端相关接口
@ -20,4 +22,29 @@ public interface AdminService {
     * @date 2019/9/11 09:46
     */
    Result<String> getCompleteDeptName(Long gridId);
+    /**
+     * @Description   获取用户信息
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    Result<EpdcWorkLogUserDetailDTO> getUserInfo();
+    /**
+     * @Description   获取用户部门权限
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     **/
+    Result<DeptOption> getUserDeptOptionByUserId();
+
+    /**
+     * @Description  获取customId
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    Result<String> getCustomId();
 }
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@ -1,9 +1,18 @@
 package com.elink.esua.epdc.service.impl;

+import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+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.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.AdminService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -19,6 +28,9 @@ public class AdminServiceImpl implements AdminService {
    @Autowired
    private AdminFeignClient adminFeignClient;

+    @Autowired
+    private AnalysisFeignClient analysisFeignClient;
+
    @Override
    public Result<String> getCompleteDeptName(Long gridId) {
        Result<CompleteDeptDTO> adminResult = adminFeignClient.getCompleteDept(gridId);
@ -33,4 +45,52 @@ public class AdminServiceImpl implements AdminService {
                .concat(completeDept.getGrid());
        return new Result().ok(deptName);
    }
+
+    @Override
+    public Result<EpdcWorkLogUserDetailDTO> getUserInfo() {
+        //缓存中用户信息
+        UserDetail user = SecurityUser.getUser();
+        if(user == null){
+            throw new RenException("用户未登录");
+        }
+        Result<String> customIdResult = analysisFeignClient.getCustomId();
+        if(customIdResult == null || StringUtils.isBlank(customIdResult.getData())){
+            throw new RenException("无法获取到CustomID");
+        }
+        EpdcWorkLogUserDetailDTO epdcWorkLogUserDetailDTO = new EpdcWorkLogUserDetailDTO();
+        epdcWorkLogUserDetailDTO.setUserId(String.valueOf(user.getId()));
+        epdcWorkLogUserDetailDTO.setNickname(user.getRealName());
+        epdcWorkLogUserDetailDTO.setProfile(user.getHeadUrl());
+        epdcWorkLogUserDetailDTO.setRealName(user.getRealName());
+        epdcWorkLogUserDetailDTO.setCustomerId(customIdResult.getData());
+        epdcWorkLogUserDetailDTO.setAgencyId(String.valueOf(user.getDeptId()));
+        epdcWorkLogUserDetailDTO.setAdminFlag(String.valueOf(user.getSuperAdmin()));
+        epdcWorkLogUserDetailDTO.setMobile(user.getMobile());
+        if(user.getSuperAdmin() == SuperAdminEnum.NO.value()){
+            //查询用户部门等信息
+            Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(user.getDeptId());
+            ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+            epdcWorkLogUserDetailDTO.setAgencyIdPath(deptDTO.getAllDeptIds());
+            epdcWorkLogUserDetailDTO.setAgencyName(deptDTO.getGrid());
+            epdcWorkLogUserDetailDTO.setAgencyNamePath(deptDTO.getAllDeptNames());
+        }
+        return new Result<EpdcWorkLogUserDetailDTO>().ok(epdcWorkLogUserDetailDTO);
+    }
+
+    @Override
+    public Result<DeptOption> getUserDeptOptionByUserId() {
+        //缓存中用户信息
+        UserDetail user = SecurityUser.getUser();
+        if(user == null){
+            throw new RenException("用户未登录");
+        }
+        if(user.getSuperAdmin() == SuperAdminEnum.YES.value()){
+            return adminFeignClient.getAllDeptTree();
+        }
+        return adminFeignClient.getUserDeptOptionByUserId();
+    }
+    @Override
+    public Result<String> getCustomId() {
+        return analysisFeignClient.getCustomId();
+    }
 }