From fe0426520b812bfe80dc285e870c92c76e6d2de5 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Sat, 6 May 2023 14:52:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/po/TopMsgPO.java | 2 +- .../njcn/device/pq/mapper/TopMsgMapper.java | 4 +- .../mapper/mapping/TerminalMaintainMapper.xml | 51 +++++++++++++++---- .../device/pq/mapper/mapping/TopMagMapper.xml | 8 +-- .../pq/service/impl/LineServiceImpl.java | 9 +++- .../pq/service/impl/LogManageServiceImpl.java | 8 +-- .../com/njcn/event/pojo/po/EventDetail.java | 2 + 7 files changed, 63 insertions(+), 21 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java index e1494b59c..45db2c2e6 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TopMsgPO.java @@ -71,7 +71,7 @@ public class TopMsgPO extends BaseEntity { */ private float flowValue; - private Integer onlineRateFlag; + private String onlineRateFlag; private float onlineRateValue; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java index b64d07155..977274d58 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java @@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface TopMsgMapper { - Page getTopMsg(Page page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + Page dailyDeviceAbnormalStatistics(Page page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); - List getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime); + List dailyDeviceAbnormal(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index 47df006e1..92ae57def 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -159,7 +159,6 @@ b.IP DeviceIP, b.id deviceId, ifnull(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, --- ifnull(m.Actual_Value/1024/1024,0) statisValue ifnull(convert(m.Actual_Value/1024/1024,decimal(7,2)),0) statisValue FROM pq_line a INNER JOIN pq_line sub ON sub.id = a.pid @@ -169,14 +168,48 @@ 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 a.id in - - #{item} - - and - a.Create_Time between #{startTime} and #{endTime} - and - b.Run_Flag != 2 + WHERE a.id IN + + #{item} + + AND + m.Time_Id between #{startTime} and #{endTime} + AND + b.Run_Flag != 2 + ) t + ORDER BY flowProportion DESC + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml index 9c2efd925..0bd118339 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml @@ -2,7 +2,7 @@ - SELECT ptm.Time_Id AS time, IFNULL(COUNT(ptm.Dev_Id),3.14159)AS deviceAbnormalNum @@ -21,7 +21,7 @@ GROUP BY ptm.Time_Id - SELECT device.Id AS devId, city.Name AS cityName, @@ -44,9 +44,9 @@ INNER JOIN pqs_top_msg ptm ON ptm.Dev_Id = device.Id LEFT JOIN pq_line_detail pld ON pld.Id=line.Id WHERE - ptm.State=1 + ptm.State=1 AND - ptm.Time_Id = #{startTime} + ptm.Time_Id = #{startTime} AND pld.Line_Grade=#{lineGrade} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index d13f3b1f3..8b62aa833 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -391,14 +391,19 @@ public class LineServiceImpl extends ServiceImpl implements Li @Override public Page dailyDeviceAbnormalStatistics(PqsParam param) { - Page topMsg = topMsgMapper.getTopMsg(new Page(param.getPageNum(), param.getPageSize()), param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())), + Page topMsg = topMsgMapper.dailyDeviceAbnormalStatistics( + new Page(param.getPageNum(), param.getPageSize()), + param.getLineGrade(), + DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()))); return topMsg; } @Override public List dailyDeviceAbnormal(DeviceInfoParam.BusinessParam param) { - List topMsgDetails = topMsgMapper.getTopMsgDetail(param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))); + List topMsgDetails = topMsgMapper.dailyDeviceAbnormal( + param.getLineGrade(), + DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))); return topMsgDetails; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java index 2be5ee435..38d57c702 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java @@ -106,7 +106,7 @@ public class LogManageServiceImpl implements LogManageService { p.setSize(eventLogParam.getPageSize()); p.setCurrent(eventLogParam.getPageNum()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.between(EventPushLogs::getTimeId,DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchBeginTime())),DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchEndTime()))); + wrapper.between(EventPushLogs::getTimeId,DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(eventLogParam.getSearchEndTime()))); wrapper.eq(EventPushLogs::getResult,eventLogParam.getResult()); Page rawPage = eventPushLogsMapper.selectPage(p, wrapper); List rawLogs = rawPage.getRecords(); @@ -217,9 +217,11 @@ public class LogManageServiceImpl implements LogManageService { private boolean filterLineIdAndTime(EventDetail eventDetail, List eventPushLogs) { boolean flag = false; + String evenDetailTime = eventDetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); for (EventPushLogs log : eventPushLogs) { - if (log.getLineId().equals(eventDetail.getLineId()) && eventDetail.getStartTime().isEqual(log.getTimeId())) { - flag=true; + String logTime = log.getTimeId().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + if (log.getLineId().equals(eventDetail.getLineId()) && evenDetailTime.equals(logTime)) { + flag = true; } } return flag; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java index 07295e390..0c536c5c7 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java @@ -1,5 +1,6 @@ package com.njcn.event.pojo.po; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer; @@ -22,6 +23,7 @@ import java.util.concurrent.TimeUnit; @Data @Measurement(name = "pqs_eventdetail") +//@TableName("r_mp_event_detail") public class EventDetail { @Column(name = "line_id")