问题单修复

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;
 

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<TopMsgPO> getTopMsg(Page<TopMsgPO> page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
+   Page<TopMsgPO> dailyDeviceAbnormalStatistics(Page<TopMsgPO> page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
-   List<TopMsgPO> getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime);
+   List<TopMsgPO> dailyDeviceAbnormal(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime);
 
 
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml

@@ -159,7 +159,40 @@
                         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
+                INNER JOIN pq_line gd ON gd.id = sub.pid
+                INNER JOIN pq_device b ON a.id = b.id
+                LEFT JOIN  cld_month_flow m ON b.id = m.Dev_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 a.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
+        ORDER BY flowProportion DESC
+    </select>
+
+    <select id="getMonthFlowNew" resultType="com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO">
+        select t.*,
+        (t.statisValue)/t.flowMeal flowProportion
+        from (
+        SELECT
+        a.id id,
+        a.name deviceName,
+        a.level,
+        sub.name substation,
+        gd.name electricPowerCompany,
+        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(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
@@ -174,7 +207,7 @@
             #{item}
         </foreach>
         and
-                a.Create_Time between #{startTime} and #{endTime}
+        m.Time_Id between #{startTime} and #{endTime}
         and
         b.Run_Flag != 2
         ) t

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.device.pq.mapper.TopMsgMapper">
 
-    <select id="getTopMsg" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
+    <select id="dailyDeviceAbnormalStatistics" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
         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>
 
-    <select id="getTopMsgDetail" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
+    <select id="dailyDeviceAbnormal" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
         SELECT
             device.Id AS devId,
             city.Name AS cityName,

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<LineMapper, Line> implements Li
 
     @Override
     public Page<TopMsgPO> 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<TopMsgPO> dailyDeviceAbnormal(DeviceInfoParam.BusinessParam param) {
-        List<TopMsgPO> topMsgDetails = topMsgMapper.getTopMsgDetail(param.getLineGrade(), DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())));
+        List<TopMsgPO> topMsgDetails = topMsgMapper.dailyDeviceAbnormal(
+                param.getLineGrade(),
+                DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())));
         return topMsgDetails;
     }
 

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<EventPushLogs> 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<EventPushLogs> rawPage = eventPushLogsMapper.selectPage(p, wrapper);
         List<EventPushLogs> rawLogs = rawPage.getRecords();
@@ -217,9 +217,11 @@ public class LogManageServiceImpl implements LogManageService {
 
     private boolean filterLineIdAndTime(EventDetail eventDetail,  List<EventPushLogs> 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())) {
+            String logTime = log.getTimeId().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                flag=true;
+            if (log.getLineId().equals(eventDetail.getLineId()) && evenDetailTime.equals(logTime)) {
+                flag = true;
             }
         }
         return flag;

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")