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 9bfe92cf3..1d9becc7d 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 @@ -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 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; } \ 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/CpcbasedataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataResultDTO.java new file mode 100644 index 000000000..53c1ed296 --- /dev/null +++ b/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; +} \ 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/CustomeragencyDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyDTO.java new file mode 100644 index 000000000..6725055b1 --- /dev/null +++ b/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 dataList; +} \ 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/CustomergridDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridDTO.java new file mode 100644 index 000000000..059f04aab --- /dev/null +++ b/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 dataList; +} \ 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/EventdataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataDTO.java new file mode 100644 index 000000000..9140ffdee --- /dev/null +++ b/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 dataList; +} \ 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/MeetdataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataDTO.java new file mode 100644 index 000000000..102fd9c2b --- /dev/null +++ b/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 dataList; +} \ 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/PartylinkmassesdataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataDTO.java new file mode 100644 index 000000000..cccae52fd --- /dev/null +++ b/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 dataList; +} \ 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/PioneerdataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataDTO.java new file mode 100644 index 000000000..4dc19f81b --- /dev/null +++ b/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 dataList; +} \ 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/PublicpartitotaldataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PublicpartitotaldataDTO.java new file mode 100644 index 000000000..6855116fd --- /dev/null +++ b/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 dataList; +} \ 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/UsertotaldataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataDTO.java new file mode 100644 index 000000000..95cf5addc --- /dev/null +++ b/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 dataList; +} \ 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/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 4b182c04a..75a5aa3ed 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 @@ -38,7 +38,7 @@ public interface DataStatsScreencollDao extends BaseDao cpcbasedata(); + List cpcbasedata(); /** * @describe: 事件数据 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 adac48409..536948154 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 @@ -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 cpcbasedata(); + Result cpcbasedata(); /** * @describe: 事件数据 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 ef8f6cc53..d2d4d6314 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 @@ -30,11 +30,12 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl cpcbasedata() { - List list = baseDao.cpcbasedata(); + public Result cpcbasedata() { + List list = baseDao.cpcbasedata(); // 将list转换为json格式 - - String json = JSONObject.toJSONString(list); + CpcbasedataDTO result = new CpcbasedataDTO(); + 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> formList = fixedGrouping(list,2000); + List> 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 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 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 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 list = baseDao.meetdata(); - List> formList = fixedGrouping(list,2000); + List> 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 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 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 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; 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 fcf6d6186..a6c8a7da4 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 @@ -3,7 +3,7 @@ - SELECT total.orgId,