From 02351856fd6eaaedeaa0bebdbca72d918fb08cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 11 Feb 2020 17:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/user/result/GridOpeningResultDTO.java | 45 +++ .../controller/UserAnalysisController.java | 18 +- .../modules/user/dao/UserAnalysisDao.java | 40 +++ .../user/service/UserAnalysisService.java | 4 +- .../service/impl/UserAnalysisServiceImpl.java | 43 ++- .../resources/mapper/user/UserAnalysisDao.xml | 321 ++++++++++++++++++ 6 files changed, 465 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java index 255e7d431..458640970 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -29,4 +29,49 @@ public class GridOpeningResultDTO implements Serializable { */ private String partyCount; + /** + * 居民扫码数 + */ + private String ewmCount; + + /** + * 新闻数 + */ + private String newsCount; + + /** + * 通知数 + */ + private String noticeCount; + + /** + * 议题数 + */ + private String eventCount; + + /** + * 项目数 + */ + private String itemCount; + + /** + * 项目结案数 + */ + private String itemCloseCount; + + /** + * 社群数 + */ + private String communityCount; + + /** + * 社群成员数 + */ + private String communityMemberCount; + + /** + * 社群话题数 + */ + private String communityTopicCount; + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index feda0ad91..337fc2650 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -5,9 +5,13 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import java.util.Map; +import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * 数据端，用户数据分析相关接口 @@ -36,4 +40,16 @@ public class UserAnalysisController { PageData pageData = userAnalysisService.pageUserDataRank(params); return new Result().ok(pageData); } + /*** + * 开通网格分页 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/2/11 16:01 + */ + @GetMapping("pageGridOpening") + public Result> page(@RequestParam Map params) { + PageData page = userAnalysisService.listPageGridOpening(params); + return new Result>().ok(page); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index d2f6558e8..fd3694b12 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -104,4 +104,44 @@ public interface UserAnalysisDao extends BaseMapper { * @date 2020/2/11 17:25 */ List selectListPartyAuthFailureCountByStreetId(@Param("streetIdList") List streetIdList); + + /*** + * 项目结案数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListItemCloseCount(); + + + /*** + * 社群数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListCommunityCount(); + + + /*** + * 社群成员数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListCommunityMemberCount(); + + + /*** + * 社群话题数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListCommunityTopicCount(); + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index f02d9690d..fa8191378 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java @@ -22,7 +22,7 @@ public interface UserAnalysisService { * @author qushutong * @date 2020/2/11 14:04 */ - List listPageGridOpening(); + PageData listPageGridOpening(Map params); /** * 用户数据排行，PC端用户数据分析，居民注册排行，党员排行 @@ -33,4 +33,6 @@ public interface UserAnalysisService { * @date 2020/2/11 15:13 */ PageData pageUserDataRank(Map params); + + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index 2d5cd8bfa..6c98dc491 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -34,12 +34,47 @@ import java.util.Map; public class UserAnalysisServiceImpl extends BaseServiceImpl implements UserAnalysisService { @Override - public List listPageGridOpening() { + public PageData listPageGridOpening(Map params) { // 注册数 - List reigistCount = baseDao.selectListReigistCount(); - + List registerCountList = baseDao.selectListReigistCount(); + // 党员数 + List partyCountList = baseDao.selectListPartyCount(); + // 居民扫码数 + List ewmCountList = baseDao.selectListEwmCount(); + // 新闻数 + List newsCountList = baseDao.selectListNewsCount(); + // 通知数 + List noticeCountList = baseDao.selectListNoticeCount(); + // 议题数 + List eventCountList = baseDao.selectListEventCount(); + // 项目数 + List itemCountList = baseDao.selectListItemCount(); + // 结案数 + List itemCloseCountList = baseDao.selectListItemCloseCount(); + // 社群数 + List communityCountList = baseDao.selectListCommunityCount(); + // 社群成员数 + List communityMemberCountList = baseDao.selectListCommunityMemberCount(); + // 社群话题数 + List communityTopicCountList = baseDao.selectListCommunityTopicCount(); + GridOpeningResultDTO openingResultDto; + for (int i = 0; i < registerCountList.size(); i++) { + openingResultDto=registerCountList.get(i); + openingResultDto.setRegisterCount(registerCountList.get(i).getRegisterCount()); + openingResultDto.setPartyCount(partyCountList.get(i).getPartyCount()); + openingResultDto.setNewsCount(newsCountList.get(i).getNewsCount()); + openingResultDto.setNoticeCount(noticeCountList.get(i).getNoticeCount()); + openingResultDto.setEwmCount(ewmCountList.get(i).getEwmCount()); + openingResultDto.setEventCount(eventCountList.get(i).getEventCount()); + openingResultDto.setItemCount(itemCountList.get(i).getItemCount()); + openingResultDto.setItemCloseCount(itemCloseCountList.get(i).getItemCloseCount()); + openingResultDto.setCommunityCount(communityCountList.get(i).getCommunityCount()); + openingResultDto.setCommunityMemberCount(communityMemberCountList.get(i).getCommunityMemberCount()); + openingResultDto.setCommunityTopicCount(communityTopicCountList.get(i).getCommunityTopicCount()); + } - return baseDao.selectListReigistCount(); + IPage iPage = this.getPage(params); + return new PageData<>(registerCountList, iPage.getTotal()); } @Override diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 1fbc057ed..47d903711 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -87,4 +87,325 @@ GROUP BY ad2.ID + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +