From 165ea567fbf176e5b46ae8e85fdebb3b1ebd8231 Mon Sep 17 00:00:00 2001 From: YUJT Date: Thu, 15 Jul 2021 17:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dto=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminAnalysisController.java | 8 +-- .../admin/service/AdminAnalysisService.java | 8 +-- .../impl/AdminAnalysisServiceImpl.java | 9 +-- .../category/CategoryAnalysisController.java | 2 +- .../category/dao/CategoryAnalysisDao.java | 6 +- .../service/CategoryAnalysisService.java | 2 +- .../impl/CategoryAnalysisServiceImpl.java | 8 +-- .../AppIssueAnalysisController.java | 18 +++--- .../controller/IssueAnalysisController.java | 10 ++-- .../modules/issue/dao/IssueAnalysisDao.java | 24 ++++---- .../issue/service/IssueAnalysisService.java | 20 +++---- .../impl/IssueAnalysisServiceImpl.java | 14 ++--- .../controller/AppItemAnalysisController.java | 18 +++--- .../controller/ItemAnalysisController.java | 16 ++--- .../modules/item/dao/ItemAnalysisDao.java | 24 ++++---- .../item/service/ItemAnalysisService.java | 24 ++++---- .../service/impl/ItemAnalysisServiceImpl.java | 18 +++--- .../controller/ScreenBasicDataController.java | 2 +- .../ScreenGridManagerController.java | 2 +- .../controller/ScreenIndexDataController.java | 2 +- .../ScreenProjectDataController.java | 4 +- .../ScreenPublicDataController.java | 4 +- .../screen/dao/ScreenBaseReportDao.java | 30 +++++----- .../screen/dao/ScreenBasicDataDao.java | 38 ++++++------ .../screen/dao/ScreenGridManagerDao.java | 6 +- .../screen/dao/ScreenIndexDataDao.java | 18 +++--- .../screen/dao/ScreenProjectDataDao.java | 16 ++--- .../screen/dao/ScreenPublicDataDao.java | 10 ++-- .../service/ScreenProjectDataService.java | 2 +- .../service/ScreenPublicDataService.java | 2 +- .../impl/ScreenBaseReportServiceImpl.java | 2 +- .../impl/ScreenBasicDataServiceImpl.java | 2 +- .../impl/ScreenGridManagerServiceImpl.java | 6 +- .../impl/ScreenIndexDataServiceImpl.java | 2 +- .../impl/ScreenProjectDataServiceImpl.java | 4 +- .../impl/ScreenPublicDataServiceImpl.java | 4 +- .../AppTopicAnalysisController.java | 8 +-- .../controller/TopicAnalysisController.java | 6 +- .../modules/topic/dao/TopicAnalysisDao.java | 14 ++--- .../topic/service/TopicAnalysisService.java | 10 ++-- .../impl/TopicAnalysisServiceImpl.java | 14 ++--- .../MetaUserGridOpiningController.java | 4 +- .../MetaUserPartyRankController.java | 2 +- .../MetaUserRegisterRankController.java | 2 +- .../controller/UserAnalysisController.java | 30 +++++----- .../modules/user/dao/OldMemberRankDao.java | 6 +- .../modules/user/dao/UserAnalysisDao.java | 60 +++++++++---------- .../modules/user/dao/YoungMemberRankDao.java | 8 +-- .../service/MetaUserGridOpiningService.java | 2 +- .../service/MetaUserPartyRankService.java | 2 +- .../service/MetaUserRegisterRankService.java | 2 +- .../user/service/OldMemberRankService.java | 6 +- .../user/service/UserAnalysisService.java | 26 ++++---- .../user/service/YoungMemberRankService.java | 6 +- .../impl/MetaUserGridOpiningServiceImpl.java | 4 +- .../impl/MetaUserPartyRankServiceImpl.java | 4 +- .../impl/MetaUserRegisterRankServiceImpl.java | 4 +- .../impl/OldMemberRankServiceImpl.java | 6 +- .../service/impl/UserAnalysisServiceImpl.java | 12 ++-- .../impl/YoungMemberRankServiceImpl.java | 6 +- .../esua/epdc/utils/ScreenDataUtils.java | 8 +-- 61 files changed, 312 insertions(+), 325 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java index e6e1e77..412eb15 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author Liuchuang * @since 2021/5/11 15:43 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java index 5ee6093..ace4f78 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author Liuchuang * @since 2021/5/11 15:45 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java index cdf3881..b2ae400 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java index cdd838a..5a6d691 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java index 1bd8490..a6108fb 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java +++ b/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 { * @Author songyunpeng * @Date 2021/3/23 * @Param [] - * @return java.util.List + * @return java.util.List **/ List selectCategoryCode(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java index fdb5acd..47056c0 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java +++ b/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 相关 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java index d2dc821..13d1850 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java index 12d9d7d..3e2791c 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java +++ b/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> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @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> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @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> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2020-02-12 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java index b24a2cc..011673e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java +++ b/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 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java index f111278..9b01efe 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java +++ b/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 { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 最热议题列表 * @Date 2020/2/10 16:19 @@ -46,7 +46,7 @@ public interface IssueAnalysisDao extends BaseDao { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 最新议题列表 * @Date 2020/2/10 16:19 @@ -55,7 +55,7 @@ public interface IssueAnalysisDao extends BaseDao { /** * @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 { /** * @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 { /** * @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 { /** * @Description: 一级类目议题项目数量类目分析 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: zy * @Date: 2020-02-11 */ @@ -92,7 +92,7 @@ public interface IssueAnalysisDao extends BaseDao { /** * @Description: 二级类目议题项目数量类目分析 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: zy * @Date: 2020-02-11 */ @@ -101,7 +101,7 @@ public interface IssueAnalysisDao extends BaseDao { /** * @Description: 三级类目议题项目数量类目分析 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: zy * @Date: 2020-02-11 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java index 491159b..8acda5e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @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 + * @return: java.util.List * @Author: zy * @Date: 2020-02-11 */ @@ -54,7 +54,7 @@ public interface IssueAnalysisService { /** * @Description: 最新发布议题接口 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: wgf * @Date: 2020-02-11 */ @@ -63,7 +63,7 @@ public interface IssueAnalysisService { /** * @Description: 最热议题接口 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: wgf * @Date: 2020-02-12 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java index a3dc4ed..b27589f 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @Author yinzuomei * @Description 最热议题列表 * @Date 2020/2/10 16:17 @@ -51,7 +51,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl + * @return com.elink.esua.epdc.commons.tools.page.PageData * @Author yinzuomei * @Description 最新议题列表 * @Date 2020/2/10 16:17 @@ -71,7 +71,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @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 + * @return: com.elink.esua.epdc.commons.tools.utils.Result * @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> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-02-12 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java index bef3d79..5c6261a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author zhy * @date 2021/3/22 17:06 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java index daa5711..7abe0dc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java +++ b/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 { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 最热项目列表查询 * @Date 2020/2/10 13:53 @@ -46,7 +46,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 未解决项目列表查询 * @Date 2020/2/10 19:16 @@ -55,7 +55,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 疑难项目分析列表查询 * @Date 2020/2/11 13:14 @@ -64,7 +64,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 区域调度-解决中项目列表 * @Date 2020/2/11 15:14 @@ -73,7 +73,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 区域调度-已解决项目列表 * @Date 2020/2/11 15:15 @@ -83,7 +83,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @Description: 重点项目概况 * @Param: [formDTO] - * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: zy * @Date: 2020-02-11 */ @@ -92,7 +92,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @Description: 疑难项目分析 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @Author: zy * @Date: 2020-02-11 */ @@ -101,7 +101,7 @@ public interface ItemAnalysisDao extends BaseDao { /** * @Description: 最热项目接口 :最热讨论分析 * @Param: [formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-02-12 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java index b50e211..36a58e6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @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 + * @return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: zy * @Date: 2020-02-11 */ @@ -75,7 +75,7 @@ public interface ItemAnalysisService { /** * @Description: 疑难项目分析 * @Param: [formDto] - * @return: java.util.List + * @return: java.util.List * @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> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-02-12 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java index ea196a6..b054a0b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @Author yinzuomei * @Description 区域调度-解决中项目列表 * @Date 2020/2/11 15:13 @@ -125,7 +125,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl + * @return com.elink.esua.epdc.commons.tools.page.PageData * @Author yinzuomei * @Description 区域调度-已解决项目列表 * @Date 2020/2/11 15:13 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBasicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBasicDataController.java index 1b86389..024aac2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBasicDataController.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java index 3d955e9..bc65e98 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java index d33bad6..c218700 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java index 59949dd..73b17b0 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java index 16d1e1b..52e9a87 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("cpcbasedata") public Result cpcbasedata() { diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java index cf18257..aee66bc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java +++ b/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 * status固定hot_discuss * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:06 */ @@ -30,7 +30,7 @@ public interface ScreenBaseReportDao extends BaseDao * status固定hot_discuss * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:06 */ @@ -44,7 +44,7 @@ public interface ScreenBaseReportDao extends BaseDao * 关联item表会导致查询速度严重变慢，如果议题数多，需要把shiftProjectIncr（当日已转项目的议题数）放到业务中处理 * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:06 */ @@ -58,7 +58,7 @@ public interface ScreenBaseReportDao extends BaseDao * 关联item表会导致查询速度严重变慢，如果议题数多，需要把shiftProjectIncr（当日已转项目的议题数）放到业务中处理 * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:06 */ @@ -72,7 +72,7 @@ public interface ScreenBaseReportDao extends BaseDao * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间（榆山统计方式） * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:06 */ @@ -86,14 +86,14 @@ public interface ScreenBaseReportDao extends BaseDao * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间（榆山统计方式） * * @param - * @return java.util.List + * @return java.util.List * @author zhy * @date 2021/6/28 14:07 */ List agencyRegUser(); /** - * @return java.util.List + * @return java.util.List * @Description 网格状态话题数据 * @Author songyunpeng * @Date 2021/6/25 @@ -102,7 +102,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectGridTopicStatusList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 社区状态话题数据 * @Author songyunpeng * @Date 2021/6/25 @@ -111,7 +111,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectCommunityTopicStatusList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 网格话题转议题数据 * @Author songyunpeng * @Date 2021/6/25 @@ -121,7 +121,7 @@ public interface ScreenBaseReportDao extends BaseDao /** - * @return java.util.List + * @return java.util.List * @Description 社区话题转议题数据 * @Author songyunpeng * @Date 2021/6/25 @@ -130,7 +130,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectCommunityTopicIssueList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 网格项目数据 * @Author songyunpeng * @Date 2021/6/25 @@ -139,7 +139,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectGridProjectList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 组织项目数据 * @Author songyunpeng * @Date 2021/6/25 @@ -148,7 +148,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectCommunityProjectList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 网格群组总数 * @Author songyunpeng * @Date 2021/6/25 @@ -157,7 +157,7 @@ public interface ScreenBaseReportDao extends BaseDao List selectGridGroupTotalList(@Param("customId") String customId); /** - * @return java.util.List + * @return java.util.List * @Description 组织群组总数 * @Author songyunpeng * @Date 2021/6/25 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBasicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBasicDataDao.java index b6e086f..dc86ecd 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBasicDataDao.java +++ b/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 { /** * 1、首页-平台各类总数上报 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/10 14:58 */ @@ -26,7 +26,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 2、议题分析-各类总数 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/11 14:01 */ @@ -36,7 +36,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 3、议题分析-参与趋势 * * @param yearMonth 统计月份 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/11 14:38 */ @@ -45,7 +45,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 4、用户分析-各类总数 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/11 15:40 */ @@ -55,7 +55,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 5、公益互助-志愿者公益时长排名 * * @param pageSize 获取志愿者排行数量 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/11 16:21 */ @@ -65,7 +65,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 6、用户分析-用户趋势 * * @param yearMonth 统计月份 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/11 17:57 */ @@ -74,7 +74,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 7、公益互助-活动各类总数 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/12 10:02 */ @@ -93,7 +93,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 9、公益互助-志愿者画像 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/12 11:04 */ @@ -102,7 +102,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 10、项目分析-各类总数 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/12 14:49 */ @@ -111,7 +111,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 11、项目分析-按分类统计 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/12 15:42 */ @@ -121,7 +121,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 12、项目分析-满意度分析 * * @param yearMonth 统计月份 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 10:01 */ @@ -130,7 +130,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 13、党建声音-新闻各类总数汇总 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 10:16 */ @@ -150,7 +150,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 15、党建声音-热度新闻排行 * * @param pageSize 统计数量 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 11:08 */ @@ -159,7 +159,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 16、党建声音-新闻按类别统计 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 13:25 */ @@ -168,7 +168,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 17、邻里党群-各类总数汇总 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 14:10 */ @@ -177,7 +177,7 @@ public interface ScreenBasicDataDao extends BaseDao { /** * 18、邻里党群-小组详情 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 14:43 */ @@ -187,7 +187,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 19、邻里党群-话题参与趋势 * * @param yearMonth 统计月份 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 14:56 */ @@ -197,7 +197,7 @@ public interface ScreenBasicDataDao extends BaseDao { * 09、党建引领|基层治理-居民（党员）积分排行榜 * * @param pageSize 统计数量 - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/14 17:13 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java index 7bc5fba..fdb5ef5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenIndexDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenIndexDataDao.java index 9183e25..6ee4de8 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenIndexDataDao.java +++ b/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 { * 01、党建能力-党员相关指标上报 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 16:15 2020-09-14 **/ @@ -28,7 +28,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 02、党建能力-网格相关指标上报 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 15:08 2020-09-14 */ @@ -38,7 +38,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 03、党建能力-区街道及社区相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ @@ -48,7 +48,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 04、服务能力-网格相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ @@ -58,7 +58,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 05、服务能力-组织（街道|社区|全区）相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ @@ -68,7 +68,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 06、治理能力-网格相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ @@ -78,7 +78,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 07、治理能力-街道及社区相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ @@ -88,7 +88,7 @@ public interface ScreenIndexDataDao extends BaseDao { * 08、治理能力-部门相关指标 * * @param yearMonth - * @return java.util.List + * @return java.util.List * @Author zhangyong * @Date 09:14 2020-09-15 **/ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java index e4c94a1..7c98957 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java +++ b/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 + * @return java.util.List * * @param screenProjectFormDTO*/ List uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO); @@ -29,7 +29,7 @@ public interface ScreenProjectDataDao extends BaseDao + * @return java.util.List **/ List uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO); /** @@ -37,7 +37,7 @@ public interface ScreenProjectDataDao extends BaseDao + * @return java.util.List */ List selectProjectGridDaily(@Param("yesterDayDate") String yesterDayDate); @@ -46,7 +46,7 @@ public interface ScreenProjectDataDao extends BaseDao + * @return java.util.List */ List selectProjectOrgDaily(@Param("yesterDayDate") String yesterDayDate); @@ -55,7 +55,7 @@ public interface ScreenProjectDataDao extends BaseDao + * @return java.util.List */ List selectQuantityGridMonthly(@Param("yearMonth") String yearMonth); @@ -64,7 +64,7 @@ public interface ScreenProjectDataDao extends BaseDao + * @return java.util.List */ List selectQuantityOrgMonthly(@Param("yearMonth") String yearMonth); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index 515e3e2..1f2a310 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/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 /** * 014、组织层级 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/17 14:24 */ @@ -26,7 +26,7 @@ public interface ScreenPublicDataDao extends BaseDao /** * 015、网格信息上传 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/17 14:24 */ @@ -35,7 +35,7 @@ public interface ScreenPublicDataDao extends BaseDao /** * 016、部门信息上传 * - * @return java.util.List + * @return java.util.List * @author Liuchuang * @since 2020/9/17 14:23 */ @@ -55,7 +55,7 @@ public interface ScreenPublicDataDao extends BaseDao * @author wk * @date 2020/8/19 17:25 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @return com.elink.esua.epdc.commons.tools.utils.Result */ List cpcbasedata(); /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java index 8f211d4..74db653 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java +++ b/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; /** * 大屏项目信息上报 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java index 02c33f7..9782c25 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 001、基层党建-党员基本情况 * @author wk * @date 2020/8/19 17:25 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java index a8ea779..1a7b3b4 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBasicDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBasicDataServiceImpl.java index 5b9f6ae..795aae6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBasicDataServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java index 45caa78..d80505a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenIndexDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenIndexDataServiceImpl.java index 0522e56..028b779 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenIndexDataServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java index ff8c5aa..bd686c8 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index fbca0ae..1e74b27 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @Override public Result cpcbasedata() { diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java index 1085894..1f56eb2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java +++ b/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 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicAnalysisController.java index 4e5f5dc..40ea6a8 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicAnalysisController.java +++ b/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 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java index a9d94d6..606157a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java +++ b/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 { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 最热话题列表查询 * @Date 2020/2/10 11:52 @@ -48,7 +48,7 @@ public interface TopicAnalysisDao extends BaseMapper { /** * @param params - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 最新话题列表查询 * @Date 2020/2/10 12:51 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java index 7f41226..6b9883d 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java +++ b/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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @Author yinzuomei * @Description 最新话题列表查询 * @Date 2020/2/10 12:50 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java index 9cb68f4..96f2f4e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @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 + * @return com.elink.esua.epdc.commons.tools.utils.Result * @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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2020/2/11 16:01 */ @@ -91,7 +91,7 @@ public class UserAnalysisController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 党员老龄化列表 * @Author songyunpeng * @Date 2020/2/11 @@ -104,7 +104,7 @@ public class UserAnalysisController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 党员年轻化列表 * @Author songyunpeng * @Date 2020/2/11 @@ -117,7 +117,7 @@ public class UserAnalysisController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 注册用户数排名 * @Author lpf * @Date 2020/2/11 diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java index 6fadc27..9015a87 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java +++ b/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 { /** * 移动端党员老龄化排名列表 * @Params: [formDTO] - * @Return: java.util.List + * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/9 15:13 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 3deed59..6c3a4c9 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/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 { /*** * 居民扫码数 * @param - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ @@ -32,7 +32,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 项目数，项目结案数 * @param params - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ @@ -42,7 +42,7 @@ public interface UserAnalysisDao extends BaseMapper { * 查询用户数据排行 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/11 14:48 */ @@ -52,7 +52,7 @@ public interface UserAnalysisDao extends BaseMapper { * 根据街道id，获取街道下党员认证失败的数量 * * @param params 主要字段：街道id的集合,开始时间，结束时间 - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/11 17:25 */ @@ -61,7 +61,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 社群数 社群成员数 社群话题数 * @param params - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ @@ -72,7 +72,7 @@ public interface UserAnalysisDao extends BaseMapper { * * @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 { * * @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 deptIdList); /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 注册用户数排名 * @Author lpf * @Date 2020/2/11 @@ -102,7 +102,7 @@ public interface UserAnalysisDao extends BaseMapper { * （未）开通网格列表，查询字段：网格的完整机构名称，网格id，网格长名称 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/12 13:27 */ @@ -112,7 +112,7 @@ public interface UserAnalysisDao extends BaseMapper { * 根据网格id，查询网格内注册用户数，认证党员数，认证居民数 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/12 14:06 */ @@ -122,7 +122,7 @@ public interface UserAnalysisDao extends BaseMapper { * 根据网格id，查询网格内新闻数 通知数 议题数 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/13 11:18 */ @@ -132,7 +132,7 @@ public interface UserAnalysisDao extends BaseMapper { * 查询已开通网格数和未开通网格数 * * @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 { * 根据街道id，查询街道内未认证用户数 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/3/5 14:10 */ @@ -152,7 +152,7 @@ public interface UserAnalysisDao extends BaseMapper { * 根据网格id，查询网格内未认证用户数 * * @param params - * @return java.util.List + * @return java.util.List * @author work@yujt.net.cn * @date 2020/3/5 14:10 */ @@ -161,7 +161,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出用户相关 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -170,7 +170,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出未认证用户 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -180,7 +180,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出议题 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -189,7 +189,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出项目相关 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -198,7 +198,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出新闻 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -207,7 +207,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出社群数 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -216,7 +216,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出社群成员数 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -225,7 +225,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出社群话题数 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -235,7 +235,7 @@ public interface UserAnalysisDao extends BaseMapper { /*** * 运营数据导出企业数 * @param exportOperationFormDTO - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -245,7 +245,7 @@ public interface UserAnalysisDao extends BaseMapper { * 查询党员数据排行 * * @param params - * @return java.util.List + * @return java.util.List * @author wanggongfeng * @date 2020/5/20 14:48 */ @@ -255,7 +255,7 @@ public interface UserAnalysisDao extends BaseMapper { * 查询居民数据排行 * * @param params - * @return java.util.List + * @return java.util.List * @author wanggongfeng * @date 2020/5/20 14:48 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java index aa4c704..b8d10ae 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java +++ b/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 /** * 移动端党员年轻化化排名列表 * @Params: [formDTO] - * @Return: java.util.List + * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/9 15:13 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java index c28bfab..eb7de6d 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserGridOpiningService.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java index b98990b..3ad12e0 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserPartyRankService.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java index 82adfb5..40712f3 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java index 54bf49b..2bcac61 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index 9f97ce3..f12c789 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/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 + * @return java.util.List * @author qushutong * @date 2020/2/11 14:04 */ @@ -31,7 +31,7 @@ public interface UserAnalysisService { * 网格开通情况，用于导出 * * @param params - * @return java.util.List + * @return java.util.List * @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 + * @return com.elink.esua.epdc.commons.tools.page.PageData * @author work@yujt.net.cn * @date 2020/2/11 15:13 */ PageData pageUserDataRank(Map params); /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @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 + * @return java.util.List * @author qushutong * @date 2020/3/23 15:16 */ @@ -100,7 +100,7 @@ public interface UserAnalysisService { /*** * 获取所有网格 * @param params - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/25 17:22 */ @@ -110,7 +110,7 @@ public interface UserAnalysisService { /*** * 获取导入数据 * @param params - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/25 19:13 */ @@ -119,7 +119,7 @@ public interface UserAnalysisService { /*** * 获取导入用户排行数据 * @param params - * @return java.util.List + * @return java.util.List * @author qushutong * @date 2020/3/26 13:32 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java index 0b8f749..b515833 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java index 97b7e2a..ca7dedd 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java index 252f62a..16518b5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserPartyRankServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java index 608ee90..2694b57 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java index d94cf4e..ddf8263 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index d591c94..702a49e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/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 + * @return java.util.List * @author work@yujt.net.cn * @date 2020/2/13 16:46 */ diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java index 6ed6561..5ad8e1e 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java +++ b/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; diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java index dd31549..c1f2502 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java +++ b/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;