diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/utils/HarmonicTimesUtil.java b/pqs-common/common-core/src/main/java/com/njcn/common/utils/HarmonicTimesUtil.java
index 174936b2f..063f063f1 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/utils/HarmonicTimesUtil.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/utils/HarmonicTimesUtil.java
@@ -1,9 +1,5 @@
 package com.njcn.common.utils;
 
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-
-import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.ArrayList;
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
index 208e134b2..47c09bbd0 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
@@ -31,7 +31,7 @@ import java.util.Map;
         path = "/line",
         fallbackFactory = LineFeignClientFallbackFactory.class,
         contextId = "line")
-public interface LineFeignClient {
+    public interface LineFeignClient {
 
     /**
      * 获取终端状态信息
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 92ae57def..08d1da123 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
@@ -158,8 +158,10 @@
                         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
+--                         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
+                        COALESCE(d.flow, (SELECT flow FROM cld_flow_meal WHERE type = 0 AND flag = 1)) + COALESCE(d1.flow, 0) AS flowMeal,
+                        COALESCE(CAST(m.Actual_Value / 1024 / 1024 AS DECIMAL(7, 2)), 0) AS 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
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
index 97d71042f..a64fc18db 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
@@ -957,7 +957,7 @@ public class DayDataServiceImpl implements DayDataService {
      * @param endTime   结束时间
      * @return
      */
-    public List<DataV> getDataV(List<String> lineIndex, String startTime, String endTime) {
+    public List<DataV>  getDataV(List<String> lineIndex, String startTime, String endTime) {
         List<DataV> result = new ArrayList<>();
         //最小值
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);