【pc端 -新增用户指标展示管理】【定时任务接口修改】魏凯 2020-11-25

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/note/result/DeptRankResultDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.note.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: epdc-cloud-analysis
+ * @description: 街道、社区排行
+ * @author: wangtong
+ * @create: 2020-11-25 09:22
+ **/
+@Data
+public class DeptRankResultDTO implements Serializable {
+
+    /**
+     * 街道排行
+     */
+    private Map<String,Integer> streetRank;
+
+    /**
+     * 社区排行
+     */
+    private Map<String,Integer> communityRank;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -0,0 +1,40 @@
+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.note.result.DeptRankResultDTO;
+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;
+
+import java.util.List;
+
+/**
+ *  调用 社区 街道 综合指标排名
+ * @Author wk
+ * @Date 2022/11/25 11:00
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+public interface AnalysisFeignClient {
+
+
+    /**
+     * 测试
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:42
+     */
+    @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result test();
+    /*
+     * 
+     * 调用街道，社区排名接口 
+     * @author wk 
+     * @date 2020-11-25 10:16
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.note.result.DeptRankResultDTO>
+     */
+    @GetMapping(value = "analysis/performanceScore/getDeptRank", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<DeptRankResultDTO> getDeptRank();
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -0,0 +1,29 @@
+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.note.result.DeptRankResultDTO;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author LPF
+ * @Date 2019/11/18 16:39
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+    @Override
+    public Result test() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
+    }
+
+    @Override
+    public Result<DeptRankResultDTO> getDeptRank() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getDeptRank");
+    }
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java

@@ -27,13 +27,16 @@ 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.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.UserAnalysisNoteDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.UserAnalysisNoteDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
+import com.elink.esua.epdc.dto.note.result.DeptRankResultDTO;
 import com.elink.esua.epdc.entity.SysUserEntity;
 import com.elink.esua.epdc.entity.UserAnalysisNoteEntity;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.feign.MessageFeignClient;
 import com.elink.esua.epdc.redis.UserAnalysisNoteRedis;
 import com.elink.esua.epdc.service.SysDeptService;
@@ -63,6 +66,8 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
 
     @Autowired
     private MessageFeignClient messageFeignClient;
+    @Autowired
+    private AnalysisFeignClient analysisFeignClient;
     static final  String  SMSTYPENAME = "ANALYSIS_INDEX";
 
     @Override
@@ -205,8 +210,10 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
         Map<String, Object> params = new HashMap<>();
         List<UserAnalysisNoteDTO>  userNoteList =   baseDao.getList(params);
         //获取街道排名和社区排名(这个要调接口)
-        Map<String,Integer>streeRanking = new HashMap<>();
+        Result<DeptRankResultDTO> deptRank =  analysisFeignClient.getDeptRank();
-        Map<String,Integer>communiytRanking = new HashMap<>();
+        DeptRankResultDTO deptRankResultDto =  deptRank.getData();
+        Map<String,Integer>streeRanking = deptRankResultDto.getStreetRank();
+        Map<String,Integer>communiytRanking = deptRankResultDto.getCommunityRank();
         //根据信息区分出街道账号和区级账号
         for (UserAnalysisNoteDTO dto:userNoteList) {
             //查询部门类型