diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java index 9e41f85db..8641b8804 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java @@ -10,4 +10,6 @@ import lombok.Data; */ @Data public class UserAnalysisDTO { + + } 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 new file mode 100644 index 000000000..255e7d431 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.user.result; + + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: qushutong + * @Date: 2020/2/11 13:09 + * @Description: 开通网格情况 + */ +@Data +public class GridOpeningResultDTO implements Serializable { + + private static final long serialVersionUID = -852226852590425991L; + + /** + * 街道社区网格 + */ + private String allDeptName; + /** + * 用户注册数 + */ + private String registerCount; + + /** + * 党员注册数 + */ + private String partyCount; + +} 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 6a50e8b34..885a4d717 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 @@ -2,8 +2,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.result.GridOpeningResultDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户数据分析相关 * @@ -12,4 +15,71 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserAnalysisDao extends BaseMapper { + + /*** + * 居民注册 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 12:32 + */ + List selectListReigistCount(); + + /*** + * 党员数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListPartyCount(); + + /*** + * 居民扫码数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListEwmCount(); + + + /*** + * 新闻 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListNewsCount(); + + /*** + * 通知 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListNoticeCount(); + + + /*** + * 议题数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListEventCount(); + + + /*** + * 项目数 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:10 + */ + List selectListItemCount(); + } 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 c0f0a5b02..cbac4d3be 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 @@ -1,5 +1,9 @@ package com.elink.esua.epdc.modules.user.service; +import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; + +import java.util.List; + /** * 用户数据分析相关业务 * @@ -7,4 +11,13 @@ package com.elink.esua.epdc.modules.user.service; * @date 2020/2/11 09:44 */ public interface UserAnalysisService { + + /*** + * 网格开通列表 + * @param + * @return java.util.List + * @author qushutong + * @date 2020/2/11 14:04 + */ + List listPageGridOpening(); } 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 5b27bbed1..11d25d96f 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 @@ -2,12 +2,15 @@ package com.elink.esua.epdc.modules.user.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.dto.user.UserAnalysisDTO; +import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; import com.elink.esua.epdc.dto.user.result.UserRegisterDataResultDTO; import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + /** * 用户数据分析业务实现 * @@ -18,4 +21,12 @@ import org.springframework.stereotype.Service; @Service public class UserAnalysisServiceImpl extends BaseServiceImpl implements UserAnalysisService { + @Override + public List listPageGridOpening() { + // 注册数 + List reigistCount = baseDao.selectListReigistCount(); + + + return baseDao.selectListReigistCount(); + } } 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 e615c033b..7f6ebdfec 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 @@ -2,5 +2,29 @@ - +