Browse Source

修改dto包结构

feature/zhy_updatepush
YUJT 5 years ago
parent
commit
165ea567fb
  1. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java
  2. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java
  3. 9
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java
  4. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java
  5. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java
  6. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java
  7. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java
  8. 18
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java
  9. 10
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java
  10. 24
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java
  11. 20
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java
  12. 14
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
  13. 18
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java
  14. 16
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java
  15. 24
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
  16. 24
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
  17. 18
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
  18. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBasicDataController.java
  19. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java
  20. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java
  21. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java
  22. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java
  23. 30
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java
  24. 38
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBasicDataDao.java
  25. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java
  26. 18
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenIndexDataDao.java
  27. 16
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java
  28. 10
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java
  29. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java
  30. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java
  31. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java
  32. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBasicDataServiceImpl.java
  33. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java
  34. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenIndexDataServiceImpl.java
  35. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java
  36. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
  37. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java
  38. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicAnalysisController.java
  39. 14
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java
  40. 10
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java
  41. 14
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
  42. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java
  43. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java
  44. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java
  45. 30
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
  46. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java
  47. 60
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
  48. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java
  49. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java
  50. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java
  51. 2
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
  52. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java
  53. 26
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
  54. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java
  55. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java
  56. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java
  57. 4
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
  58. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java
  59. 12
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
  60. 6
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java
  61. 8
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java

