Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

重复数据优化

Browse Source
This commit is contained in:
zhuxinyu
2023-04-21 14:45:36 +08:00
parent f13711161a
commit dfa8b6e751
2 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -840,33 +840,44 @@
</select> </select>
<select id="getNewDeviceFlowStatistics" resultType="LineFlowMealDetailVO"> <select id="getNewDeviceFlowStatistics" resultType="LineFlowMealDetailVO">
select t.*,
(t.statisValue)/t.flowMeal flowProportion
from (
SELECT SELECT
device.Name name, ANY_VALUE(t.ID) id,
sub.Name substation, ANY_VALUE(t.name) name,
device.Update_Time updateTime, ANY_VALUE(t.substation) substation,
b.run_flag runFlag, ANY_VALUE(t.updateTime) updateTime,
b.com_flag comFlag, ANY_VALUE(t.runFlag) runFlag,
ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, ANY_VALUE(t.comFlag) comFlag,
ROUND(ifnull(m.Actual_Value,0)/1024/1024,2) statisValue ANY_VALUE(t.flowMeal) flowMeal,
FROM cld_month_flow m SUM(t.statisValue) statisValue,
INNER JOIN pq_line device ON device.id=m.Dev_Id ROUND(SUM(t.statisValue)/flowMeal,2) flowProportion
INNER JOIN pq_device b ON device.id=b.id from (
INNER JOIN pq_line sub ON device.pid = sub.id SELECT
LEFT JOIN cld_dev_meal c ON b.id = c.line_id device.id id,
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id device.Name name,
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id sub.Name substation,
where device.id in device.Update_Time updateTime,
<foreach item="item" collection="devs" separator="," open="(" close=")"> b.run_flag runFlag,
#{item} b.com_flag comFlag,
</foreach> ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
and ROUND(ifnull(m.Actual_Value,0)/1024/1024,2) statisValue
m.Time_Id between #{startTime} and #{endTime} FROM cld_month_flow m
and INNER JOIN pq_line device ON device.id=m.Dev_Id
b.Run_Flag != 2 INNER JOIN pq_device b ON device.id=b.id
) t ORDER BY flowProportion DESC INNER JOIN pq_line sub ON device.pid = sub.id
LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
where device.id in
<foreach item="item" collection="devs" separator="," open="(" close=")">
#{item}
</foreach>
and
m.Time_Id between #{startTime} and #{endTime}
and
b.Run_Flag != 2
) t
GROUP BY t.id
ORDER BY flowProportion DESC
</select> </select>
<select id="getFlowLineInfoByTableList" resultType="LineFlowMealDetailVO"> <select id="getFlowLineInfoByTableList" resultType="LineFlowMealDetailVO">

7
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -379,10 +379,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
@Override @Override
public Page<LineFlowMealDetailVO> getNewDeviceRunStatistics(PqsParam deviceInfoParam) { public Page<LineFlowMealDetailVO> getNewDeviceRunStatistics(PqsParam deviceInfoParam) {
List<String> deviceIndexes = new ArrayList<>(); List<String> deviceIndexes = new ArrayList<>();
Page<LineFlowMealDetailVO> page = new Page();
List<GeneralDeviceDTO> deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList())); List<GeneralDeviceDTO> deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList()));
deviceInfoList.stream().map(GeneralDeviceDTO::getDeviceIndexes).forEach(deviceIndexes::addAll); deviceInfoList.stream().map(GeneralDeviceDTO::getDeviceIndexes).forEach(deviceIndexes::addAll);
page = lineMapper.getNewDeviceFlowStatistics( Page<LineFlowMealDetailVO> page = lineMapper.getNewDeviceFlowStatistics(
new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()), new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
deviceIndexes, deviceIndexes,
DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())), DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
@@ -392,12 +391,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
@Override @Override
public Page<TopMsgPO> dailyDeviceAbnormalStatistics(PqsParam param) { public Page<TopMsgPO> dailyDeviceAbnormalStatistics(PqsParam param) {
long start = System.currentTimeMillis();
Page topMsg = topMsgMapper.getTopMsg(new Page(param.getPageNum(), param.getPageSize()), param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())), Page topMsg = topMsgMapper.getTopMsg(new Page(param.getPageNum(), param.getPageSize()), param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))); DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())));
long end = System.currentTimeMillis();
System.out.println("====================================");
System.out.println(end-start);
return topMsg; return topMsg;
} }