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

大屏基础上报 bug修改

feature/screenDataPush
songyunpeng 4 years ago
parent
518cbbb5dd
commit
a6efac257a
2 changed files with 78 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
  2. 284
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml

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

@ -91,7 +91,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
List<GridGroupTotalResultDTO> gridGroupTotalResultDTOS = baseDao.selectGridGroupTotalList(customerId); List<GridGroupTotalResultDTO> gridGroupTotalResultDTOS = baseDao.selectGridGroupTotalList(customerId);
String dataJson = ScreenDataUtils.getScreenDateJson(gridGroupTotalResultDTOS,true); String dataJson = ScreenDataUtils.getScreenDateJson(gridGroupTotalResultDTOS,true);
// 数据上报 // 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson);
log.info(body);
return new Result(); return new Result();
} }
@ -119,7 +120,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
List<CommunityHotTopicResultDTO> communityHotTopicResultDTOS = baseDao.selectAgencyHotTopic(customerId); List<CommunityHotTopicResultDTO> communityHotTopicResultDTOS = baseDao.selectAgencyHotTopic(customerId);
String dataJson = ScreenDataUtils.getScreenDateJson(communityHotTopicResultDTOS,true); String dataJson = ScreenDataUtils.getScreenDateJson(communityHotTopicResultDTOS,true);
// 数据上报 // 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC, dataJson); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC, dataJson);
log.info(body);
return new Result(); } return new Result(); }
@Override @Override

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

