【大屏展示】-【接口参数调整】-（王童）-2020/9/3

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java

@@ -3,12 +3,13 @@ package com.elink.esua.epdc.dto.screen.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @program: esua-epdc
- * @description: 党员基本情况
+ * @description: 党员基本情况包装类
  * @author: wangtong
- * @create: 2020-08-19 13:58
+ * @create: 2020-09-08 16:01
  **/
 @Data
 public class CpcbasedataDTO implements Serializable {
@@ -16,72 +17,13 @@ public class CpcbasedataDTO implements Serializable {
     private static final long serialVersionUID = 7240758113851172699L;
 
     /**
-     *组织类别 agency：组织；部门：department；网格：grid
+     * 是否是本次传输的第一次
      */
-    private String orgType;
+    private Boolean isFirst = true;
 
     /**
-     *组织Id 可以为网格，机关id
+     * 组装数据
      */
-    private String orgId;
+    private List<CpcbasedataResultDTO> dataList;
 
-    /**
-     *上级组织Id
-     */
-    private String parentId;
-
-    /**
-     *组织名称
-     */
-    private String orgName;
-
-    /**
-     *注册用户数
-     */
-    private Integer registerUserCount;
-
-    /**
-     *群众用户数
-     */
-    private Integer resiTotal;
-
-    /**
-     *注册党员数
-     */
-    private Integer partyMemberCount;
-
-    /**
-     *小于20岁
-     */
-    private Integer ageLevel1;
-
-    /**
-     *20-30岁
-     */
-    private Integer ageLevel2;
-
-    /**
-     *31-40岁
-     */
-    private Integer ageLevel3;
-
-    /**
-     *41-50岁
-     */
-    private Integer ageLevel4;
-
-    /**
-     *51-60岁
-     */
-    private Integer ageLevel5;
-
-    /**
-     *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/CpcbasedataResultDTO.java

@@ -0,0 +1,87 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党员基本情况
+ * @author: wangtong
+ * @create: 2020-08-19 13:58
+ **/
+@Data
+public class CpcbasedataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7240758113851172699L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *注册用户数
+     */
+    private Integer registerUserCount;
+
+    /**
+     *群众用户数
+     */
+    private Integer resiTotal;
+
+    /**
+     *注册党员数
+     */
+    private Integer partyMemberCount;
+
+    /**
+     *小于20岁
+     */
+    private Integer ageLevel1;
+
+    /**
+     *20-30岁
+     */
+    private Integer ageLevel2;
+
+    /**
+     *31-40岁
+     */
+    private Integer ageLevel3;
+
+    /**
+     *41-50岁
+     */
+    private Integer ageLevel4;
+
+    /**
+     *51-60岁
+     */
+    private Integer ageLevel5;
+
+    /**
+     *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/CustomeragencyDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 组织层级 包装类
+ * @author: wangtong
+ * @create: 2020-09-08 19:24
+ **/
+@Data
+public class CustomeragencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 6470873111142034565L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<CustomeragencyResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 网格信息上传 包装类
+ * @author: wangtong
+ * @create: 2020-09-08 19:19
+ **/
+@Data
+public class CustomergridDTO implements Serializable {
+
+    private static final long serialVersionUID = -3350104910707085488L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<CustomergridResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件数据包装类
+ * @author: wangtong
+ * @create: 2020-09-08 16:11
+ **/
+@Data
+public class EventdataDTO implements Serializable {
+
+    private static final long serialVersionUID = 7286806459055380980L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = false;
+
+    /**
+     * 组装数据
+     */
+    private List<EventdataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataDTO.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 基层党建-建设情况数据（支部、联建、志愿）
+ * @author: wangtong
+ * @create: 2020-09-08 16:58
+ **/
+@Data
+public class MeetdataDTO implements Serializable {
+
+    private static final long serialVersionUID = 387754180136023080L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = false;
+
+    /**
+     * 月id:yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 组装数据
+     */
+    private List<MeetdataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 党建引领-党员联系群众数据 包装类
+ * @author: wangtong
+ * @create: 2020-09-08 16:38
+ **/
+@Data
+public class PartylinkmassesdataDTO implements Serializable {
+
+    private static final long serialVersionUID = -2100995390064516097L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<PartylinkmassesdataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 建引领-先锋模范数据 包装类
+ * @author: wangtong
+ * @create: 2020-09-08 16:45
+ **/
+@Data
+public class PioneerdataDTO implements Serializable {
+
+    private static final long serialVersionUID = 754789279668526271L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<PioneerdataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 公众参与各类总数 包装类
+ * @author: wangtong
+ * @create: 2020-09-08 16:48
+ **/
+@Data
+public class PublicpartitotaldataDTO implements Serializable {
+
+    private static final long serialVersionUID = -4500099985729432562L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<PublicpartitotaldataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 中央区各类总数包装类
+ * @author: wangtong
+ * @create: 2020-09-08 16:32
+ **/
+@Data
+public class UsertotaldataDTO implements Serializable {
+
+    private static final long serialVersionUID = -3846666484093712694L;
+
+    /**
+     * 是否是本次传输的第一次
+     */
+    private Boolean isFirst = true;
+
+    /**
+     * 组装数据
+     */
+    private List<UsertotaldataResultDTO> dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java

@@ -38,7 +38,7 @@ public interface DataStatsScreencollDao extends BaseDao<DataStatsScreencollResul
     * @params []
     * @return com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO
     */
-    List<CpcbasedataDTO> cpcbasedata();
+    List<CpcbasedataResultDTO> cpcbasedata();
 
     /**
     * @describe: 事件数据

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.modules.screen.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO;
+import com.elink.esua.epdc.dto.screen.result.CpcbasedataResultDTO;
 
 /**
  * 项目模块
@@ -19,7 +19,7 @@ public interface DataStatsScreencollService {
     * @params []
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    Result<CpcbasedataDTO> cpcbasedata();
+    Result<CpcbasedataResultDTO> cpcbasedata();
 
     /**
     * @describe: 事件数据

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java

@@ -30,11 +30,12 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 
 
 	@Override
-	public Result<CpcbasedataDTO> cpcbasedata() {
+	public Result<CpcbasedataResultDTO> cpcbasedata() {
-		List<CpcbasedataDTO> list = baseDao.cpcbasedata();
+		List<CpcbasedataResultDTO> list = baseDao.cpcbasedata();
 		// 将list转换为json格式
-
+		CpcbasedataDTO result = new CpcbasedataDTO();
-		String json = JSONObject.toJSONString(list);
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/cpcbasedata", json);
 		log.info(body);
 		return null;
@@ -50,10 +51,15 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 			}
 		}
 
-		List<List<EventdataResultDTO>> formList = fixedGrouping(list,2000);
+		List<List<EventdataResultDTO>> formList = fixedGrouping(list,1000);
 		for(int i = 0 ; i < formList.size() ; i++){
 			// 将list转换为json格式
-			String json = JSONObject.toJSONString(formList.get(i));
+			EventdataDTO result = new EventdataDTO();
+			result.setDataList(formList.get(i));
+			if(i == 0){
+				result.setIsFirst(true);
+			}
+			String json = JSONObject.toJSONString(result);
 			String body = epmetUtils.httpPost("/data/stats/screencoll/eventdata", json);
 			log.info(body);
 		}
@@ -64,7 +70,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result partylinkmassesdata() {
 		List<PartylinkmassesdataResultDTO> list = baseDao.partylinkmassesdata();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		PartylinkmassesdataDTO result = new PartylinkmassesdataDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/partylinkmassesdata", json);
 		log.info(body);
 		return null;
@@ -74,7 +82,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result pioneerdata() {
 		List<PioneerdataResultDTO> list = baseDao.pioneerdata();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		PioneerdataDTO result = new PioneerdataDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/pioneerdata", json);
 		log.info(body);
 		return null;
@@ -84,7 +94,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result usertotaldata() {
 		List<UsertotaldataResultDTO> list = baseDao.usertotaldata();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		UsertotaldataDTO result = new UsertotaldataDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/usertotaldata", json);
 		log.info(body);
 		return null;
@@ -93,10 +105,16 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	@Override
 	public Result meetdata() {
 		List<MeetdataResultDTO> list = baseDao.meetdata();
-		List<List<MeetdataResultDTO>> formList = fixedGrouping(list,2000);
+		List<List<MeetdataResultDTO>> formList = fixedGrouping(list,1000);
 		for(int i = 0 ; i < formList.size() ; i++){
 			// 将list转换为json格式
-			String json = JSONObject.toJSONString(formList.get(i));
+			MeetdataDTO result = new MeetdataDTO();
+			result.setDataList(formList.get(i));
+			result.setMonthId(formList.get(i).get(0).getMonthId());
+			if(i == 0){
+				result.setIsFirst(true);
+			}
+			String json = JSONObject.toJSONString(result);
 			String body = epmetUtils.httpPost("/data/stats/screencoll/meetdata", json);
 			log.info(body);
 		}
@@ -107,7 +125,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result customergrid() {
 		List<CustomergridResultDTO> list = baseDao.customergrid();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		CustomergridDTO result = new CustomergridDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/customergrid", json);
 		log.info(body);
 		return null;
@@ -117,7 +137,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result customeragency() {
 		List<CustomeragencyResultDTO> list = baseDao.customeragency();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		CustomeragencyDTO result = new CustomeragencyDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/customeragency", json);
 		log.info(body);
 		return null;
@@ -127,7 +149,9 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result publicpartitotaldata() {
 		List<PublicpartitotaldataResultDTO> list = baseDao.publicpartitotaldata();
 		// 将list转换为json格式
-		String json = JSONObject.toJSONString(list);
+		PublicpartitotaldataDTO result = new PublicpartitotaldataDTO();
+		result.setDataList(list);
+		String json = JSONObject.toJSONString(result);
 		String body = epmetUtils.httpPost("/data/stats/screencoll/publicpartitotaldata", json);
 		log.info(body);
 		return null;

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao">
 
-    <select id="cpcbasedata" resultType="com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO">
+    <select id="cpcbasedata" resultType="com.elink.esua.epdc.dto.screen.result.CpcbasedataResultDTO">
 
         SELECT
                 total.orgId,