From 0fe103d01e03df5bf866cdce788f39959c4b1f8b Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Wed, 24 Jul 2024 20:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/energy/service/impl/EleAirStrategyServiceImpl.java    | 3 ---
 .../njcn/energy/service/impl/LogicDeviceLineServiceImpl.java   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java
index 2635f2936..89a702cad 100644
--- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java
+++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java
@@ -20,7 +20,6 @@ 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.db.constant.DbConstant;
-import com.njcn.energy.handler.MqttMessageHandler;
 import com.njcn.energy.mapper.AirStrategyMapper;
 import com.njcn.energy.mapper.LogicDeviceLineMapper;
 import com.njcn.energy.pojo.dto.AirStrategyDTO;
@@ -75,7 +74,6 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
 
     private final AirStrategyMapper airStrategyMapper;
 
-    private final MqttMessageHandler mqttMessageHandler;
 
     private final InfluxDbUtils influxDbUtils;
 
@@ -527,7 +525,6 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
                                 publisher.send(topic, json, 1, false);
 
 
-                                //mqttMessageHandler.setMqttParam(0,topic,json);
                                 this.mqttSendCount = 0;
                                 this.mqttJsonMsg = json;
                                 this.mqttSendTopic = topic;
diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
index 8645db9c2..aa1092b20 100644
--- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
+++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java
@@ -414,7 +414,7 @@ public class LogicDeviceLineServiceImpl extends ServiceImpl<LogicDeviceLineMappe
                                         stringBuilderMax.append(listData.get(j).getName()).append(", ");
                                     }
                                 }
-                                stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time").append(InfluxDBPublicParam.TIME_ZONE);
+                                stringBuilderMax.append("from ").append(tableName + "_Real").append(" where").append(" LineId='" + lineId + "'").append(" order by time");
                                 List<Map<String, Object>> list = influxDbUtils.getResult(stringBuilderMax.toString(), "");
                                 if (CollectionUtil.isNotEmpty(list)) {
                                     for(int i=0;i<list.size();i++){