删除过时的analysis代码，打包备份

epdc-cloud-api/pom.xml

@@ -56,11 +56,6 @@
             <version>${epdc-cloud-client.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-cloud-analysis-client</artifactId>
-            <version>${epdc-cloud-client.version}</version>
-        </dependency>
         <!-- client end -->
 
         <!-- commons start -->
@@ -103,8 +98,7 @@
         <dependency>
             <groupId>com.esua.epdc.yushan</groupId>
             <artifactId>epdc-cloud-property-client</artifactId>
-            <version>1.0.0</version>
+            <version>${epdc-cloud-commons.version}</version>
-            <scope>compile</scope>
         </dependency>
         <!-- commons end -->
     </dependencies>

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java

@@ -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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    @GetMapping("getStatisticsByCategory")
-    public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
-        return analysisIssueService.listStatisticsByCategory(formDto);
-    }
-
-    /**
-     * @Description: 最新发布议题接口
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
-     * @Author: wgf
-     * @Date: 2020-02-11
-     */
-    @GetMapping("getNewIssueList")
-    public Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto) {
-        return analysisIssueService.getNewIssueList(formDto);
-    }
-
-    /**
-     * @Description: 最热议题接口
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
-     * @Author: wgf
-     * @Date: 2020-02-11
-     */
-    @GetMapping("getHotIssueList")
-    public Result<List<HotIssueResultDTO>> getHotIssueList(HotIssueFormDTO formDto) {
-        return analysisIssueService.getHotIssueList(formDto);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java

@@ -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<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    @GetMapping("getItemSurvey")
-    public Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto) {
-        return analysisItemService.getItemSurvey(formDto);
-    }
-
-    /** 
-     * @Description: 疑难项目分析 
-     * @Param: [formDto] 
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>> 
-     * @Author: zy 
-     * @Date: 2020-02-11 
-     */
-    @GetMapping("getItemAnalysis")
-    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto) {
-        Result<List<ItemAnalysisResultDTO>> list = analysisItemService.getItemAnalysis(formDto);
-        return list;
-    }
-    
-    /** 
-     * @Description: 最热项目接口 :最热讨论分析
-     * @Param: [formDto] 
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>> 
-     * @Author: zy 
-     * @Date: 2020-02-12 
-     */ 
-    @GetMapping("getHotItemList")
-    public Result<List<HotItemListResultDTO>> getHotItemList(HotItemListFormDTO formDto) {
-        Result<List<HotItemListResultDTO>> list = analysisItemService.listHotItemList(formDto);
-        return list;
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java

@@ -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);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java

@@ -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<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-     * @author liuchuang
-     * @since 2020/2/12 10:57
-     */
-    @PostMapping("login")
-    public Result<WorkUserAuthorizationDTO> login(@RequestBody WorkUserLoginDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return analysisUserService.login(formDto);
-    }
-
-    /**
-     *
-     * 数据分析端-获取token
-     *
-     * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-     * @author liuchuang
-     * @since 2020/2/12 10:58
-     */
-    @GetMapping("getToken")
-    public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return analysisUserService.getMaToken(formDto);
-    }
-
-    @GetMapping("/partyMemberOldSort")
-    public Result<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId(MemberRankFormDTO formDto) {
-        return analysisUserService.listOldMemberRankByDeptId(formDto);
-    }
-    @GetMapping("/partyMemberYoungSort")
-    public Result<List<YoungMemberRankResultDTO>> 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<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto) {
-        return analysisUserService.userRegisterSort(formDto);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java

@@ -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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
-     * @Author: zy 
-     * @Date: 2020-02-11 
-     */ 
-    @GetMapping(value = "analysis/appissue/getStatisticsByCategory")
-    Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
-
-    /**
-     * 最新发布议题接口
-     * @param formDto
-     * @return
-     */
-    @GetMapping(value = "analysis/appissue/getNewIssueList")
-    Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto);
-
-    /**
-     * 最热议题接口
-     * @param formDto
-     * @return
-     */
-    @GetMapping(value = "analysis/appissue/getHotIssueList")
-    Result<List<HotIssueResultDTO>> getHotIssueList(HotIssueFormDTO formDto);
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java

@@ -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<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    @GetMapping(value = "analysis/appitem/getItemSurvey")
-    Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto);
-
-    /**
-     * @Description: 疑难项目分析
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    @GetMapping(value = "analysis/appitem/getItemAnalysis")
-    Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto);
-
-    /**
-     * @Description: 最热项目接口 :最热讨论分析
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-12
-     */
-    @GetMapping(value = "analysis/appitem/getHotItemList")
-    Result<List<HotItemListResultDTO>> getHotItemList(HotItemListFormDTO formDto);
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java

@@ -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);
-
-
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java

@@ -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<java.util.List<com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
-     **/
-    @GetMapping(value = "analysis/user/partyMemberOldSort", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId(MemberRankFormDTO formDto);
-    /**
-     * @Description   党员年轻化化排名列表
-     * @Author songyunpeng
-     * @Date  2020/2/11
-     * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
-     **/
-    @GetMapping(value = "analysis/user/partyMemberYoungSort", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<YoungMemberRankResultDTO>> listYoungMemberRankByDeptId(MemberRankFormDTO formDto);
-    /**
-     * @Description  注册用户数排名
-     * @Author lpf
-     * @Date  2020/2/11
-     * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
-     **/
-    @GetMapping(value = "analysis/user/userRegisterSort", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<UserSortRankResultDTO>> 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);
-
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java

@@ -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<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getStatisticsByCategory", formDto);
-    }
-
-    @Override
-    public Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewIssueList", formDto);
-    }
-
-    @Override
-    public Result<List<HotIssueResultDTO>> getHotIssueList(HotIssueFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotIssueList", formDto);
-    }
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java

