diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java index ee3283601..9bfe92cf3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java @@ -79,4 +79,9 @@ public class CpcbasedataDTO implements Serializable { *60+岁 */ private Integer ageLevel6; + + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd + */ + private String dataEndTime; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java index ed71568a1..4ff44ea4c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java @@ -117,5 +117,8 @@ public class EventdataResultDTO implements Serializable { */ private String latestOperateDesc; - + /** + * 数据更新至: yyyy|yyyMM|yyyyMMdd + */ + private String dataEndTime; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java index 0d515bd55..44bcef4fe 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java @@ -44,4 +44,9 @@ public class PartylinkmassesdataResultDTO implements Serializable { *群成员总数 */ private Integer groupUserTotal; + + /** + * 数据更新至: yyyy|yyyMM|yyyyMMdd + */ + private String dataEndTime; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java index 06e21a3c9..b6722dbac 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java @@ -60,4 +60,29 @@ public class PioneerdataResultDTO implements Serializable { */ private Integer resolvedProjectTotal; + /** + * 议事占比(党员/用户) + */ + private String issueRatio; + + /** + * 话题占比(党员/用户) + */ + private String topicRatio; + + /** + * 议题转项目占比(党员/用户) + */ + private String shiftProjectRatio; + + /** + * 解决项目占比(党员/用户) + */ + private String resolvedProjectRatio; + + /** + * 党员发布议题占比(党员/用户) + */ + private String publishIssueRatio; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java new file mode 100644 index 000000000..180e3e997 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataResultDTO.java @@ -0,0 +1,67 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 公众参与各类总数 + * @author: wangtong + * @create: 2020-08-24 18:24 + **/ +@Data +public class PublicpartitotaldataResultDTO implements Serializable { + + private static final long serialVersionUID = -8840441410009038154L; + + /** + *组织类别 agency：组织；部门：department；网格：grid + */ + private String orgType; + + /** + *组织Id 可以为网格，机关id + */ + private String orgId; + + /** + *上级组织Id + */ + private String parentId; + + /** + *组织名称 + */ + private String orgName; + + /** + *话题总数 + */ + private Integer topicTotal; + + /** + *议题总数 + */ + private Integer issueTotal; + + /** + *项目总数 + */ + private Integer projectTotal; + + /** + *注册人数 + */ + private Integer regUserTotal; + + /** + *参与人数 + */ + private Integer joinUserTotal; + + /** + *数据更新至: yyyy|yyyyMM|yyyyMMdd + */ + private String dataEndTime; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java index ea835584e..7fba90264 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java @@ -64,4 +64,9 @@ public class UsertotaldataResultDTO implements Serializable { *项目总数 */ private Integer projectTotal; + + /** + *数据更新至: yyyy|yyyyMM|yyyyMMdd + */ + private String dataEndTime; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java index 59a21dae4..6543e93fa 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java @@ -81,6 +81,18 @@ public class DataStatsScreencollController { return dataStatsScreencollService.usertotaldata(); } + /** + * @describe: 公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("publicpartitotaldata") + public Result publicpartitotaldata() { + return dataStatsScreencollService.publicpartitotaldata(); + } + /** * @describe: 基层党建-建设情况数据（支部、联建、志愿） @@ -117,4 +129,6 @@ public class DataStatsScreencollController { public Result customeragency() { return dataStatsScreencollService.customeragency(); } + + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java index ae07cc931..4b182c04a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java @@ -102,4 +102,13 @@ public interface DataStatsScreencollDao extends BaseDao */ List customeragency(); + + /** + * @describe: 公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:28 + * @params [] + * @return java.util.List + */ + List publicpartitotaldata(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java index 9b83c2430..adac48409 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java @@ -83,4 +83,13 @@ public interface DataStatsScreencollService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result customeragency(); + + /** + * @describe: 公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result publicpartitotaldata(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java index eafb1892a..35a2a6db2 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java @@ -1,6 +1,8 @@ package com.elink.esua.epdc.modules.screen.service.impl; +import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.security.epmet.EpmetUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao; @@ -19,61 +21,99 @@ import java.util.List; @Service public class DataStatsScreencollServiceImpl extends BaseServiceImpl implements DataStatsScreencollService { - private Logger logger = LoggerFactory.getLogger(getClass()); - + private Logger log = LoggerFactory.getLogger(getClass()); @Override public Result cpcbasedata() { - List resultList = baseDao.cpcbasedata(); + List list = baseDao.cpcbasedata(); + // 将list转换为json格式 + + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/cpcbasedata", json); + log.info(body); return null; } @Override public Result eventdata() { - List resultList = baseDao.eventdata(); - for(EventdataResultDTO re : resultList){ + List list = baseDao.eventdata(); + for(EventdataResultDTO re : list){ for(int x = 0;x < re.getImgDataList().size();x++){ re.getImgDataList().get(x).setEventId(re.getEventId()); re.getImgDataList().get(x).setSort(x+1); } } + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/eventdata", json); + log.info(body); return null; } @Override public Result partylinkmassesdata() { - List resultList = baseDao.partylinkmassesdata(); + List list = baseDao.partylinkmassesdata(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/partylinkmassesdata", json); + log.info(body); return null; } @Override public Result pioneerdata() { - List resultList = baseDao.pioneerdata(); + List list = baseDao.pioneerdata(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/pioneerdata", json); + log.info(body); return null; } @Override public Result usertotaldata() { - List resultList = baseDao.usertotaldata(); + List list = baseDao.usertotaldata(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/usertotaldata", json); + log.info(body); return null; } @Override public Result meetdata() { - List resultList = baseDao.meetdata(); + List list = baseDao.meetdata(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/meetdata", json); + log.info(body); return null; } @Override public Result customergrid() { - List resultList = baseDao.customergrid(); + List list = baseDao.customergrid(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/customergrid", json); + log.info(body); return null; } @Override public Result customeragency() { - List resultList = baseDao.customeragency(); + List list = baseDao.customeragency(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + String body = EpmetUtils.httpPost("/data/stats/screencoll/customeragency", json); + log.info(body); + return null; + } + + @Override + public Result publicpartitotaldata() { + List list = baseDao.publicpartitotaldata(); return null; } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml index dd3bf7f93..31954da69 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml @@ -4,6 +4,7 @@ @@ -340,6 +346,7 @@ + @@ -371,8 +378,11 @@ (CASE WHEN ei.ITEM_STATE='0' THEN '处理中' WHEN ei.ITEM_STATE='5' THEN '已关闭' WHEN ei.ITEM_STATE='10' THEN '已结案'END) as eventStatusDesc, - (select OUT_HANDLE_ADVICE from esua_epdc_events.epdc_item_handle_process eih - where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as latestOperateDesc + (select CASE WHEN eih.STATE = 0 THEN '处理中' + WHEN eih.STATE = 5 THEN '已关闭' + WHEN eih.STATE = 10 THEN '已结案' end from esua_epdc_events.epdc_item_handle_process eih + where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as latestOperateDesc, + DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime from esua_epdc_events.epdc_item ei left join esua_epdc_admin.sys_dept d on d.id=ei.GRID_ID @@ -390,92 +400,13 @@ order by ei.CREATED_TIME desc,i.id +