From fe0e17baa31923b5b3515a86b606c80c892dd51f Mon Sep 17 00:00:00 2001
From: qinjie <463333974@qq.com>
Date: Tue, 31 Dec 2024 17:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isu/gaswellwatch/service/impl/SummaryServiceImpl.java   | 6 ------
 src/main/resources/mapper/DeviceDao.xml                     | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
index e78fb14..5ea38ec 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java
@@ -42,12 +42,6 @@ public class SummaryServiceImpl  implements SummaryService {
             return  getPieSummaryVOS();
         }
 
-        //TODO 记得改回从缓存里取值
-//        Map<String,String> onlineMap = new HashMap<>();
-//        onlineMap.put("1","true");
-//        onlineMap.put("2","false");
-//        onlineMap.put("3","true");
-//        onlineMap.put("4","true");
         if(onlineMap.isEmpty()){
             return getPieSummaryVOS();
         }
diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml
index 03da5bb..0127dd2 100644
--- a/src/main/resources/mapper/DeviceDao.xml
+++ b/src/main/resources/mapper/DeviceDao.xml
@@ -116,7 +116,7 @@
     </select>
 
     <select id="getPressureChartData" resultType="com.isu.gaswellwatch.vo.DeviceHistoryVO">
-        select t.collection_time,t.oil_pressure,t.cas_pressure
+        select t.collection_time,t.oil_pressure,t.cas_pressure,t.pre_pressure
         from ${tableName} t
         <where>
                 t.device_id = #{deviceId}