From c384f2e882fa40cb868dca1e00e7388ed95ea24c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 25 Aug 2020 16:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=91-=E3=80=90=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/result/PioneerdataResultDTO.java | 10 +++ .../impl/DataStatsScreencollServiceImpl.java | 4 + .../mapper/screen/DataStatsScreencollDao.xml | 75 +++++++++++-------- .../esua/epdc/feign/AnalysisFeignClint.java | 20 +++++ .../fallback/AnalysisFeignClintFallback.java | 10 +++ .../task/screen/PushDataEveryDayTaskImpl.java | 51 ++++++++++++- .../screen/PushDataEveryFiveMinTaskImpl.java | 35 ++------- 7 files changed, 140 insertions(+), 65 deletions(-) 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 b6722dbac..818db6b4e 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 @@ -40,6 +40,11 @@ public class PioneerdataResultDTO implements Serializable { */ private Integer userTotal; + /** + *党员发布议题数 + */ + private Integer publishIssueTotal; + /** *议事数 */ @@ -85,4 +90,9 @@ public class PioneerdataResultDTO implements Serializable { */ private String publishIssueRatio; + /** + *数据更新至: 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/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 35a2a6db2..c0f0acab8 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 @@ -114,6 +114,10 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl list = baseDao.publicpartitotaldata(); + // 将list转换为json格式 + String json = JSONObject.toJSONString(list); + 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 31954da69..3f08b8e5f 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 @@ -10,9 +10,9 @@ total.orgName, total.parentId, 'grid' as orgType, - SUM( total.USER_TOTAL) AS USER_TOTAL, - SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL, - SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, SUM( total.ageLevel1 ) AS ageLevel1, SUM( total.ageLevel2 ) AS ageLevel2, SUM( total.ageLevel3 ) AS ageLevel3, @@ -88,9 +88,9 @@ total.orgName, total.parentId, 'department' as orgType, - SUM( total.USER_TOTAL) AS USER_TOTAL, - SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL, - SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, SUM( total.ageLevel1 ) AS ageLevel1, SUM( total.ageLevel2 ) AS ageLevel2, SUM( total.ageLevel3 ) AS ageLevel3, @@ -168,9 +168,9 @@ total.orgName, total.parentId, 'department' as orgType, - SUM( total.USER_TOTAL) AS USER_TOTAL, - SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL, - SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, SUM( total.ageLevel1 ) AS ageLevel1, SUM( total.ageLevel2 ) AS ageLevel2, SUM( total.ageLevel3 ) AS ageLevel3, @@ -251,9 +251,9 @@ total.orgName, total.parentId, 'department' as orgType, - SUM( total.USER_TOTAL) AS USER_TOTAL, - SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL, - SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, SUM( total.ageLevel1 ) AS ageLevel1, SUM( total.ageLevel2 ) AS ageLevel2, SUM( total.ageLevel3 ) AS ageLevel3, @@ -536,8 +536,8 @@ IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户) IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户) IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户) - IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio -- 党员发布议题占比(党员/用户) - + IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户) + DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime FROM esua_epdc_admin.sys_dept gr left join (select total.GRID_ID, @@ -643,7 +643,8 @@ UNION ALL IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户) IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户) IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户) - IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio -- 党员发布议题占比(党员/用户) + IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户) + DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime FROM esua_epdc_admin.sys_dept co LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid left join @@ -751,7 +752,8 @@ union all IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户) IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户) IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户) - IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio -- 党员发布议题占比(党员/用户) + IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户) + DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime FROM esua_epdc_admin.sys_dept st left join esua_epdc_admin.sys_dept co on co.pid=st.id LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid @@ -861,7 +863,8 @@ union all IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户) IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户) IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户) - IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio -- 党员发布议题占比(党员/用户) + IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户) + DATE_FORMAT(now(),'%Y-%m-%d') as dataEndTime FROM esua_epdc_admin.sys_dept city left join esua_epdc_admin.sys_dept st on st.pid=city.id left join esua_epdc_admin.sys_dept co on co.pid=st.id @@ -1362,6 +1365,7 @@ union all select d.id as orgId, d.name as orgName, d.pid as parentId, + 'grid' as orgType, date_format( now( ), '%Y' ) as yearId, date_format( now( ), '%Y-%m' ) as monthId, (CASE WHEN ed.DAILY_TYPE='10' THEN 'party' @@ -1395,6 +1399,7 @@ union all -- 社区 select community.orgId, community.orgName, community.parentId, + 'department' as orgType, community.yearId, community.monthId, community.type, @@ -1475,6 +1480,7 @@ union all -- 街道 select street.orgId, street.orgName, street.parentId, + 'department' as orgType, street.yearId, street.monthId, street.type, @@ -1558,6 +1564,7 @@ union all -- 市北区 select city.orgId, city.orgName, city.parentId, + 'department' as orgType, city.yearId, city.monthId, city.type, @@ -1693,6 +1700,7 @@ union all -- 市北区 '1201689212329746433') diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java index 28743eac2..8e8f55906 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java @@ -89,4 +89,24 @@ public interface AnalysisFeignClint { @PostMapping("analysis/data/stats/screencoll/usertotaldata") Result usertotaldata(); + /** + * @describe: 公众参与各类总数 + * @author wangtong + * @date 2020/8/25 16:41 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/publicpartitotaldata") + Result publicpartitotaldata(); + + /** + * @describe: 基层党建-建设情况数据（支部、联建、志愿） + * @author wangtong + * @date 2020/8/25 16:41 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("analysis/data/stats/screencoll/meetdata") + Result meetdata(); + } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java index b5d1a09fe..8c026032a 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java @@ -53,4 +53,14 @@ public class AnalysisFeignClintFallback implements AnalysisFeignClint { public Result usertotaldata() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "usertotaldata", ""); } + + @Override + public Result publicpartitotaldata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "publicpartitotaldata", ""); + } + + @Override + public Result meetdata() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "meetdata", ""); + } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java index df605c0bb..80099e50d 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.task.screen; +import com.elink.esua.epdc.feign.AnalysisFeignClint; import com.elink.esua.epdc.feign.CloudAnalysisFeignClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,9 +29,12 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { @Autowired private CloudAnalysisFeignClient cloudAnalysisFeignClient; + @Autowired + private AnalysisFeignClint analysisFeignClint; + @Override public void run() { - for(int i = 0 ; i < 5 ; i++){ + for(int i = 0 ; i < 9 ; i++){ Integer integer = createThread(i); } @@ -63,6 +67,18 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { } else if (methodIndex == 4){ // 调用-->基层治理-公众参与 userjoin(); + } else if (methodIndex == 5){ + // 调用-->党建引领-党员联系群众数据 + partylinkmassesdata(); + } else if (methodIndex == 6){ + // 调用-->党建引领-先锋模范数据 + pioneerdata(); + } else if (methodIndex == 7){ + // 调用-->公众参与各类总数 + publicpartitotaldata(); + }else if (methodIndex == 8){ + // 调用-->基层党建-建设情况数据（支部、联建、志愿） + meetdata(); } return 0; } @@ -71,7 +87,7 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { try { isSuccess = future.get(); }catch (Exception e){ - + e.printStackTrace(); } return isSuccess; @@ -144,6 +160,37 @@ public class PushDataEveryDayTaskImpl implements PushDataEveryDayTask { } + public void partylinkmassesdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务开始执行"); + analysisFeignClint.partylinkmassesdata(); + logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务执行结束"); + } + + + public void pioneerdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务开始执行"); + analysisFeignClint.pioneerdata(); + logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务执行结束"); + } + + public void publicpartitotaldata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|公众参与各类总数>定时任务开始执行"); + analysisFeignClint.publicpartitotaldata(); + logger.info("<"+methodName+"|公众参与各类总数>定时任务执行结束"); + } + public void meetdata() { + //方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<"+methodName+"|基层党建-建设情况数据（支部、联建、志愿）>定时任务开始执行"); + analysisFeignClint.meetdata(); + logger.info("<"+methodName+"|基层党建-建设情况数据（支部、联建、志愿）>定时任务执行结束"); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java index 552e70232..aa2388fb3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java @@ -31,7 +31,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { @Override public void run() { - for(int i = 0 ; i < 5 ; i++){ + for(int i = 0 ; i < 3 ; i++){ Integer integer = createThread(i); } @@ -50,19 +50,13 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { //调用相对比较耗时的发送消息接口 Thread.sleep(200); if (methodIndex == 0) { - // 调用--> + // 调用-->党员基本情况 cpcbasedata(); } else if (methodIndex == 1){ - // 调用--> + // 调用-->事件数据 eventdata(); } else if (methodIndex == 2){ - // 调用--> - partylinkmassesdata(); - } else if (methodIndex == 3){ - // 调用--> - pioneerdata(); - } else if (methodIndex == 4){ - // 调用--> + // 调用-->中央区各类总数 usertotaldata(); } return 0; @@ -72,7 +66,7 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { try { isSuccess = future.get(); }catch (Exception e){ - + e.printStackTrace(); } return isSuccess; @@ -96,25 +90,6 @@ public class PushDataEveryFiveMinTaskImpl implements PushDataEveryFiveMinTask { logger.info("<"+methodName+"|事件数据>定时任务执行结束"); } - - public void partylinkmassesdata() { - //方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务开始执行"); - analysisFeignClint.partylinkmassesdata(); - logger.info("<"+methodName+"|党建引领-党员联系群众数据>定时任务执行结束"); - } - - - public void pioneerdata() { - //方法名 - String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); - logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务开始执行"); - analysisFeignClint.pioneerdata(); - logger.info("<"+methodName+"|党建引领-先锋模范数据>定时任务执行结束"); - } - - public void usertotaldata() { //方法名 String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();