elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【大屏展示】-【修改测试数据问题】-（王童）-2020/8/25

feature/dangjian
Jackwang 5 years ago
parent
bdc05af935
commit
c384f2e882
7 changed files with 140 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
  2. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java
  3. 75
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
  4. 20
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java
  5. 10
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java
  6. 51
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java
  7. 35
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java

10
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
View File

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

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

@ -114,6 +114,10 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
@Override
public Result publicpartitotaldata() {
List<PublicpartitotaldataResultDTO> list = baseDao.publicpartitotaldata();
// 将list转换为json格式
String json = JSONObject.toJSONString(list);
String body = EpmetUtils.httpPost("/data/stats/screencoll/publicpartitotaldata", json);
log.info(body);
return null;
}
}

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

@ -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')
</select>
<select id="publicpartitotaldata" resultType="com.elink.esua.epdc.dto.screen.result.PublicpartitotaldataResultDTO">
SELECT gr.id as orgId,
gr.name as orgName,
gr.pid as parentId,
@ -1761,13 +1769,13 @@ union all -- 市北区
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
FROM epdc_user_behavior_log behavior
LEFT JOIN meta_epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from meta_epdc_user meu )
FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
GROUP BY USER_ID, USER.DEPT_ID
) behaviorCount
GROUP BY behaviorCount.DEPT_ID) be
left join meta_sys_dept d1 on d1.ID = be.DEPT_ID
left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID
where d1.DEL_FLAG=0
group by d1.ID
@ -1886,13 +1894,13 @@ UNION ALL
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
FROM epdc_user_behavior_log behavior
LEFT JOIN meta_epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from meta_epdc_user meu )
FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
GROUP BY USER_ID, USER.DEPT_ID
) behaviorCount
GROUP BY behaviorCount.DEPT_ID) be
left join meta_sys_dept d1 on d1.ID = be.DEPT_ID
left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID
where d1.DEL_FLAG=0
group by d1.ID
@ -2013,13 +2021,13 @@ union all
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
FROM epdc_user_behavior_log behavior
LEFT JOIN meta_epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from meta_epdc_user meu )
FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
GROUP BY USER_ID, USER.DEPT_ID
) behaviorCount
GROUP BY behaviorCount.DEPT_ID) be
left join meta_sys_dept d1 on d1.ID = be.DEPT_ID
left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID
where d1.DEL_FLAG=0
group by d1.ID
@ -2142,13 +2150,13 @@ union all
count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag,
count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag,
count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag
FROM epdc_user_behavior_log behavior
LEFT JOIN meta_epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from meta_epdc_user meu )
FROM esua_epdc_analysis.epdc_user_behavior_log behavior
LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0'
WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu )
GROUP BY USER_ID, USER.DEPT_ID
) behaviorCount
GROUP BY behaviorCount.DEPT_ID) be
left join meta_sys_dept d1 on d1.ID = be.DEPT_ID
left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID
where d1.DEL_FLAG=0
group by d1.ID
@ -2194,5 +2202,6 @@ union all
and city.DEL_FLAG=0
and city.type_key='district_party' and city.party_code='shibei'
GROUP BY city.id
</select>
</mapper>

20
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClint.java
View File

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

10
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClintFallback.java
View File

@ -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", "");
}
}

51
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryDayTaskImpl.java
View File

@ -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+"|基层党建-建设情况数据（支部、联建、志愿）>定时任务执行结束");
}
}

35
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/PushDataEveryFiveMinTaskImpl.java
View File

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

Write Preview
Loading…
Cancel
Save