From b3caa9469ccbeec947c8d57b65bdef66edf0be86 Mon Sep 17 00:00:00 2001 From: yujt Date: Mon, 8 Jun 2020 17:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=87=E6=97=B6=E7=9A=84an?= =?UTF-8?q?alysis=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=89=93=E5=8C=85=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-api/backup/analysis.7z | Bin 0 -> 4588 bytes epdc-cloud-api/pom.xml | 8 +- .../ApiAnalysisIssueController.java | 82 ----------- .../controller/ApiAnalysisItemController.java | 85 ----------- .../ApiAnalysisTopicController.java | 62 -------- .../controller/ApiAnalysisUserController.java | 115 --------------- .../epdc/feign/AnalysisIssueFeignClient.java | 63 -------- .../epdc/feign/AnalysisItemFeignClient.java | 67 --------- .../epdc/feign/AnalysisTopicFeignClient.java | 40 ------ .../epdc/feign/AnalysisUserFeignClient.java | 90 ------------ .../AnalysisIssueFeignClientFallback.java | 45 ------ .../AnalysisItemFeignClientFallback.java | 45 ------ .../AnalysisTopicFeignClientFallback.java | 34 ----- .../AnalysisUserFeignClientFallback.java | 54 ------- .../epdc/service/AnalysisIssueService.java | 51 ------- .../epdc/service/AnalysisItemService.java | 55 ------- .../epdc/service/AnalysisTopicService.java | 40 ------ .../epdc/service/AnalysisUserService.java | 100 ------------- .../impl/AnalysisIssueServiceImpl.java | 50 ------- .../service/impl/AnalysisItemServiceImpl.java | 50 ------- .../impl/AnalysisTopicServiceImpl.java | 39 ----- .../service/impl/AnalysisUserServiceImpl.java | 135 ------------------ 22 files changed, 1 insertion(+), 1309 deletions(-) create mode 100644 epdc-cloud-api/backup/analysis.7z delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java delete mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java diff --git a/epdc-cloud-api/backup/analysis.7z b/epdc-cloud-api/backup/analysis.7z new file mode 100644 index 0000000000000000000000000000000000000000..631303108f05d6999462bf4ef138a57b5af3b786 GIT binary patch literal 4588 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 W0RaVF01yBG42tdw0Z@iSH~;_|m9xtL literal 0 HcmV?d00001 diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml index 8cff3a9..47d3fb5 100644 --- a/epdc-cloud-api/pom.xml +++ b/epdc-cloud-api/pom.xml @@ -56,11 +56,6 @@ ${epdc-cloud-client.version} - - com.esua.epdc.yushan - epdc-cloud-analysis-client - ${epdc-cloud-client.version} - @@ -103,8 +98,7 @@ com.esua.epdc.yushan epdc-cloud-property-client - 1.0.0 - compile + ${epdc-cloud-commons.version} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java deleted file mode 100644 index a51749c..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; -import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; -import com.elink.esua.epdc.service.AnalysisIssueService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 移动端接口-数据分析模块(项目) - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("analysis/issue") -public class ApiAnalysisIssueController { - - @Autowired - private AnalysisIssueService analysisIssueService; - - - /** - * 测试demo - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("test") - public Result test(@LoginUser TokenDto tokenDto) { - return analysisIssueService.test(); - } - - /** - * @Description: 议题项目数量类目分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping("getStatisticsByCategory") - public Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { - return analysisIssueService.listStatisticsByCategory(formDto); - } - - /** - * @Description: 最新发布议题接口 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: wgf - * @Date: 2020-02-11 - */ - @GetMapping("getNewIssueList") - public Result> getNewIssueList(NewIssueFormDTO formDto) { - return analysisIssueService.getNewIssueList(formDto); - } - - /** - * @Description: 最热议题接口 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: wgf - * @Date: 2020-02-11 - */ - @GetMapping("getHotIssueList") - public Result> getHotIssueList(HotIssueFormDTO formDto) { - return analysisIssueService.getHotIssueList(formDto); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java deleted file mode 100644 index 0f118bb..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.HotItemListResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; -import com.elink.esua.epdc.service.AnalysisItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * 移动端接口-数据分析模块(项目) - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("analysis/item") -public class ApiAnalysisItemController { - - @Autowired - private AnalysisItemService analysisItemService; - - - /** - * 测试demo - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("test") - public Result test(@LoginUser TokenDto tokenDto) { - return analysisItemService.test(); - } - - /** - * @Description: 重点项目概况 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping("getItemSurvey") - public Result getItemSurvey(ItemSurveyFormDTO formDto) { - return analysisItemService.getItemSurvey(formDto); - } - - /** - * @Description: 疑难项目分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping("getItemAnalysis") - public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { - Result> list = analysisItemService.getItemAnalysis(formDto); - return list; - } - - /** - * @Description: 最热项目接口 :最热讨论分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-12 - */ - @GetMapping("getHotItemList") - public Result> getHotItemList(HotItemListFormDTO formDto) { - Result> list = analysisItemService.listHotItemList(formDto); - return list; - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java deleted file mode 100644 index 0bcf9e6..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; -import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; -import com.elink.esua.epdc.service.AnalysisTopicService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 移动端接口-数据分析模块(项目) - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("analysis/topic") -public class ApiAnalysisTopicController { - - @Autowired - private AnalysisTopicService analysisTopicService; - - - /** - * 测试demo - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("test") - public Result test(@LoginUser TokenDto tokenDto) { - return analysisTopicService.test(); - } - - /** - * 最热话题接口 - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: wgf - * @Date: 2020/02/11 09:45 - */ - @GetMapping("getHotTopicList") - public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) { - return analysisTopicService.getHotTopicList(hotTopicFormDTO); - } - - /** - * 最新发布话题接口 - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: wgf - * @Date: 2020/02/11 09:45 - */ - @GetMapping("getNewTopicList") - public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { - return analysisTopicService.getNewTopicList(newHotTopicFormDTO); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java deleted file mode 100644 index a4958a4..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; -import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; -import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.service.AnalysisUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 移动端接口-数据分析模块(项目) - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("analysis/user") -public class ApiAnalysisUserController { - - @Autowired - private AnalysisUserService analysisUserService; - - - /** - * 测试demo - - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("test") - public Result test(@LoginUser TokenDto tokenDto) { - return analysisUserService.test(); - } - - /** - * - * 数据分析端-用户登录 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/12 10:57 - */ - @PostMapping("login") - public Result login(@RequestBody WorkUserLoginDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return analysisUserService.login(formDto); - } - - /** - * - * 数据分析端-获取token - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/12 10:58 - */ - @GetMapping("getToken") - public Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return analysisUserService.getMaToken(formDto); - } - - @GetMapping("/partyMemberOldSort") - public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { - return analysisUserService.listOldMemberRankByDeptId(formDto); - } - @GetMapping("/partyMemberYoungSort") - public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { - return analysisUserService.listYoungMemberRankByDeptId(formDto); - } - - /** - *用户数据统计 - * - * @author wangtong - * @date 2020/2/11 11:32 - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - @GetMapping("/getUserStatistics") - public Result getUserStatistics(UserCountDTO formDto) { - return analysisUserService.getUserStatistics(formDto); - } - - /** - *网格开通状况 - * - * @author wangtong - * @date 2020/2/11 14:22 - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - @GetMapping("/getGridStatistics") - public Result getGridStatistics(UserCountDTO formDto) { - return analysisUserService.getGridStatistics(formDto); - } - @GetMapping("/userRegisterSort") - public Result> userRegisterSort(UserSortRankFormDTO formDto) { - return analysisUserService.userRegisterSort(formDto); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java deleted file mode 100644 index fcca38a..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java +++ /dev/null @@ -1,63 +0,0 @@ -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.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; -import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; -import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.List; - -/** - * 评价模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface AnalysisIssueFeignClient { - - - - /** - * 测试 - * @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(); - - /** - * @Description: 议题项目数量类目分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping(value = "analysis/appissue/getStatisticsByCategory") - Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); - - /** - * 最新发布议题接口 - * @param formDto - * @return - */ - @GetMapping(value = "analysis/appissue/getNewIssueList") - Result> getNewIssueList(NewIssueFormDTO formDto); - - /** - * 最热议题接口 - * @param formDto - * @return - */ - @GetMapping(value = "analysis/appissue/getHotIssueList") - Result> getHotIssueList(HotIssueFormDTO formDto); -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java deleted file mode 100644 index a82bdf0..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java +++ /dev/null @@ -1,67 +0,0 @@ -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.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.HotItemListResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; -import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.List; - -/** - * 评价模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface AnalysisItemFeignClient { - - - - /** - * 测试 - * @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(); - - /** - * @Description: 重点项目概况 - * @Param: [formDTO] - * @return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping(value = "analysis/appitem/getItemSurvey") - Result getItemSurvey(ItemSurveyFormDTO formDto); - - /** - * @Description: 疑难项目分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping(value = "analysis/appitem/getItemAnalysis") - Result> getItemAnalysis(ItemAnalysisFormDTO formDto); - - /** - * @Description: 最热项目接口 :最热讨论分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-12 - */ - @GetMapping(value = "analysis/appitem/getHotItemList") - Result> getHotItemList(HotItemListFormDTO formDto); -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java deleted file mode 100644 index 58ba012..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java +++ /dev/null @@ -1,40 +0,0 @@ -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.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; -import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; -import com.elink.esua.epdc.feign.fallback.AnalysisTopicFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * 评价模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisTopicFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface AnalysisTopicFeignClient { - - - - /** - * 测试 - * @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(); - - @GetMapping(value = "analysis/apptopic/getHotTopicList", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO); - - @GetMapping(value = "analysis/apptopic/getNewTopicList", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO); - - - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java deleted file mode 100644 index 443b0ad..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java +++ /dev/null @@ -1,90 +0,0 @@ -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.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.fallback.AnalysisUserFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.List; - -/** - * 数据分析模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisUserFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface AnalysisUserFeignClient { - - - - /** - * 测试 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "analysis/user/test", consumes = MediaType.APPLICATION_JSON_VALUE) - Result test(); - - - /** - * @Description 党员老龄化排名列表 - * @Author songyunpeng - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - @GetMapping(value = "analysis/user/partyMemberOldSort", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto); - /** - * @Description 党员年轻化化排名列表 - * @Author songyunpeng - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - @GetMapping(value = "analysis/user/partyMemberYoungSort", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); - /** - * @Description 注册用户数排名 - * @Author lpf - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - @GetMapping(value = "analysis/user/userRegisterSort", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> userRegisterSort(UserSortRankFormDTO formDto); - - /** - *用户数据统计 - * - * @author wangtong - * @date 2020/2/12 10:10 - * @param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - @GetMapping(value = "analysis/user/getUserStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getUserStatistics(UserCountDTO formDto); - - /** - *网格开通状况 - * - * @author wangtong - * @date 2020/2/12 10:10 - * @param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - @GetMapping(value = "analysis/user/getGridStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getGridStatistics(UserCountDTO formDto); - - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java deleted file mode 100644 index 65f8ce3..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java +++ /dev/null @@ -1,45 +0,0 @@ -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.issue.form.HotIssueFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; -import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; -import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClient { - - - @Override - public Result test() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); - } - - @Override - public Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getStatisticsByCategory", formDto); - } - - @Override - public Result> getNewIssueList(NewIssueFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewIssueList", formDto); - } - - @Override - public Result> getHotIssueList(HotIssueFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotIssueList", formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java deleted file mode 100644 index 31a96e9..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java +++ /dev/null @@ -1,45 +0,0 @@ -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.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.HotItemListResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; -import com.elink.esua.epdc.feign.AnalysisItemFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient { - - - @Override - public Result test() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); - } - - @Override - public Result getItemSurvey(ItemSurveyFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemSurvey", formDto); - } - - @Override - public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemAnalysis", formDto); - } - - @Override - public Result> getHotItemList(HotItemListFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotItemList", formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java deleted file mode 100644 index 6f445ec..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java +++ /dev/null @@ -1,34 +0,0 @@ -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.topic.form.HotTopicFormDTO; -import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; -import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; -import org.springframework.stereotype.Component; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class AnalysisTopicFeignClientFallback implements AnalysisTopicFeignClient { - - - @Override - public Result test() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); - } - - @Override - public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotTopicList"); - } - - @Override - public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewTopicList"); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java deleted file mode 100644 index 34d77fd..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java +++ /dev/null @@ -1,54 +0,0 @@ -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.user.form.MemberRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.AnalysisUserFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class AnalysisUserFeignClientFallback implements AnalysisUserFeignClient { - - - @Override - public Result test() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); - } - - @Override - public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listOldMemberRankByDeptId",formDto); - } - - @Override - public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listYoungMemberRankByDeptId",formDto); - } - @Override - public Result> userRegisterSort(UserSortRankFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "userRegisterSort",formDto); - } - - @Override - public Result getUserStatistics(UserCountDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getUserStatistics",formDto); - } - - @Override - public Result getGridStatistics(UserCountDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getGridStatistics",formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java deleted file mode 100644 index f9e325e..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; -import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; - -import java.util.List; - -/** - * 项目模块-数据分析移动端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface AnalysisIssueService { - - - /** - * 测试模块 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result test(); - - /** - * @Description: 议题项目数量类目分析 - * @Param: [tokenDto, formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); - - /** - * 最新发布议题接口 - * @param formDto - * @return - */ - Result> getNewIssueList(NewIssueFormDTO formDto); - - /** - * 最热议题接口 - * @param formDto - * @return - */ - Result> getHotIssueList(HotIssueFormDTO formDto); -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java deleted file mode 100644 index 0e5bc00..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.HotItemListResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; - -import java.util.List; - -/** - * 项目模块-数据分析移动端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface AnalysisItemService { - - - /** - * 测试模块 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result test(); - - /** - * @Description: 重点项目概况 - * @Param: [formDTO] - * @return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: zy - * @Date: 2020-02-11 - */ - Result getItemSurvey(ItemSurveyFormDTO formDTO); - - /** - * @Description: 疑难项目分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - Result> getItemAnalysis(ItemAnalysisFormDTO formDto); - - /** - * @Description: 最热项目接口 :最热讨论分析 - * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-12 - */ - Result> listHotItemList(HotItemListFormDTO formDto); -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java deleted file mode 100644 index b4c3545..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; -import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; - -/** - * 项目模块-数据分析移动端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface AnalysisTopicService { - - - /** - * 测试模块 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result test(); - - /** - * 最热话题 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: wanggongfeng - * @return - */ - Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO); - - /** - * 最新发布话题接口 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: wanggongfeng - * @return - */ - Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO); - - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java deleted file mode 100644 index 2b4500a..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; -import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; -import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; - -import java.util.List; - -/** - * 项目模块-数据分析移动端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface AnalysisUserService { - - - /** - * 测试模块 - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result test(); - - /** - * - * 数据分析端-用户登录 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/12 10:59 - */ - Result login(WorkUserLoginDTO formDto); - - /** - * - * 数据分析端-获取token - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/12 11:00 - */ - Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto); - - /** - * @Description 获取党员老龄化排名列表 - * @Author songyunpeng - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto); - /** - * @Description 获取党员年轻化排名列表 - * @Author songyunpeng - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); - - - /** - *网格开通状况 - * - * @author wangtong - * @date 2020/2/12 10:08 - * @param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - Result getGridStatistics(UserCountDTO formDto); - - /** - *用户数据统计 - * - * @author wangtong - * @date 2020/2/12 10:08 - * @param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - Result getUserStatistics(UserCountDTO formDto); - /** - * @Description 注册用户数排名 - * @Author lpf - * @Date 2020/2/11 - * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - Result> userRegisterSort(UserSortRankFormDTO formDto); - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java deleted file mode 100644 index 3840f32..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.service.impl; - - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; -import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; -import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; -import com.elink.esua.epdc.service.AnalysisIssueService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class AnalysisIssueServiceImpl implements AnalysisIssueService { - - @Autowired - private AnalysisIssueFeignClient analysisIssueFeignClient; - - - - @Override - public Result test() { - return analysisIssueFeignClient.test(); - } - - @Override - public Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { - return analysisIssueFeignClient.getStatisticsByCategory(formDto); - } - - @Override - public Result> getNewIssueList(NewIssueFormDTO formDto) { - return analysisIssueFeignClient.getNewIssueList(formDto); - } - - @Override - public Result> getHotIssueList(HotIssueFormDTO formDto) { - return analysisIssueFeignClient.getHotIssueList(formDto); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java deleted file mode 100644 index 3e865c3..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.service.impl; - - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.HotItemListResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; -import com.elink.esua.epdc.feign.AnalysisItemFeignClient; -import com.elink.esua.epdc.service.AnalysisItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class AnalysisItemServiceImpl implements AnalysisItemService { - - @Autowired - private AnalysisItemFeignClient analysisItemFeignClient; - - - - @Override - public Result test() { - return analysisItemFeignClient.test(); - } - - @Override - public Result getItemSurvey(ItemSurveyFormDTO formDTO) { - return analysisItemFeignClient.getItemSurvey(formDTO); - } - - @Override - public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { - return analysisItemFeignClient.getItemAnalysis(formDto); - } - - @Override - public Result> listHotItemList(HotItemListFormDTO formDto) { - return analysisItemFeignClient.getHotItemList(formDto); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java deleted file mode 100644 index 7363ff2..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.elink.esua.epdc.service.impl; - - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; -import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; -import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; -import com.elink.esua.epdc.service.AnalysisTopicService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class AnalysisTopicServiceImpl implements AnalysisTopicService { - - @Autowired - private AnalysisTopicFeignClient analysisTopicFeignClient; - - - - @Override - public Result test() { - return analysisTopicFeignClient.test(); - } - - @Override - public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) { - return analysisTopicFeignClient.getHotTopicList(hotTopicFormDTO); - } - - @Override - public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { - return analysisTopicFeignClient.getNewTopicList(newHotTopicFormDTO); - } -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java deleted file mode 100644 index b49883c..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.elink.esua.epdc.service.impl; - - -import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; -import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; -import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.SysUserDTO; -import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; -import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; -import com.elink.esua.epdc.dto.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; -import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; -import com.elink.esua.epdc.feign.AdminFeignClient; -import com.elink.esua.epdc.feign.AnalysisUserFeignClient; -import com.elink.esua.epdc.feign.ResourceFeignClient; -import com.elink.esua.epdc.service.AnalysisUserService; -import com.elink.esua.epdc.utils.WxMaServiceUtils; -import me.chanjar.weixin.common.error.WxErrorException; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class AnalysisUserServiceImpl implements AnalysisUserService { - - @Autowired - private AnalysisUserFeignClient analysisUserFeignClient; - - @Autowired - private WxMaServiceUtils wxMaServiceUtils; - - @Autowired - private ResourceFeignClient resourceFeignClient; - - @Autowired - private AdminFeignClient adminFeignClient; - - @Override - public Result test() { - return analysisUserFeignClient.test(); - } - - @Override - public Result login(WorkUserLoginDTO formDto) { - // 获取openId - String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid(); - formDto.setOpenId(openId); - return resourceFeignClient.workLogin(formDto); - } - - @Override - public Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) { - // 获取openId - String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid(); - - // 检查当前微信是否已绑定账户 - Result sysUserDtoResult = adminFeignClient.getSysUserInfoByOpenId(openId); - if (!sysUserDtoResult.success()) { - return new Result().error(sysUserDtoResult.getMsg()); - } - SysUserDTO userDto = sysUserDtoResult.getData(); - if (null == userDto) { - WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO(); - resultDto.setRegisterState(NumConstant.ZERO_STR); - return new Result().ok(resultDto); - } - - return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class)); - } - - @Override - public Result> listOldMemberRankByDeptId( MemberRankFormDTO formDto) { - return analysisUserFeignClient.listOldMemberRankByDeptId(formDto); - } - - @Override - public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { - return analysisUserFeignClient.listYoungMemberRankByDeptId(formDto); - } - @Override - public Result> userRegisterSort(UserSortRankFormDTO formDto){ - return analysisUserFeignClient.userRegisterSort(formDto); - } - - - - @Override - public Result getGridStatistics(UserCountDTO formDto) { - return analysisUserFeignClient.getGridStatistics(formDto); - } - - @Override - public Result getUserStatistics(UserCountDTO formDto) { - return analysisUserFeignClient.getUserStatistics(formDto); - } - - - /** - * - * 解析微信code获取小程序用户信息 - * - * @params [wxCode] - * @return cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult - * @author liuchuang - * @since 2020/2/12 13:20 - */ - private WxMaJscode2SessionResult getWxMaUser(String wxCode) { - WxMaJscode2SessionResult wxMaJscode2SessionResult = null; - try { - wxMaJscode2SessionResult = wxMaServiceUtils.analysisWxMaService().jsCode2SessionInfo(wxCode); - } catch (WxErrorException e) { - e.printStackTrace(); - } - if (null == wxMaJscode2SessionResult) { - throw new RenException("解析微信用户信息失败"); - } else if (StringUtils.isBlank(wxMaJscode2SessionResult.getOpenid())) { - throw new RenException("获取微信openid失败"); - } - return wxMaJscode2SessionResult; - } -}