From 1819b87c6a240fc4a4aaf32083b1adcc0ed814a6 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Wed, 26 Apr 2023 09:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E4=BA=8B=E4=BB=B6=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/pojo/po/EventPushLogs.java |  28 +--
 .../pq/pojo/vo/TerminalDaliyFlowVO.java       |   3 +
 .../device/pq/mapper/EventPushLogsMapper.java |   8 +
 .../pq/mapper/mapping/EventPushLogsMapper.xml |   5 +
 .../pq/mapper/mapping/RateOfFlowMapper.xml    |   2 +-
 .../mapper/mapping/TerminalMaintainMapper.xml |  66 +++----
 .../pq/service/impl/FlowMealServiceImpl.java  |   6 +-
 .../pq/service/impl/LogManageServiceImpl.java | 177 +++++++++++++-----
 .../impl/TerminalMaintainServiceImpl.java     |  15 +-
 .../Impl/EventDetailServiceImpl.java          |   4 -
 10 files changed, 199 insertions(+), 115 deletions(-)
 create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java
 create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java
index aebce0cae..3ee803bb3 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java
@@ -1,10 +1,12 @@
 package com.njcn.device.pq.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
 
 import java.time.Instant;
+import java.time.LocalDateTime;
 
 /**
  * @version 1.0.0
@@ -12,27 +14,25 @@ import java.time.Instant;
  * @date: 2022/06/09 11:00
  */
 @Data