@ -169,7 +169,7 @@
ifnull(count(et.ID),0) as issueTotal, ifnull(count(et.ID),0) as issueTotal,
ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0) as issueIncr ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0) as issueIncr
from esua_epdc_admin.sys_dept grid from esua_epdc_admin.sys_dept grid
left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.PARTY_MEMBER = '1' left join esua_epdc_events.epdc_issue et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where grid.del_flag = '0' where grid.del_flag = '0'
and grid.type_key = 'grid_party' and grid.type_key = 'grid_party'
@ -196,7 +196,7 @@
ifnull(count(et.ID),0) as issueTotal, ifnull(count(et.ID),0) as issueTotal,
ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0) as issueIncr ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0) as issueIncr
from esua_epdc_admin.sys_dept sd from esua_epdc_admin.sys_dept sd
left join esua_epdc_party_group.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' and et.`PARTY_MEMBER` = '1' left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
where sd.del_flag = '0' where sd.del_flag = '0'
and sd.type_key in ( 'street_party', 'community_party' ) and sd.type_key in ( 'street_party', 'community_party' )
@ -366,224 +366,88 @@ and grid.id not in
group by sd.id; group by sd.id;
</select> </select>
<select id="selectGridHotTopic" resultType="com.elink.esua.epdc.dto.screen.result.GridHotTopicResultDTO"> <select id="selectGridHotTopic" resultType="com.elink.esua.epdc.dto.screen.result.GridHotTopicResultDTO">
SELECT select a.*,
'${customId}' as customerId, (ifnull(a.partyTopicTotal, 0)+ ifnull(b.issueTotal, 0)) as topicTotal
DATE_FORMAT( from(
date_add(now(), INTERVAL - 1 DAY), SELECT '${customId}' as customerId,
'%Y%m%d' DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y%m%d') AS dateId,
) AS dateId, CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'W', WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
CONCAT( DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
DATE_FORMAT( CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) quarterId,
STR_TO_DATE( DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
),
'W',
WEEK (
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m-%d'
)
)
) weekId,
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
) AS yearId,
CONCAT(
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
),
'Q',
QUARTER (
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m-%d'
)
)
) quarterId,
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m'
),
'%Y%m'
) AS monthId,
sd.id AS gridId, sd.id AS gridId,
sd.pid AS agencyId, sd.pid AS agencyId,
IFNULL(COUNT(et.id), 0) AS topicTotal, IFNULL(COUNT(et.id), 0) AS partyTopicTotal,
'hot_discuss' AS STATUS, 'hot_discuss' AS STATUS,
IFNULL( IFNULL(SUM(CASE WHEN et.STATE= '0' THEN 1 ELSE 0 END), 0) AS topicCount
SUM( FROM esua_epdc_admin.sys_dept sd
CASE LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id= et.GRID_ID
WHEN et.STATE = '0' THEN AND et.DEL_FLAG= '0'
1 AND DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d')
ELSE WHERE sd.del_flag= '0'
0 AND sd.type_key= 'grid_party'
END AND sd.id NOT IN(
), SELECT t.dept_id
0 FROM esua_epdc_admin.sys_dept_config t
) AS topicCount WHERE t.del_flag= '0')
FROM GROUP BY sd.id) a
esua_epdc_admin.sys_dept sd left join(
LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id = et.GRID_ID select grid.id as gridId, ifnull(count(et.ID), 0) as issueTotal
AND et.DEL_FLAG = '0' from esua_epdc_admin.sys_dept grid
AND DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT( left join esua_epdc_events.epdc_issue et on et.GRID_ID= grid.ID
date_add(now(), INTERVAL - 1 DAY), and et.DEL_FLAG= '0'
'%Y-%m-%d' and et.IS_PARTY_MEMBER= '1'
) and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
WHERE where grid.del_flag= '0'
sd.del_flag = '0' and grid.type_key= 'grid_party'
AND sd.type_key = 'grid_party' and grid.id not in(
AND sd.id NOT IN ( SELECT t.DEPT_ID
SELECT FROM `esua_epdc_admin`.`sys_dept_config` t
t.dept_id WHERE t.DEL_FLAG= '0')
FROM group by grid.id) b on a.gridId= b.gridId
esua_epdc_admin.sys_dept_config t
WHERE
t.del_flag = '0'
)
GROUP BY
sd.id
</select> </select>
<select id="selectAgencyHotTopic" <select id="selectAgencyHotTopic"
resultType="com.elink.esua.epdc.dto.screen.result.CommunityHotTopicResultDTO"> resultType="com.elink.esua.epdc.dto.screen.result.CommunityHotTopicResultDTO">
SELECT SELECT a.*,(ifnull(a.partyTopicTotal,0) + ifnull(b.issueTotal,0)) as topicTotal from (
'${customId}' as customerId, SELECT '${customId}' as customerId,
DATE_FORMAT( DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y%m%d') AS dateId,
date_add(now(), INTERVAL - 1 DAY), CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'W', WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
'%Y%m%d' DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
) AS dateId, CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y'), '%Y'), 'Q', QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m-%d'))) quarterId,
CONCAT( DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
),
'W',
WEEK (
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m-%d'
)
)
) weekId,
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
) AS yearId,
CONCAT(
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y'
),
'%Y'
),
'Q',
QUARTER (
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m-%d'
)
)
) quarterId,
DATE_FORMAT(
STR_TO_DATE(
DATE_FORMAT(
date_add(now(), INTERVAL - 1 DAY),
'%Y-%m-%d'
),
'%Y-%m'
),
'%Y%m'
) AS monthId,
sd.id AS agencyId, sd.id AS agencyId,
sd.pid AS pid, sd.pid AS pid,
IFNULL(COUNT(et.id), 0) AS topicTotal, IFNULL(COUNT(et.id), 0) AS partyTopicTotal,
'hot_discuss' AS STATUS, 'hot_discuss' AS STATUS,
IFNULL( IFNULL(SUM(CASE WHEN et.STATE= '0' THEN 1 ELSE 0 END), 0) AS topicCount
SUM( FROM esua_epdc_admin.sys_dept sd
CASE
WHEN et.STATE = '0' THEN
1
ELSE
0
END
),
0
) AS topicCount
FROM
esua_epdc_admin.sys_dept sd
LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON find_in_set(sd.`id`, et.`ALL_DEPT_IDS`) LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON find_in_set(sd.`id`, et.`ALL_DEPT_IDS`)
AND et.DEL_FLAG = '0' AND et.DEL_FLAG= '0'
AND DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT( AND DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), INTERVAL - 1 DAY), '%Y-%m-%d')
date_add(now(), INTERVAL - 1 DAY), WHERE sd.del_flag= '0'
'%Y-%m-%d' AND sd.type_key IN('community_party', 'street_party')
) AND sd.id NOT IN(
WHERE SELECT t.dept_id
sd.del_flag = '0' FROM esua_epdc_admin.sys_dept_config t
AND sd.type_key IN ( WHERE t.del_flag= '0')
'community_party', GROUP BY sd.id)a
'street_party' left join
) (
AND sd.id NOT IN ( select sd.id as agencyId,
SELECT ifnull(count(et.ID), 0) as issueTotal
t.dept_id from esua_epdc_admin.sys_dept sd
FROM left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS)
esua_epdc_admin.sys_dept_config t and et.DEL_FLAG= '0'
WHERE and et.IS_PARTY_MEMBER= '1'
t.del_flag = '0' and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
) where sd.del_flag= '0'
GROUP BY and sd.type_key in('street_party', 'community_party')
sd.id and sd.id not in(
SELECT t.DEPT_ID
FROM `esua_epdc_admin`.`sys_dept_config` t
WHERE t.DEL_FLAG= '0')
group by sd.id)b on a.agencyId = b.agencyId
</select> </select>
<select id="selectGridIssue" resultType="com.elink.esua.epdc.dto.screen.result.GridIssueResultDTO"> <select id="selectGridIssue" resultType="com.elink.esua.epdc.dto.screen.result.GridIssueResultDTO">
SELECT SELECT

Write Preview
Loading…
Cancel
Save