【大屏展示】-【接口调整字段】-（王童）-2020/8/25

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

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

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

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

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

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

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();
     }
+
+
 }

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<DataStatsScreencollResul
     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO>
     */
     List<CustomeragencyResultDTO> customeragency();
+
+    /**
+    * @describe: 公众参与各类总数
+    * @author wangtong
+    * @date 2020/8/24 18:28
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.PublicpartitotaldataResultDTO>
+    */
+    List<PublicpartitotaldataResultDTO> publicpartitotaldata();
 }

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();
 }

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<DataStatsScreencollDao, DataStatsScreencollResultDTO> implements DataStatsScreencollService {
 
-	private Logger logger = LoggerFactory.getLogger(getClass());
-
+	private Logger log = LoggerFactory.getLogger(getClass());
 
 
 	@Override
 	public Result<CpcbasedataDTO> cpcbasedata() {
-		List<CpcbasedataDTO> resultList = baseDao.cpcbasedata();
+		List<CpcbasedataDTO> 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<EventdataResultDTO> resultList = baseDao.eventdata();
-		for(EventdataResultDTO re : resultList){
+		List<EventdataResultDTO> 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<PartylinkmassesdataResultDTO> resultList = baseDao.partylinkmassesdata();
+		List<PartylinkmassesdataResultDTO> 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<PioneerdataResultDTO> resultList = baseDao.pioneerdata();
+		List<PioneerdataResultDTO> 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<UsertotaldataResultDTO> resultList = baseDao.usertotaldata();
+		List<UsertotaldataResultDTO> 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<MeetdataResultDTO> resultList = baseDao.meetdata();
+		List<MeetdataResultDTO> 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<CustomergridResultDTO> resultList = baseDao.customergrid();
+		List<CustomergridResultDTO> 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<CustomeragencyResultDTO> resultList = baseDao.customeragency();
+		List<CustomeragencyResultDTO> 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<PublicpartitotaldataResultDTO> list = baseDao.publicpartitotaldata();
 		return null;
 	}
 }