elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

网格开通

dev
曲树通 6 years ago
parent
55fbd21317
commit
02351856fd
6 changed files with 465 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
  2. 18
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
  3. 40
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
  4. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
  5. 43
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
  6. 321
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

45
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
View File

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

18
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java
View File

@ -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<UserDataRankResultDTO> pageData = userAnalysisService.pageUserDataRank(params);
return new Result().ok(pageData);
}
/***
* 开通网格分页
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>>
* @author qushutong
* @date 2020/2/11 16:01
*/
@GetMapping("pageGridOpening")
public Result<PageData<GridOpeningResultDTO>> page(@RequestParam Map<String, Object> params) {
PageData<GridOpeningResultDTO> page = userAnalysisService.listPageGridOpening(params);
return new Result<PageData<GridOpeningResultDTO>>().ok(page);
}
}

40
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java
View File

@ -104,4 +104,44 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
* @date 2020/2/11 17:25
*/
List<UserDataRankResultDTO> selectListPartyAuthFailureCountByStreetId(@Param("streetIdList") List<String> streetIdList);
/***
* 项目结案数
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
List<GridOpeningResultDTO> selectListItemCloseCount();
/***
* 社群数
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
List<GridOpeningResultDTO> selectListCommunityCount();
/***
* 社群成员数
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
List<GridOpeningResultDTO> selectListCommunityMemberCount();
/***
* 社群话题数
* @param
* @return java.util.List<com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO>
* @author qushutong
* @date 2020/2/11 14:10
*/
List<GridOpeningResultDTO> selectListCommunityTopicCount();
}

4
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java
View File

@ -22,7 +22,7 @@ public interface UserAnalysisService {
* @author qushutong
* @date 2020/2/11 14:04
*/
List<GridOpeningResultDTO> listPageGridOpening();
PageData<GridOpeningResultDTO> listPageGridOpening(Map<String, Object> params);
/**
* 用户数据排行，PC端用户数据分析，居民注册排行，党员排行
@ -33,4 +33,6 @@ public interface UserAnalysisService {
* @date 2020/2/11 15:13
*/
PageData<UserDataRankResultDTO> pageUserDataRank(Map<String, Object> params);
}

43
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java
View File

@ -34,12 +34,47 @@ import java.util.Map;
public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, UserAnalysisDTO> implements UserAnalysisService {
@Override
public List<GridOpeningResultDTO> listPageGridOpening() {
public PageData<GridOpeningResultDTO> listPageGridOpening(Map<String, Object> params) {
// 注册数
List<GridOpeningResultDTO> reigistCount = baseDao.selectListReigistCount();
List<GridOpeningResultDTO> registerCountList = baseDao.selectListReigistCount();
// 党员数
List<GridOpeningResultDTO> partyCountList = baseDao.selectListPartyCount();
// 居民扫码数
List<GridOpeningResultDTO> ewmCountList = baseDao.selectListEwmCount();
// 新闻数
List<GridOpeningResultDTO> newsCountList = baseDao.selectListNewsCount();
// 通知数
List<GridOpeningResultDTO> noticeCountList = baseDao.selectListNoticeCount();
// 议题数
List<GridOpeningResultDTO> eventCountList = baseDao.selectListEventCount();
// 项目数
List<GridOpeningResultDTO> itemCountList = baseDao.selectListItemCount();
// 结案数
List<GridOpeningResultDTO> itemCloseCountList = baseDao.selectListItemCloseCount();
// 社群数
List<GridOpeningResultDTO> communityCountList = baseDao.selectListCommunityCount();
// 社群成员数
List<GridOpeningResultDTO> communityMemberCountList = baseDao.selectListCommunityMemberCount();
// 社群话题数
List<GridOpeningResultDTO> 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<GridOpeningResultDTO> iPage = this.getPage(params);
return new PageData<>(registerCountList, iPage.getTotal());
}
@Override

321
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
View File

@ -87,4 +87,325 @@
GROUP BY
ad2.ID
</select>
<!--党员数-->
<select id="selectListPartyCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
count(up.ID) AS partyCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_user.epdc_party_members up ON up.GRID_ID = t0.id
AND up.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--居民扫码数-->
<select id="selectListEwmCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
count(ug.ID) AS ewmCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id
AND ug.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--新闻数-->
<select id="selectListNewsCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(ad2.`name`,ad1.`name`,t0.`name`) AS allDeptName,
count(un.ID) AS newsCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_news.epdc_news un ON un.dept_id = t0.id
AND un.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--通知数-->
<select id="selectListNoticeCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(un.ID) AS noticeCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_news.epdc_notice un ON un.dept_id = t0.id
AND un.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--议题数-->
<select id="selectListEventCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(epen.ID) AS eventCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_events.epdc_events epen ON epen.GRID_ID = t0.id
AND epen.DEL_FLAG = '0'
AND epen.EVENT_STATE = '4'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--项目数-->
<select id="selectListItemCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(epen.ID) AS itemCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_events.epdc_item epen ON epen.GRID_ID = t0.id
AND epen.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--结案数-->
<select id="selectListItemCloseCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(epen.ID) AS itemCloseCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_events.epdc_item epen ON epen.GRID_ID = t0.id
AND epen.DEL_FLAG = '0'
AND epen.ITEM_STATE = '10'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--社群数-->
<select id="selectListCommunityCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(epgr.ID) AS communityCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_group.epdc_group epgr ON epgr.GRID_ID = t0.id
AND epgr.DEL_FLAG = '0'
AND (
epgr.STATE = '10'
OR epgr.STATE = '15'
)
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--社区成员数-->
<select id="selectListCommunityMemberCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(ug.ID) AS communityMemberCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_group.epdc_group epgr ON epgr.GRID_ID = t0.id
AND epgr.DEL_FLAG = '0'
AND (
epgr.STATE = '10'
OR epgr.STATE = '15'
)
LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id
AND ug.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
<!--社群话题数-->
<select id="selectListCommunityTopicCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
CONCAT(
ad2.`name`,
ad1.`name`,
t0.`name`
) AS allDeptName,
count(ug.ID) AS communityTopicCount
FROM
(
SELECT
ad.id,
ad.`name`,
ad.pid
FROM
esua_epdc_admin.sys_dept ad
WHERE
ad.type_key = 'grid_party'
AND ad.del_flag = 0
) t0
LEFT JOIN esua_epdc_group.epdc_group epgr ON epgr.GRID_ID = t0.id
AND epgr.DEL_FLAG = '0'
AND (
epgr.STATE = '10'
OR epgr.STATE = '15'
)
LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id
AND ug.DEL_FLAG = '0'
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
GROUP BY
t0.id
ORDER BY
t0.id ASC
</select>
</mapper>

Write Preview
Loading…
Cancel
Save