-@Measurement(name = "pqs_event_push_logs")
+@TableName("cld_event_push_log")
 public class EventPushLogs {
 
-    @Column(name = "time")
-    private Instant timeId;
+    @TableId("Time_Id")
+    private LocalDateTime timeId;
 
-    @Column(name = "line_id")
+    @TableField("Line_Id")
     private String lineId;
 
-    @Column(name = "create_time")
-    private String createTime;
+    @TableField("Create_Time")
+    private LocalDateTime createTime;
 
-    @Column(name = "update_time")
-    private String updateTime;
+    @TableField("Update_Time")
+    private LocalDateTime updateTime;
 
-    @Column(name = "push_failed")
+    @TableField("Push_Failed")
     private Integer pushFailed;
 
-    @Column(name = "result")
+    @TableField("Result")
     private Integer result;
 
-
-
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java
index 9f7b2f3b0..d234eaba4 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java
@@ -1,5 +1,6 @@
 package com.njcn.device.pq.pojo.vo;
 
+import com.njcn.device.pq.pojo.po.DevFuction;
 import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,6 +33,8 @@ public class TerminalDaliyFlowVO {
     private Float flowMeal;
     @ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合")
     private List<DeviceDayFlow> deviceDayFlowsList;
+    @ApiModelProperty(name = "functions",value = "装置功能码集合")
+    private List<DevFuction> functions;
 
 
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java
new file mode 100644
index 000000000..7dfd60b7c
--- /dev/null
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java
@@ -0,0 +1,8 @@
+package com.njcn.device.pq.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.po.EventPushLogs;
+
+
+public interface EventPushLogsMapper extends BaseMapper<EventPushLogs> {
+}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml
new file mode 100644
index 000000000..fd2b0d162
--- /dev/null
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.EventPushLogsMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
index 06ede2cc5..d8dda671f 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
@@ -38,7 +38,7 @@
         `Update_Time` updateTime
         FROM
         cld_flow_meal
-        WHERE Type =0 OR Type =1 AND Flag =1
+        WHERE Type =0 AND Flag =1
     </select>
 
     <update id="updateByState">
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 aa88ddc0c..47df006e1 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
@@ -3,39 +3,39 @@
 <mapper namespace="com.njcn.device.pq.mapper.TerminalMaintainMapper">
 
     <select id="getTerminalDevInfo" resultType="TerminalMaintainVO">
-    SELECT
-    a.id,
-    a.pid,
-	a.NAME,
-	a.level,
-	b.run_flag,
-	b.com_flag,
-	e.NAME devType,
-	ifnull(g.name,'/') version,
-	ifnull(d.flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal,
-	ifnull(d1.flow,0) reamFlowMeal,
-    ROUND(ifnull(mo.Actual_Value,0)/1024/1024,2) statisValue
-FROM
-	pq_line a
-	INNER JOIN pq_device b ON a.id = b.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
-	LEFT JOIN sys_dict_data e ON b.dev_type = e.id
-	LEFT JOIN cld_dev_version f on a.id = f.line_id and f.flag = 1 and f.state = 1
-	LEFT JOIN cld_version g on f.version_id = g.id
-	LEFT JOIN
-	(select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.Dev_Id
-    where a.id in
-        <foreach collection="devIds" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        <if test="comFlag != null">
-            AND b.Com_Flag=#{comFlag}
-        </if>
-        <if test="devType !=null and devType != ''">
-            AND b.Dev_Type =#{devType}
-        </if>
+            SELECT
+                a.id,
+                a.pid,
+                a.NAME,
+                a.level,
+                b.run_flag,
+                b.com_flag,
+                e.NAME devType,
+                ifnull(g.name,'/') version,
+                ifnull(d.flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal,
+                ifnull(d1.flow,0) reamFlowMeal,
+                ROUND(ifnull(mo.Actual_Value,0)/1024/1024,2) statisValue
+        FROM
+            pq_line a
+            INNER JOIN pq_device b ON a.id = b.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
+            LEFT JOIN sys_dict_data e ON b.dev_type = e.id
+            LEFT JOIN cld_dev_version f on a.id = f.line_id and f.flag = 1 and f.state = 1
+            LEFT JOIN cld_version g on f.version_id = g.id
+            LEFT JOIN
+            (select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.Dev_Id
+            where a.id in
+                <foreach collection="devIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                <if test="comFlag != null">
+                    AND b.Com_Flag=#{comFlag}
+                </if>
+                <if test="devType !=null and devType != ''">
+                    AND b.Dev_Type =#{devType}
+                </if>
     </select>
 
     <select id="getGdAndSubList" resultType="TerminalMaintainVO">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
index eff124aae..bcce56f9e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
@@ -53,13 +53,13 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
 
     @Override
     public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) {
-        checkCode(flowMealUpdateParam, true);
+        if (flowMealUpdateParam.getType() ==0 ) {
+            checkCode(flowMealUpdateParam, true);
+        }
         FlowMeal flowMeal = new FlowMeal();
         BeanUtils.copyProperties(flowMealUpdateParam, flowMeal);
         flowMeal.setUpdateBy(RequestUtil.getUserIndex());
         flowMeal.setUpdateTime(LocalDateTime.now());
-        //查询修改前的数据
-        FlowMeal newFlowMeal = this.getById(flowMeal.getId());
         boolean b = this.updateById(flowMeal);
         if (b) {
             return true;
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 3e0298973..217c8775d 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
@@ -1,13 +1,19 @@
 package com.njcn.device.pq.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.njcn.device.pq.mapper.EventPushLogsMapper;
+import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.LogManageMapper;
 import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
 import com.njcn.device.pq.pojo.param.DeviceLogParam;
 import com.njcn.device.pq.pojo.param.EventLogParam;
 import com.njcn.device.pq.pojo.po.EventPushLogs;
 import com.njcn.device.pq.pojo.po.TerminalLogs;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.DeviceLogVO;
 import com.njcn.device.pq.pojo.vo.EventLogVO;
 import com.njcn.device.pq.service.LogManageService;
@@ -27,6 +33,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -45,6 +52,10 @@ public class LogManageServiceImpl implements LogManageService {
 
     private final InfluxDbUtils influxDbUtils;
 
+    private final EventPushLogsMapper eventPushLogsMapper;
+
+    private final LineMapper lineMapper;
+
     @Override
     public Page<DeviceLogVO> getDeviceLogData(DeviceLogParam deviceLogParam) {
         Page<DeviceLogVO> page = new Page<>();
@@ -90,62 +101,124 @@ public class LogManageServiceImpl implements LogManageService {
         page.setSize(eventLogParam.getPageSize());
         page.setCurrent(eventLogParam.getPageNum());
         List<EventLogVO> list = new ArrayList<>();
-        /** 查询event_push_logs表数据*/
-        List<EventPushLogs> eventPushLogs = getEventPushLogs(eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getResult());
-        //待分页数据总量
-        page.setTotal(eventPushLogs.size());
-        //分页总页数
-        int pages = (int)Math.ceil(eventPushLogs.size()*1.0/eventLogParam.getPageSize());
-        page.setPages(pages);
-        if (!CollectionUtils.isEmpty(eventPushLogs)) {
-            List<String> lineIndexes = eventPushLogs.stream().map(EventPushLogs::getLineId).collect(Collectors.toList());
-            lineIndexes = lineIndexes.stream().distinct().collect(Collectors.toList());
-            /** 分页查询pqs_eventdetail表数据*/
-            List<EventDetail> eventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData();
-            if (!CollectionUtils.isEmpty(eventDetailData)) {
-                for (EventPushLogs pushLogs: eventPushLogs) {
-                    for (EventDetail eventDetail: eventDetailData) {
-                        if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getStartTime())) {
-                            EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId());
-                            if (Objects.isNull(event)) {
-                                continue;
-                            }
-                            EventLogVO eventLogVO = new EventLogVO();
-                            eventLogVO.setLineId(pushLogs.getLineId());
-                            LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault());
-                            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-                            String format = dateTimeFormatter.format(localDateTime);
-                            eventLogVO.setTime(format);
-                            eventLogVO.setLine(event.getLine());
-                            eventLogVO.setSubstation(event.getSubstation());
-                            eventLogVO.setPowerCompany(event.getPowerCompany());
-                            Double e = eventDetail.getFeatureAmplitude();
-                            BigDecimal bd = new BigDecimal(e);
-                            e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
-                            eventLogVO.setEventValue(String.valueOf(e*100));
-                            double i = eventDetail.getDuration() / 1000;
-                            eventLogVO.setPersistTime(String.valueOf(i));
-                            eventLogVO.setCreatTime(pushLogs.getCreateTime());
-                            eventLogVO.setCreatTimed(pushLogs.getCreateTime());
-                            eventLogVO.setPushFailed(pushLogs.getPushFailed());
-                            if (pushLogs.getResult()==0) {
-                                eventLogVO.setResult("失败");
-                                eventLogVO.setState("未推送");
-                            } else {
-                                eventLogVO.setResult("成功");
-                                eventLogVO.setState("已推送");
-                            }
-                            eventLogVO.setUpdateTime(pushLogs.getUpdateTime());
-
-                            list.add(eventLogVO);
-                        }
-                    }
+        // influxDB改查MySQL cld_event_push_log
+        Page<EventPushLogs> p = new Page<>();
+        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.eq(EventPushLogs::getResult,eventLogParam.getResult());
+        Page<EventPushLogs> rawPage = eventPushLogsMapper.selectPage(p, wrapper);
+        List<EventPushLogs> rawLogs = rawPage.getRecords();
+        if (CollectionUtil.isNotEmpty(rawLogs)) {
+            List<String> lineIndexes = rawLogs.stream().map(EventPushLogs::getLineId).distinct().collect(Collectors.toList());
+            List<EventDetail> rawEventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData();
+            List<EventDetail> eventDetails = rawEventDetailData.stream().filter(eventDetail -> filterLineIdAndTime(eventDetail, rawLogs)).collect(Collectors.toList());
+            Map<String, List<EventDetail>> eventDetailMap = eventDetails.stream().collect(Collectors.groupingBy(EventDetail::getLineId));
+            List<String> lineList = eventDetails.stream().map(EventDetail::getLineId).collect(Collectors.toList());
+            List<AreaLineInfoVO> lineAreaInfos = lineMapper.getBaseLineAreaInfo(lineList, null, null);
+            Map<String, List<AreaLineInfoVO>> areaMap = lineAreaInfos.stream().collect(Collectors.groupingBy(AreaLineInfoVO::getLineId));
+            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+            for (EventPushLogs rawLog : rawLogs) {
+                if (Objects.isNull(areaMap.get(rawLog.getLineId()).get(0)) || Objects.isNull(eventDetailMap.get(rawLog.getLineId()).get(0))) {
+                    continue;
                 }
+                EventLogVO eventLogVO = new EventLogVO();
+                eventLogVO.setLineId(rawLog.getLineId());
+                eventLogVO.setTime(dateTimeFormatter.format(rawLog.getTimeId()));
+                eventLogVO.setLine(areaMap.get(rawLog.getLineId()).get(0).getLineName());
+                eventLogVO.setSubstation(areaMap.get(rawLog.getLineId()).get(0).getSubName());
+                eventLogVO.setPowerCompany(areaMap.get(rawLog.getLineId()).get(0).getGdName());
+                Double e=eventDetailMap.get(rawLog.getLineId()).get(0).getFeatureAmplitude();
+                BigDecimal bd = new BigDecimal(e);
+                e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
+                eventLogVO.setEventValue(String.valueOf(e*100));
+                double i = eventDetailMap.get(rawLog.getLineId()).get(0).getDuration();
+                eventLogVO.setPersistTime(String.valueOf(i));
+                eventLogVO.setCreatTime(dateTimeFormatter.format(rawLog.getCreateTime()));
+                eventLogVO.setCreatTimed(dateTimeFormatter.format(rawLog.getCreateTime()));
+                eventLogVO.setPushFailed(rawLog.getPushFailed());
+                if (rawLog.getResult()==0) {
+                    eventLogVO.setResult("失败");
+                    eventLogVO.setState("未推送");
+                } else {
+                    eventLogVO.setResult("成功");
+                    eventLogVO.setState("已推送");
+                }
+                eventLogVO.setUpdateTime(dateTimeFormatter.format(rawLog.getUpdateTime()));
+
+                list.add(eventLogVO);
             }
-            //当前页数据
-            page.setRecords(list);
         }
         return page;
+
+
+//        /** 查询event_push_logs表数据*/
+//        List<EventPushLogs> eventPushLogs = getEventPushLogs(eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getResult());
+//        //待分页数据总量
+//        page.setTotal(eventPushLogs.size());
+//        //分页总页数
+//        int pages = (int)Math.ceil(eventPushLogs.size()*1.0/eventLogParam.getPageSize());
+//        page.setPages(pages);
+//        if (!CollectionUtils.isEmpty(eventPushLogs)) {
+//            List<String> lineIndexes = eventPushLogs.stream().map(EventPushLogs::getLineId).collect(Collectors.toList());
+//            lineIndexes = lineIndexes.stream().distinct().collect(Collectors.toList());
+//            /** 分页查询pqs_eventdetail表数据*/
+//            List<EventDetail> eventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData();
+//            if (!CollectionUtils.isEmpty(eventDetailData)) {
+//                for (EventPushLogs pushLogs: eventPushLogs) {
+//                    for (EventDetail eventDetail: eventDetailData) {
+//                        if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getStartTime())) {
+//                            EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId());
+//                            if (Objects.isNull(event)) {
+//                                continue;
+//                            }
+//                            EventLogVO eventLogVO = new EventLogVO();
+//                            eventLogVO.setLineId(pushLogs.getLineId());
+//                            LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault());
+//                            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+//                            String format = dateTimeFormatter.format(localDateTime);
+//                            eventLogVO.setTime(format);
+//                            eventLogVO.setLine(event.getLine());
+//                            eventLogVO.setSubstation(event.getSubstation());
+//                            eventLogVO.setPowerCompany(event.getPowerCompany());
+//                            Double e = eventDetail.getFeatureAmplitude();
+//                            BigDecimal bd = new BigDecimal(e);
+//                            e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
+//                            eventLogVO.setEventValue(String.valueOf(e*100));
+//                            double i = eventDetail.getDuration() / 1000;
+//                            eventLogVO.setPersistTime(String.valueOf(i));
+//                            eventLogVO.setCreatTime(pushLogs.getCreateTime());
+//                            eventLogVO.setCreatTimed(pushLogs.getCreateTime());
+//                            eventLogVO.setPushFailed(pushLogs.getPushFailed());
+//                            if (pushLogs.getResult()==0) {
+//                                eventLogVO.setResult("失败");
+//                                eventLogVO.setState("未推送");
+//                            } else {
+//                                eventLogVO.setResult("成功");
+//                                eventLogVO.setState("已推送");
+//                            }
+//                            eventLogVO.setUpdateTime(pushLogs.getUpdateTime());
+//
+//                            list.add(eventLogVO);
+//                        }
+//                    }
+//                }
+//            }
+//            //当前页数据
+//            page.setRecords(list);
+//        }
+//        return page;
+    }
+
+    private boolean filterLineIdAndTime(EventDetail eventDetail,  List<EventPushLogs> eventPushLogs) {
+        boolean flag = false;
+        for (EventPushLogs log : eventPushLogs) {
+            if (log.getLineId().equals(eventDetail.getLineId()) && eventDetail.getStartTime().isEqual(log.getTimeId())) {
+                flag=true;
+            }
+        }
+        return flag;
     }
 
     /**
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
index 073dc3ba9..3ef2771e1 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
@@ -8,6 +8,7 @@ import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.mapper.DevFuctionMapper;
 import com.njcn.device.pq.mapper.TerminalMaintainMapper;
 import com.njcn.device.pq.mapper.UserMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -72,10 +73,11 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
 
     private final IPqsTerminalLogsService iPqsTerminalLogsService;
 
+    private final DevFuctionMapper devFuctionMapper;
+
     @Override
     public List<TerminalMaintainVO> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) {
         List<TerminalMaintainVO> resList = new ArrayList<>();
-
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         deviceInfoParam.setLineGrade(terminalMainQueryParam.getLineGrade());
         deviceInfoParam.setDeptIndex(deptFeignClient.getRootDept().getData().getId());
@@ -84,7 +86,6 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
         deviceInfoParam.setStatisticalType(simpleDTO);
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Objects.isNull(terminalMainQueryParam.getRunFlag()) ? null : CollUtil.newArrayList(terminalMainQueryParam.getRunFlag()), CollUtil.newArrayList(1));
         if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) {
-
             for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
                 List<String> devIds = generalDeviceDTO.getDeviceIndexes();
                 if (CollectionUtils.isEmpty(devIds)) {
@@ -282,12 +283,10 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
     public List<TerminalDaliyFlowVO> getFlowManageDetail(TerminalMainQueryParam param) {
         List<TerminalDaliyFlowVO> list = new ArrayList<>();
         TerminalDaliyFlowVO flowManageDetail = terminalMaintainMapper.getFlowManageDetail(param.getDevId());
-//        if (flowManageDetail ==null) {
-//            flowManageDetail = new TerminalDaliyFlowVO();
-//            flowManageDetail.setBaseFlow(1024f);
-//            flowManageDetail.setExtendFlow(0f);
-//            flowManageDetail.setFlowMeal(1024f);
-//        }
+        QueryWrapper<DevFuction> funQueryWrapper = new QueryWrapper<>();
+        funQueryWrapper.lambda().eq(DevFuction::getLineId,param.getDevId());
+        List<DevFuction> functions = devFuctionMapper.selectList(funQueryWrapper);
+        flowManageDetail.setFunctions(functions);
         List<DeviceDayFlow> deviceDayFlowList = getFlowManageDetailFromInfluxDB(param);
         float sum = (float) deviceDayFlowList.stream().mapToDouble(DeviceDayFlow::getDailyActualValue).sum();
         flowManageDetail.setDeviceDayFlowsList(deviceDayFlowList);
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
index 652ba24f0..196ac1381 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
@@ -119,15 +119,11 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
 
     @Override
     public List<EventDetail> getEventDetailLimit(List<String> lineIndexes, String startTime, String endTime, Integer pageSize, Integer pageNum, List<String> waveType) {
-
         Page<RmpEventDetailPO> pageInfo = this.page(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIndexes)
                 .ge(StrUtil.isNotBlank(startTime), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(startTime)))
                 .le(StrUtil.isNotBlank(endTime), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(endTime)))
         );
-
         return BeanUtil.copyToList(pageInfo.getRecords(), EventDetail.class);
-
     }
-
 }