From 623766293984e15b41da55e4d2714173f3786550 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 25 Nov 2020 10:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8C=87=E6=A0=87=E5=B1=95=E7=A4=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=91=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-11-25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/note/result/DeptRankResultDTO.java | 27 +++++++++++++ .../esua/epdc/feign/AnalysisFeignClient.java | 40 +++++++++++++++++++ .../fallback/AnalysisFeignClientFallback.java | 29 ++++++++++++++ .../impl/UserAnalysisNoteServiceImpl.java | 11 ++++- 4 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/note/result/DeptRankResultDTO.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/note/result/DeptRankResultDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/note/result/DeptRankResultDTO.java new file mode 100644 index 000000000..01efd4e38 --- /dev/null +++ b/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 streetRank; + + /** + * 社区排行 + */ + private Map communityRank; +} \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java new file mode 100644 index 000000000..fcf608093 --- /dev/null +++ b/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 + */ + @GetMapping(value = "analysis/performanceScore/getDeptRank", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptRank(); + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java new file mode 100644 index 000000000..e1dd21478 --- /dev/null +++ b/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 getDeptRank() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getDeptRank"); + } + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java index 276e98a1d..819425900 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java +++ b/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 params = new HashMap<>(); List userNoteList = baseDao.getList(params); //获取街道排名和社区排名(这个要调接口) - MapstreeRanking = new HashMap<>(); - MapcommuniytRanking = new HashMap<>(); + Result deptRank = analysisFeignClient.getDeptRank(); + DeptRankResultDTO deptRankResultDto = deptRank.getData(); + MapstreeRanking = deptRankResultDto.getStreetRank(); + MapcommuniytRanking = deptRankResultDto.getCommunityRank(); //根据信息区分出街道账号和区级账号 for (UserAnalysisNoteDTO dto:userNoteList) { //查询部门类型