@ -2,11 +2,7 @@ package com.elink.esua.epdc.modules.admin.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.admin.*;
import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
import com.elink.esua.epdc.modules.admin.service.AdminAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,7 +37,7 @@ public class AdminAnalysisController {
* 新增区域编码
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeResultDTO>
* @author Liuchuang
* @since 2021/5/11 15:43
*/

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java

@ -1,11 +1,7 @@
package com.elink.esua.epdc.modules.admin.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.admin.*;
import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
/**
@ -27,7 +23,7 @@ public interface AdminAnalysisService {
* 新增区域编码
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeResultDTO>
* @author Liuchuang
* @since 2021/5/11 15:45
*/

9
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java

@ -6,14 +6,9 @@ import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
import com.elink.esua.epdc.dto.admin.DeptCodeTree;
import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.admin.*;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.modules.admin.service.AdminAnalysisService;
import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao;
import com.elink.esua.epdc.properties.EpmetProperties;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.category;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
import com.elink.esua.epdc.modules.category.service.CategoryAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java

@ -18,8 +18,8 @@
package com.elink.esua.epdc.modules.category.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.category.CategoryCodeUpload;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.category.CategoryCodeUpload;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -37,7 +37,7 @@ public interface CategoryAnalysisDao extends BaseDao<IssueResultDTO> {
* @Author songyunpeng
* @Date 2021/3/23
* @Param []
* @return java.util.List<com.elink.esua.epdc.dto.category.CategoryCodeUpload>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.category.CategoryCodeUpload>
**/
List<CategoryCodeUpload> selectCategoryCode();
}

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java

@ -2,7 +2,7 @@ package com.elink.esua.epdc.modules.category.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
/**
* @Description 相关

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java

@ -8,10 +8,10 @@ import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.category.CategoryCodeTree;
import com.elink.esua.epdc.dto.category.CategoryCodeUpload;
import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.category.CategoryCodeTree;
import com.elink.esua.epdc.dto.analysis.pc.category.CategoryCodeUpload;
import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO;
import com.elink.esua.epdc.modules.category.dao.CategoryAnalysisDao;
import com.elink.esua.epdc.modules.category.service.CategoryAnalysisService;
import com.elink.esua.epdc.utils.EpmetUtils;

18
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java

@ -3,12 +3,12 @@ package com.elink.esua.epdc.modules.issue.controller;
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.dto.analysis.pc.issue.form.HotIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.HotIssueResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -32,7 +32,7 @@ public class AppIssueAnalysisController {
/**
* @Description: 议题项目数量类目分析
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: zy
* @Date: 2020-02-11
*/
@ -48,7 +48,7 @@ public class AppIssueAnalysisController {
/**
* @Description: 最新发布议题接口
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: wgf
* @Date: 2020-02-11
*/
@ -63,7 +63,7 @@ public class AppIssueAnalysisController {
/**
* @Description: 最热议题接口
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: wgf
* @Date: 2020-02-12
*/

10
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java

@ -2,8 +2,8 @@ package com.elink.esua.epdc.modules.issue.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -26,7 +26,7 @@ public class IssueAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:15
@ -39,7 +39,7 @@ public class IssueAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:15
@ -52,7 +52,7 @@ public class IssueAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 分类统计
* @Date 2020/2/11 9:40

24
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java

@ -18,10 +18,10 @@
package com.elink.esua.epdc.modules.issue.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.HotIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -37,7 +37,7 @@ import java.util.Map;
public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:19
@ -46,7 +46,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:19
@ -55,7 +55,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 一级类目
* @Date 2020/2/11 10:09
@ -64,7 +64,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 二级类目
* @Date 2020/2/11 10:09
@ -73,7 +73,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 三级类目
* @Date 2020/2/11 10:09
@ -83,7 +83,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @Description: 一级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -92,7 +92,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @Description: 二级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -101,7 +101,7 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
/**
* @Description: 三级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/

20
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java

@ -1,10 +1,10 @@
package com.elink.esua.epdc.modules.issue.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.HotIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.*;
import java.util.List;
import java.util.Map;
@ -17,7 +17,7 @@ import java.util.Map;
public interface IssueAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:16
@ -26,7 +26,7 @@ public interface IssueAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:16
@ -35,7 +35,7 @@ public interface IssueAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 分类统计
* @Date 2020/2/11 9:41
@ -45,7 +45,7 @@ public interface IssueAnalysisService {
/**
* @Description: 议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -54,7 +54,7 @@ public interface IssueAnalysisService {
/**
* @Description: 最新发布议题接口
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: wgf
* @Date: 2020-02-11
*/
@ -63,7 +63,7 @@ public interface IssueAnalysisService {
/**
* @Description: 最热议题接口
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueStatisticsInfoResultDTO>
* @Author: wgf
* @Date: 2020-02-12
*/

14
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java

@ -8,10 +8,10 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.HotIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.issue.result.*;
import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.apache.commons.lang3.StringUtils;
@ -31,7 +31,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:17
@ -51,7 +51,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:17
@ -71,7 +71,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
/**
* @param params
* @return com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO
* @return com.elink.esua.epdc.dto.analysis.pc.issue.result.IssueClassifiedStatisticDTO
* @Author yinzuomei
* @Description 分类统计
* @Date 2020/2/11 9:41

18
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java

@ -3,12 +3,12 @@ package com.elink.esua.epdc.modules.item.controller;
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.dto.analysis.pc.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.HotItemListResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemAnalysisResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemSurveyResultDTO;
import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -34,7 +34,7 @@ public class AppItemAnalysisController {
/**
* @Description: 疑难项目分析
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemAnalysisResultDTO>>
* @Author: zy
* @Date: 2020-02-11
*/
@ -50,7 +50,7 @@ public class AppItemAnalysisController {
/**
* @Description: 重点项目概况
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemSurveyResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -66,7 +66,7 @@ public class AppItemAnalysisController {
/**
* @Description: 最热项目接口 :最热讨论分析
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.HotItemListResultDTO>>
* @Author: zy
* @Date: 2020-02-12
*/

16
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java

@ -19,7 +19,7 @@ package com.elink.esua.epdc.modules.item.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.analysis.pc.item.result.*;
import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -45,7 +45,7 @@ public class ItemAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO
* @Author yinzuomei
* @Description 最热项目列表查询
* @Date 2020/2/10 13:45
@ -58,7 +58,7 @@ public class ItemAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.UnsolvedItemResultDTO
* @Author yinzuomei
* @Description 未解决项目列表查询
* @Date 2020/2/10 19:08
@ -71,7 +71,7 @@ public class ItemAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.DifficultItemResultDTO
* @Author yinzuomei
* @Description 疑难项目分析
* @Date 2020/2/11 13:12
@ -84,7 +84,7 @@ public class ItemAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.ReportUnsolvedItemResultDTO
* @Author yinzuomei
* @Description 区域调度-解决中项目列表
* @Date 2020/2/11 15:11
@ -97,7 +97,7 @@ public class ItemAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.ReportSolvedItemResultDTO
* @Author yinzuomei
* @Description 区域调度-已解决项目列表
* @Date 2020/2/11 15:11
@ -113,7 +113,7 @@ public class ItemAnalysisController {
* 事件/项目分析按类别统计-网格03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryGridResultDailyDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.category.CategoryGridResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/
@ -126,7 +126,7 @@ public class ItemAnalysisController {
* 事件/项目分析按类别统计-组织03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryOrgResultDailyDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.category.CategoryOrgResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/

24
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java

@ -18,10 +18,10 @@
package com.elink.esua.epdc.modules.item.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -37,7 +37,7 @@ import java.util.Map;
public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO>
* @Author yinzuomei
* @Description 最热项目列表查询
* @Date 2020/2/10 13:53
@ -46,7 +46,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.UnsolvedItemResultDTO>
* @Author yinzuomei
* @Description 未解决项目列表查询
* @Date 2020/2/10 19:16
@ -55,7 +55,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.DifficultItemResultDTO>
* @Author yinzuomei
* @Description 疑难项目分析列表查询
* @Date 2020/2/11 13:14
@ -64,7 +64,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportUnsolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-解决中项目列表
* @Date 2020/2/11 15:14
@ -73,7 +73,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportSolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-已解决项目列表
* @Date 2020/2/11 15:15
@ -83,7 +83,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @Description: 重点项目概况
* @Param: [formDTO]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemSurveyResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -92,7 +92,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @Description: 疑难项目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemAnalysisResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -101,7 +101,7 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
/**
* @Description: 最热项目接口 :最热讨论分析
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.HotItemListResultDTO>>
* @Author: zy
* @Date: 2020-02-12
*/

24
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java

@ -2,10 +2,10 @@ package com.elink.esua.epdc.modules.item.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.*;
import java.util.List;
import java.util.Map;
@ -20,7 +20,7 @@ public interface ItemAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO
* @Author yinzuomei
* @Description 最热项目列表查询
* @Date 2020/2/10 13:46
@ -29,7 +29,7 @@ public interface ItemAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.UnsolvedItemResultDTO
* @Author yinzuomei
* @Description 未解决项目列表查询
* @Date 2020/2/10 19:11
@ -38,7 +38,7 @@ public interface ItemAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.DifficultItemResultDTO
* @Author yinzuomei
* @Description 疑难项目分析
* @Date 2020/2/11 13:13
@ -47,7 +47,7 @@ public interface ItemAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportUnsolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-解决中项目列表
* @Date 2020/2/11 15:13
@ -56,7 +56,7 @@ public interface ItemAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportSolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-已解决项目列表
* @Date 2020/2/11 15:13
@ -66,7 +66,7 @@ public interface ItemAnalysisService {
/**
* @Description: 重点项目概况
* @Param: [formDTO]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemSurveyResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -75,7 +75,7 @@ public interface ItemAnalysisService {
/**
* @Description: 疑难项目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>
* @return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.item.result.ItemAnalysisResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@ -84,7 +84,7 @@ public interface ItemAnalysisService {
/**
* @Description: 最热项目接口 :最热讨论分析
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.HotItemListResultDTO>>
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.item.result.HotItemListResultDTO>>
* @Author: zy
* @Date: 2020-02-12
*/

18
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java

@ -11,10 +11,10 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.*;
import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao;
import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
import com.elink.esua.epdc.utils.EpmetUtils;
@ -45,7 +45,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO
* @Author yinzuomei
* @Description 最热项目列表查询
* @Date 2020/2/10 13:47
@ -65,7 +65,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.UnsolvedItemResultDTO
* @Author yinzuomei
* @Description 未解决项目列表查询
* @Date 2020/2/10 19:13
@ -85,7 +85,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.item.result.DifficultItemResultDTO
* @Author yinzuomei
* @Description 疑难项目分析
* @Date 2020/2/11 13:13
@ -105,7 +105,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportUnsolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-解决中项目列表
* @Date 2020/2/11 15:13
@ -125,7 +125,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.item.result.ReportSolvedItemResultDTO>
* @Author yinzuomei
* @Description 区域调度-已解决项目列表
* @Date 2020/2/11 15:13

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBasicDataController.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenBasicDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenIndexDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java

@ -1,8 +1,8 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -65,7 +65,7 @@ public class ScreenPublicDataController {
* @author wk
* @date 2020/8/19 17:25
* @params []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.CpcbasedataDTO>
*/
@PostMapping("cpcbasedata")
public Result cpcbasedata() {

30
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -19,7 +19,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* status固定hot_discuss
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGridHotTopicResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridHotTopicResultDTO>
* @author zhy
* @date 2021/6/28 14:06
*/
@ -30,7 +30,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* status固定hot_discuss
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenAgencyHotTopicResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyHotTopicResultDTO>
* @author zhy
* @date 2021/6/28 14:06
*/
@ -44,7 +44,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* 关联item表会导致查询速度严重变慢如果议题数多需要把shiftProjectIncr当日已转项目的议题数放到业务中处理
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGridIssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridIssueResultDTO>
* @author zhy
* @date 2021/6/28 14:06
*/
@ -58,7 +58,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* 关联item表会导致查询速度严重变慢如果议题数多需要把shiftProjectIncr当日已转项目的议题数放到业务中处理
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenAgencyIssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyIssueResultDTO>
* @author zhy
* @date 2021/6/28 14:06
*/
@ -72,7 +72,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间榆山统计方式
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGridRegUserResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridRegUserResultDTO>
* @author zhy
* @date 2021/6/28 14:06
*/
@ -86,14 +86,14 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
* 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间榆山统计方式
*
* @param
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenAgencyRegUserResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyRegUserResultDTO>
* @author zhy
* @date 2021/6/28 14:07
*/
List<ScreenAgencyRegUserResultDTO> agencyRegUser();
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridTopicStatusResultDTO>
* @Description 网格状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
@ -102,7 +102,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<GridTopicStatusResultDTO> selectGridTopicStatusList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridTopicStatusResultDTO>
* @Description 社区状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
@ -111,7 +111,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<CommunityTopicStatusResultDTO> selectCommunityTopicStatusList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridTopicIssueResultDTO>
* @Description 网格话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
@ -121,7 +121,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridTopicIssueResultDTO>
* @Description 社区话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
@ -130,7 +130,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<CommunityTopicIssueResultDTO> selectCommunityTopicIssueList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGridProjectResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridGridProjectResultDTO>
* @Description 网格项目数据
* @Author songyunpeng
* @Date 2021/6/25
@ -139,7 +139,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<GridGridProjectResultDTO> selectGridProjectList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityProjectResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.CommunityProjectResultDTO>
* @Description 组织项目数据
* @Author songyunpeng
* @Date 2021/6/25
@ -148,7 +148,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<CommunityProjectResultDTO> selectCommunityProjectList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGroupTotalResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridGroupTotalResultDTO>
* @Description 网格群组总数
* @Author songyunpeng
* @Date 2021/6/25
@ -157,7 +157,7 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
List<GridGroupTotalResultDTO> selectGridGroupTotalList(@Param("customId") String customId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.CommunityGroupTotalResultDTO>
* @Description 组织群组总数
* @Author songyunpeng
* @Date 2021/6/25

38
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBasicDataDao.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -17,7 +17,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 1首页-平台各类总数上报
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.HomePagePlatformSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.HomePagePlatformSummaryDTO>
* @author Liuchuang
* @since 2020/9/10 14:58
*/
@ -26,7 +26,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 2议题分析-各类总数
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenIssueSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenIssueSummaryDTO>
* @author Liuchuang
* @since 2020/9/11 14:01
*/
@ -36,7 +36,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 3议题分析-参与趋势
*
* @param yearMonth 统计月份
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenIssueTrendDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenIssueTrendDTO>
* @author Liuchuang
* @since 2020/9/11 14:38
*/
@ -45,7 +45,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 4用户分析-各类总数
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenUserSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenUserSummaryDTO>
* @author Liuchuang
* @since 2020/9/11 15:40
*/
@ -55,7 +55,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 5公益互助-志愿者公益时长排名
*
* @param pageSize 获取志愿者排行数量
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenVolunteerHeartRank>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenVolunteerHeartRank>
* @author Liuchuang
* @since 2020/9/11 16:21
*/
@ -65,7 +65,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 6用户分析-用户趋势
*
* @param yearMonth 统计月份
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenUserUserHeartRankDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenUserUserHeartRankDTO>
* @author Liuchuang
* @since 2020/9/11 17:57
*/
@ -74,7 +74,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 7公益互助-活动各类总数
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenActSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenActSummaryDTO>
* @author Liuchuang
* @since 2020/9/12 10:02
*/
@ -93,7 +93,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 9公益互助-志愿者画像
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenActVolunteerSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenActVolunteerSummaryDTO>
* @author Liuchuang
* @since 2020/9/12 11:04
*/
@ -102,7 +102,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 10项目分析-各类总数
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenProjectSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenProjectSummaryDTO>
* @author Liuchuang
* @since 2020/9/12 14:49
*/
@ -111,7 +111,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 11项目分析-按分类统计
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenProjectCategorySummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenProjectCategorySummaryDTO>
* @author Liuchuang
* @since 2020/9/12 15:42
*/
@ -121,7 +121,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 12项目分析-满意度分析
*
* @param yearMonth 统计月份
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenProjectStatisticAnalysisDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenProjectStatisticAnalysisDTO>
* @author Liuchuang
* @since 2020/9/14 10:01
*/
@ -130,7 +130,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 13党建声音-新闻各类总数汇总
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenNewsSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenNewsSummaryDTO>
* @author Liuchuang
* @since 2020/9/14 10:16
*/
@ -150,7 +150,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 15党建声音-热度新闻排行
*
* @param pageSize 统计数量
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenNewsHotRankDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenNewsHotRankDTO>
* @author Liuchuang
* @since 2020/9/14 11:08
*/
@ -159,7 +159,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 16党建声音-新闻按类别统计
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenNewsCategoryAnalysisDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenNewsCategoryAnalysisDTO>
* @author Liuchuang
* @since 2020/9/14 13:25
*/
@ -168,7 +168,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 17邻里党群-各类总数汇总
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGroupSummaryDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGroupSummaryDTO>
* @author Liuchuang
* @since 2020/9/14 14:10
*/
@ -177,7 +177,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
/**
* 18邻里党群-小组详情
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGroupDetailDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGroupDetailDTO>
* @author Liuchuang
* @since 2020/9/14 14:43
*/
@ -187,7 +187,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 19邻里党群-话题参与趋势
*
* @param yearMonth 统计月份
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenGroupTopicTrendDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGroupTopicTrendDTO>
* @author Liuchuang
* @since 2020/9/14 14:56
*/
@ -197,7 +197,7 @@ public interface ScreenBasicDataDao extends BaseDao<ScreenBasicDataResultDTO> {
* 09党建引领|基层治理-居民党员积分排行榜
*
* @param pageSize 统计数量
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenPartyUserRankDataDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenPartyUserRankDataDTO>
* @author Liuchuang
* @since 2020/9/14 17:13
*/

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java

@ -1,9 +1,9 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO;
import com.elink.esua.epdc.dto.screen.result.GridManagerUploadEventResultDTO;
import com.elink.esua.epdc.dto.screen.result.ScreenBaseReportResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

18
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenIndexDataDao.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -18,7 +18,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 01党建能力-党员相关指标上报
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridPartyMemberDataDetailDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridPartyMemberDataDetailDTO>
* @Author zhangyong
* @Date 16:15 2020-09-14
**/
@ -28,7 +28,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 02党建能力-网格相关指标上报
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridPartyAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridPartyAbilityDTO>
* @Author zhangyong
* @Date 15:08 2020-09-14
*/
@ -38,7 +38,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 03党建能力-区街道及社区相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.OrgPartyAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.OrgPartyAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/
@ -48,7 +48,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 04服务能力-网格相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridServiceAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridServiceAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/
@ -58,7 +58,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 05服务能力-组织街道|社区|全区相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.OrgServiceAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.OrgServiceAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/
@ -68,7 +68,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 06治理能力-网格相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGovrnAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.GridGovrnAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/
@ -78,7 +78,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 07治理能力-街道及社区相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.OrgGovrnAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.OrgGovrnAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/
@ -88,7 +88,7 @@ public interface ScreenIndexDataDao extends BaseDao<ScreenIndexDataResultDTO> {
* 08治理能力-部门相关指标
*
* @param yearMonth
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.DeptGovrnAbilityDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.DeptGovrnAbilityDTO>
* @Author zhangyong
* @Date 09:14 2020-09-15
**/

16
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java

@ -1,8 +1,8 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -20,7 +20,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @Author songyunpeng
* @Date 2021/2/23
* @Param []
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.UploadProjectInfoDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.UploadProjectInfoDTO>
*
* @param screenProjectFormDTO*/
List<UploadProjectInfoDTO> uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO);
@ -29,7 +29,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @Author songyunpeng
* @Date 2021/2/23
* @Param []
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.UploadProjectProcessDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.UploadProjectProcessDTO>
**/
List<UploadProjectProcessDTO> uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO);
/**
@ -37,7 +37,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @author wangtong
* @date 2021/2/23 14:55
* @params []
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ProjectGridDailyDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ProjectGridDailyDTO>
*/
List<ProjectGridDailyDTO> selectProjectGridDaily(@Param("yesterDayDate") String yesterDayDate);
@ -46,7 +46,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @author wangtong
* @date 2021/2/24 9:30
* @params [yesterDayDate]
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ProjectOrgDailyDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ProjectOrgDailyDTO>
*/
List<ProjectOrgDailyDTO> selectProjectOrgDaily(@Param("yesterDayDate") String yesterDayDate);
@ -55,7 +55,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @author wangtong
* @date 2021/2/24 10:43
* @params [lastMonth]
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.QuantityGridMonthly>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.QuantityGridMonthly>
*/
List<QuantityGridMonthly> selectQuantityGridMonthly(@Param("yearMonth") String yearMonth);
@ -64,7 +64,7 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataResultDTO
* @author wangtong
* @date 2021/2/24 10:58
* @params [lastMonth]
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.QuantityOrgMonthlyDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.QuantityOrgMonthlyDTO>
*/
List<QuantityOrgMonthlyDTO> selectQuantityOrgMonthly(@Param("yearMonth") String yearMonth);
}

10
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -17,7 +17,7 @@ public interface ScreenPublicDataDao extends BaseDao<ScreenPublicDataResultDTO>
/**
* 014组织层级
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenCustomerAgencyDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenCustomerAgencyDTO>
* @author Liuchuang
* @since 2020/9/17 14:24
*/
@ -26,7 +26,7 @@ public interface ScreenPublicDataDao extends BaseDao<ScreenPublicDataResultDTO>
/**
* 015网格信息上传
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenCustomerGridDTO>
* @author Liuchuang
* @since 2020/9/17 14:24
*/
@ -35,7 +35,7 @@ public interface ScreenPublicDataDao extends BaseDao<ScreenPublicDataResultDTO>
/**
* 016部门信息上传
*
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.ScreenCustomerDeptDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenCustomerDeptDTO>
* @author Liuchuang
* @since 2020/9/17 14:23
*/
@ -55,7 +55,7 @@ public interface ScreenPublicDataDao extends BaseDao<ScreenPublicDataResultDTO>
* @author wk
* @date 2020/8/19 17:25
* @params []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.CpcbasedataDTO>
*/
List<CpcbasedataResultDTO> cpcbasedata();
/**

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java

@ -1,7 +1,7 @@
package com.elink.esua.epdc.modules.screen.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
/**
* 大屏项目信息上报

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java

@ -38,7 +38,7 @@ public interface ScreenPublicDataService {
Result customerDept();
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.CpcbasedataDTO>
* @describe: 001基层党建-党员基本情况
* @author wk
* @date 2020/8/19 17:25

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDao;
import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportService;
import com.elink.esua.epdc.utils.EpmetUtils;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBasicDataServiceImpl.java

@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenBasicDataDao;
import com.elink.esua.epdc.modules.screen.service.ScreenBasicDataService;
import com.elink.esua.epdc.utils.EpmetUtils;

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java

@ -4,9 +4,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO;
import com.elink.esua.epdc.dto.screen.result.GridManagerUploadEventResultDTO;
import com.elink.esua.epdc.dto.screen.result.ScreenBaseReportResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO;
import com.elink.esua.epdc.modules.screen.dao.ScreenGridManagerDao;
import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService;
import com.elink.esua.epdc.utils.EpmetUtils;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenIndexDataServiceImpl.java

@ -6,7 +6,7 @@ import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenIndexDataDao;
import com.elink.esua.epdc.modules.screen.service.ScreenIndexDataService;
import com.elink.esua.epdc.utils.EpmetUtils;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java

@ -5,8 +5,8 @@ import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenProjectDataDao;
import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService;
import com.elink.esua.epdc.utils.EpmetUtils;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java

@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenPublicDataDao;
import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService;
import com.elink.esua.epdc.utils.EpmetUtils;
@ -65,7 +65,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
* @author wk
* @date 2020/8/19 17:25
* @params []
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.CpcbasedataDTO>
*/
@Override
public Result cpcbasedata() {

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java

@ -19,8 +19,8 @@ package com.elink.esua.epdc.modules.topic.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -44,7 +44,7 @@ public class AppTopicAnalysisController {
/**
* @param hotTopicFormDTO
* @return com.elink.esua.epdc.dto.result.TopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO
* @Author wanggongfeng
* @Description 最热话题接口
* @Date 2020/2/11 11:12
@ -59,7 +59,7 @@ public class AppTopicAnalysisController {
/**
* @param newHotTopicFormDTO
* @return com.elink.esua.epdc.dto.result.TopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO
* @Author wanggongfeng
* @Description 最新发布话题接口
* @Date 2020/2/11 11:12

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicAnalysisController.java

@ -19,7 +19,7 @@ package com.elink.esua.epdc.modules.topic.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.TopicResultDTO;
import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -45,7 +45,7 @@ public class TopicAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.result.TopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO
* @Author yinzuomei
* @Description 最热话题列表查询
* @Date 2020/2/10 11:34
@ -58,7 +58,7 @@ public class TopicAnalysisController {
/**
* @param params
* @return com.elink.esua.epdc.dto.result.TopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO
* @Author yinzuomei
* @Description 最新话题列表查询
* @Date 2020/2/10 12:50

14
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java

@ -18,11 +18,11 @@
package com.elink.esua.epdc.modules.topic.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO;
import com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.HotTopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.NewHotTopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.TopicResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -39,7 +39,7 @@ public interface TopicAnalysisDao extends BaseMapper<TopicResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.result.TopicResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO>
* @Author yinzuomei
* @Description 最热话题列表查询
* @Date 2020/2/10 11:52
@ -48,7 +48,7 @@ public interface TopicAnalysisDao extends BaseMapper<TopicResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.result.TopicResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO>
* @Author yinzuomei
* @Description 最新话题列表查询
* @Date 2020/2/10 12:51

10
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java

@ -19,9 +19,9 @@ package com.elink.esua.epdc.modules.topic.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
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.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.TopicResultDTO;
import java.util.Map;
@ -34,7 +34,7 @@ import java.util.Map;
public interface TopicAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.dto.result.TopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO
* @Author yinzuomei
* @Description 最热话题列表查询
* @Date 2020/2/10 11:34
@ -43,7 +43,7 @@ public interface TopicAnalysisService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.result.TopicResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.result.TopicResultDTO>
* @Author yinzuomei
* @Description 最新话题列表查询
* @Date 2020/2/10 12:50

14
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java

@ -9,11 +9,11 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO;
import com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.HotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.form.NewHotTopicFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.HotTopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.NewHotTopicResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.topic.result.TopicResultDTO;
import com.elink.esua.epdc.modules.topic.dao.TopicAnalysisDao;
import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService;
import org.springframework.stereotype.Service;
@ -31,7 +31,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
/**
* @param params
* @return com.elink.esua.epdc.dto.result.HottestTopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.HottestTopicResultDTO
* @Author yinzuomei
* @Description 最热话题列表查询
* @Date 2020/2/10 12:53
@ -51,7 +51,7 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
/**
* @param params
* @return com.elink.esua.epdc.dto.result.LatestTopicResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.result.LatestTopicResultDTO
* @Author yinzuomei
* @Description 最新话题列表查询
* @Date 2020/2/10 12:53

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserGridOpiningController.java

@ -25,8 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.modules.user.excel.MetaUserGridOpiningExcel;
import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;
import org.springframework.beans.factory.annotation.Autowired;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserPartyRankController.java

@ -25,7 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.modules.user.excel.MetaUserPartyRankExcel;
import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;
import org.springframework.beans.factory.annotation.Autowired;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/MetaUserRegisterRankController.java

@ -25,7 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.modules.user.excel.MetaUserRegisterRankExcel;
import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;
import org.springframework.beans.factory.annotation.Autowired;

30
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java

@ -4,15 +4,15 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
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.result.*;
import com.elink.esua.epdc.dto.user.form.UserCountDTO;
import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.*;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.excel.ExportOperationDataExcel;
import com.elink.esua.epdc.excel.GridOpiningExcel;
import com.elink.esua.epdc.modules.user.service.OldMemberRankService;
@ -53,7 +53,7 @@ public class UserAnalysisController {
* PC端用户数据分析用户注册排行党员排行
*
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>>
* @author work@yujt.net.cn
* @date 2020/2/11 15:17
*/
@ -67,7 +67,7 @@ public class UserAnalysisController {
* 网格开通数据总计pc端网格开通情况数据总计
*
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.user.result.GridDataTotalResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/13 14:22
*/
@ -80,7 +80,7 @@ public class UserAnalysisController {
/***
* 开通网格分页
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>>
* @author qushutong
* @date 2020/2/11 16:01
*/
@ -91,7 +91,7 @@ public class UserAnalysisController {
}
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO>>
* @Description 党员老龄化列表
* @Author songyunpeng
* @Date 2020/2/11
@ -104,7 +104,7 @@ public class UserAnalysisController {
}
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO>>
* @Description 党员年轻化列表
* @Author songyunpeng
* @Date 2020/2/11
@ -117,7 +117,7 @@ public class UserAnalysisController {
}
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.user.result.UserSortRankResultDTO>>
* @Description 注册用户数排名
* @Author lpf
* @Date 2020/2/11

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java

@ -1,8 +1,8 @@
package com.elink.esua.epdc.modules.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -19,7 +19,7 @@ public interface OldMemberRankDao extends BaseMapper<OldMemberRankResultDTO> {
/**
* 移动端党员老龄化排名列表
* @Params: [formDTO]
* @Return: java.util.List<com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO>
* @Return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO>
* @Author: liuchuang
* @Date: 2019/9/9 15:13
*/

60
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java

@ -1,11 +1,11 @@
package com.elink.esua.epdc.modules.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.user.UserAnalysisDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -23,7 +23,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 居民扫码数
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
@ -32,7 +32,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 项目数项目结案数
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
@ -42,7 +42,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 查询用户数据排行
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/11 14:48
*/
@ -52,7 +52,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 根据街道id获取街道下党员认证失败的数量
*
* @param params 主要字段街道id的集合,开始时间结束时间
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/11 17:25
*/
@ -61,7 +61,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 社群数 社群成员数 社群话题数
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
@ -72,7 +72,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
*
* @param formDto
* @param deptIdList
* @return com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO
* @return com.elink.esua.epdc.dto.analysis.pc.user.result.UserAnalysisCountDTO
* @author wangtong
* @date 2020/2/11 14:55
*/
@ -83,14 +83,14 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
*
* @param formDto
* @param deptIdList
* @return com.elink.esua.epdc.dto.user.result.GriddingCountDTO
* @return com.elink.esua.epdc.dto.analysis.pc.user.result.GriddingCountDTO
* @author wangtong
* @date 2020/2/11 14:55
*/
GriddingCountDTO getGridStatistics(UserCountDTO formDto, List<Long> deptIdList);
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.user.result.UserSortRankResultDTO>>
* @Description 注册用户数排名
* @Author lpf
* @Date 2020/2/11
@ -102,7 +102,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 开通网格列表查询字段网格的完整机构名称网格id网格长名称
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/12 13:27
*/
@ -112,7 +112,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 根据网格id查询网格内注册用户数认证党员数认证居民数
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/12 14:06
*/
@ -122,7 +122,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 根据网格id查询网格内新闻数 通知数 议题数
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/13 11:18
*/
@ -132,7 +132,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 查询已开通网格数和未开通网格数
*
* @param params
* @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.user.result.GridDataTotalResultDTO
* @author work@yujt.net.cn
* @date 2020/2/13 13:50
*/
@ -142,7 +142,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 根据街道id查询街道内未认证用户数
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author work@yujt.net.cn
* @date 2020/3/5 14:10
*/
@ -152,7 +152,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 根据网格id查询网格内未认证用户数
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/3/5 14:10
*/
@ -161,7 +161,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出用户相关
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -170,7 +170,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出未认证用户
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -180,7 +180,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出议题
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -189,7 +189,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出项目相关
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -198,7 +198,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出新闻
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -207,7 +207,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出社群数
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -216,7 +216,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出社群成员数
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -225,7 +225,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出社群话题数
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -235,7 +235,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
/***
* 运营数据导出企业数
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -245,7 +245,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 查询党员数据排行
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author wanggongfeng
* @date 2020/5/20 14:48
*/
@ -255,7 +255,7 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* 查询居民数据排行
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author wanggongfeng
* @date 2020/5/20 14:48
*/

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java

@ -1,9 +1,9 @@
package com.elink.esua.epdc.modules.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -20,7 +20,7 @@ public interface YoungMemberRankDao extends BaseMapper<YoungMemberRankResultDTO>
/**
* 移动端党员年轻化化排名列表
* @Params: [formDTO]
* @Return: java.util.List<com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO>
* @Return: java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO>
* @Author: liuchuang
* @Date: 2019/9/9 15:13
*/

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java

@ -20,7 +20,7 @@ package com.elink.esua.epdc.modules.user.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
import java.util.List;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java

@ -20,7 +20,7 @@ package com.elink.esua.epdc.modules.user.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
import java.util.List;

2
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java

@ -20,7 +20,7 @@ package com.elink.esua.epdc.modules.user.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
import java.util.List;

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java

@ -1,9 +1,9 @@
package com.elink.esua.epdc.modules.user.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import java.util.List;

26
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java

@ -2,10 +2,10 @@ package com.elink.esua.epdc.modules.user.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.*;
import java.util.List;
import java.util.Map;
@ -21,7 +21,7 @@ public interface UserAnalysisService {
/***
* 网格开通列表
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:04
*/
@ -31,7 +31,7 @@ public interface UserAnalysisService {
* 网格开通情况用于导出
*
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/13 16:47
*/
@ -41,14 +41,14 @@ public interface UserAnalysisService {
* 用户数据排行PC端用户数据分析居民注册排行党员排行
*
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/11 15:13
*/
PageData<UserDataRankResultDTO> pageUserDataRank(Map<String, Object> params);
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.user.result.UserSortRankResultDTO>>
* @Description 注册用户数排名
* @Author lpf
* @Date 2020/2/11
@ -81,7 +81,7 @@ public interface UserAnalysisService {
* 网格开通数据总计
*
* @param params
* @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO
* @return com.elink.esua.epdc.dto.analysis.pc.user.result.GridDataTotalResultDTO
* @author work@yujt.net.cn
* @date 2020/2/13 14:22
*/
@ -91,7 +91,7 @@ public interface UserAnalysisService {
/***
* 运营数据导出用户相关
* @param exportOperationFormDTO
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/23 15:16
*/
@ -100,7 +100,7 @@ public interface UserAnalysisService {
/***
* 获取所有网格
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/25 17:22
*/
@ -110,7 +110,7 @@ public interface UserAnalysisService {
/***
* 获取导入数据
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/3/25 19:13
*/
@ -119,7 +119,7 @@ public interface UserAnalysisService {
/***
* 获取导入用户排行数据
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO>
* @author qushutong
* @date 2020/3/26 13:32
*/

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java

@ -1,9 +1,9 @@
package com.elink.esua.epdc.modules.user.service;
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.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO;
import java.util.List;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java

@ -29,8 +29,8 @@ import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserGridOpiningDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO;
import com.elink.esua.epdc.modules.user.dao.MetaUserGridOpiningDao;
import com.elink.esua.epdc.modules.user.entity.MetaUserGridOpiningEntity;
import com.elink.esua.epdc.modules.user.service.MetaUserGridOpiningService;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java

@ -28,8 +28,8 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserPartyRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.modules.user.dao.MetaUserPartyRankDao;
import com.elink.esua.epdc.modules.user.entity.MetaUserPartyRankEntity;
import com.elink.esua.epdc.modules.user.service.MetaUserPartyRankService;

4
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java

@ -29,8 +29,8 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.MetaUserRegisterRankDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO;
import com.elink.esua.epdc.modules.user.dao.MetaUserRegisterRankDao;
import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
import com.elink.esua.epdc.modules.user.service.MetaUserRegisterRankService;

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java

@ -4,9 +4,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.modules.user.dao.OldMemberRankDao;
import com.elink.esua.epdc.modules.user.service.OldMemberRankService;
import lombok.extern.slf4j.Slf4j;

12
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@ -12,11 +12,11 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
import com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO;
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.*;
import com.elink.esua.epdc.dto.analysis.pc.user.UserAnalysisDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.*;
import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
import com.google.common.collect.Lists;
@ -64,7 +64,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
*
* @param list 第一次执行查询获取到的列表主要包含机构id和机构名称
* @param params 查询条件
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO>
* @author work@yujt.net.cn
* @date 2020/2/13 16:46
*/

6
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java

@ -4,9 +4,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
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.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO;
import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO;
import com.elink.esua.epdc.modules.user.dao.OldMemberRankDao;
import com.elink.esua.epdc.modules.user.dao.YoungMemberRankDao;
import com.elink.esua.epdc.modules.user.service.OldMemberRankService;

8
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java

@ -2,10 +2,10 @@ package com.elink.esua.epdc.utils;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.dto.screen.result.ScreenCategoryDateDTO;
import com.elink.esua.epdc.dto.screen.result.ScreenDataDTO;
import com.elink.esua.epdc.dto.screen.result.ScreenDataDateDTO;
import com.elink.esua.epdc.dto.screen.result.ScreenDataMonthDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenCategoryDateDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenDataDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenDataDateDTO;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenDataMonthDTO;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;

Loading…
Cancel
Save