@@ -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<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemSurvey", formDto);
-    }
-
-    @Override
-    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemAnalysis", formDto);
-    }
-
-    @Override
-    public Result<List<HotItemListResultDTO>> getHotItemList(HotItemListFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotItemList", formDto);
-    }
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java

@@ -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");
-    }
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java

@@ -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<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId(MemberRankFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listOldMemberRankByDeptId",formDto);
-    }
-
-    @Override
-    public Result<List<YoungMemberRankResultDTO>> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listYoungMemberRankByDeptId",formDto);
-    }
-    @Override
-    public Result<List<UserSortRankResultDTO>> 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);
-    }
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java

@@ -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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    Result<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
-
-    /**
-     * 最新发布议题接口
-     * @param formDto
-     * @return
-     */
-    Result<List<NewIssueResultDTO>>  getNewIssueList(NewIssueFormDTO formDto);
-
-    /**
-     * 最热议题接口
-     * @param formDto
-     * @return
-     */
-    Result<List<HotIssueResultDTO>>  getHotIssueList(HotIssueFormDTO formDto);
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java

@@ -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<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
-     * @Author: zy 
-     * @Date: 2020-02-11 
-     */ 
-    Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDTO);
-
-    /**
-     * @Description: 疑难项目分析
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-11
-     */
-    Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto);
-
-    /**
-     * @Description: 最热项目接口 :最热讨论分析
-     * @Param: [formDto]
-     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>>
-     * @Author: zy
-     * @Date: 2020-02-12
-     */
-    Result<List<HotItemListResultDTO>> listHotItemList(HotItemListFormDTO formDto);
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java

@@ -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);
-
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java

@@ -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<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-     * @author liuchuang
-     * @since 2020/2/12 10:59
-     */
-    Result<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto);
-
-    /**
-     *
-     * 数据分析端-获取token
-     *
-     * @params [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-     * @author liuchuang
-     * @since 2020/2/12 11:00
-     */
-    Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto);
-
-    /**
-     * @Description  获取党员老龄化排名列表
-     * @Author songyunpeng
-     * @Date  2020/2/11
-     * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
-     **/
-    Result<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId(MemberRankFormDTO formDto);
-    /**
-     * @Description  获取党员年轻化排名列表
-     * @Author songyunpeng
-     * @Date  2020/2/11
-     * @Param [formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO>>
-     **/
-    Result<List<YoungMemberRankResultDTO>> 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<java.util.List<com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
-     **/
-    Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto);
-
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java

@@ -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<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
-        return analysisIssueFeignClient.getStatisticsByCategory(formDto);
-    }
-
-    @Override
-    public Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto) {
-        return analysisIssueFeignClient.getNewIssueList(formDto);
-    }
-
-    @Override
-    public Result<List<HotIssueResultDTO>> getHotIssueList(HotIssueFormDTO formDto) {
-        return analysisIssueFeignClient.getHotIssueList(formDto);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java

@@ -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<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDTO) {
-        return analysisItemFeignClient.getItemSurvey(formDTO);
-    }
-
-    @Override
-    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto) {
-        return analysisItemFeignClient.getItemAnalysis(formDto);
-    }
-
-    @Override
-    public Result<List<HotItemListResultDTO>> listHotItemList(HotItemListFormDTO formDto) {
-        return analysisItemFeignClient.getHotItemList(formDto);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java

@@ -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);
-    }
-}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java

@@ -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<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto) {
-        // 获取openId
-        String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid();
-        formDto.setOpenId(openId);
-        return resourceFeignClient.workLogin(formDto);
-    }
-
-    @Override
-    public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
-        // 获取openId
-        String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid();
-
-        // 检查当前微信是否已绑定账户
-        Result<SysUserDTO> sysUserDtoResult = adminFeignClient.getSysUserInfoByOpenId(openId);
-        if (!sysUserDtoResult.success()) {
-            return new Result<WorkUserAuthorizationDTO>().error(sysUserDtoResult.getMsg());
-        }
-        SysUserDTO userDto = sysUserDtoResult.getData();
-        if (null == userDto) {
-            WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO();
-            resultDto.setRegisterState(NumConstant.ZERO_STR);
-            return new Result<WorkUserAuthorizationDTO>().ok(resultDto);
-        }
-
-        return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class));
-    }
-
-    @Override
-    public Result<List<OldMemberRankResultDTO>> listOldMemberRankByDeptId( MemberRankFormDTO formDto) {
-        return analysisUserFeignClient.listOldMemberRankByDeptId(formDto);
-    }
-
-    @Override
-    public Result<List<YoungMemberRankResultDTO>> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) {
-        return analysisUserFeignClient.listYoungMemberRankByDeptId(formDto);
-    }
-    @Override
-    public Result<List<UserSortRankResultDTO>> 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;
-    }
-}