From 591519d8578c3b2f842575f8e81043e01de54c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 4 Aug 2022 16:32:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=94=A8=E8=83=BD=E7=B3=BB=E7=BB=9F=E7=A9=BA?=
 =?UTF-8?q?=E8=B0=83=E5=85=B3=E6=9C=BA=E7=AD=96=E7=95=A5=202.=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E5=9D=97=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/energy/handler/MqttMessageHandler.java   | 11 -----------
 .../service/impl/EleAirStrategyServiceImpl.java       |  7 +++----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java
index 9c4a1ffc6..11cb64c26 100644
--- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java
+++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/handler/MqttMessageHandler.java
@@ -53,17 +53,6 @@ public class MqttMessageHandler {
 
     private final IEleLogsService eleLogsService;
 
-    @Value("${mqtt.client-id}")
-    private String clientId;
-
-    /**
-     * 用于记录错误指令发送次数,默认发送三次停止
-     * @author cdf
-     * @date 2022/6/28
-     */
-    private Integer mqttSendCount = 0;
-    private String mqttJsonMsg;
-    private String mqttSendTopic;
 
 //    /**
 //     * 设备注册
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 fffb55099..adc67656d 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
@@ -91,8 +91,8 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
     @Value("${mqtt.client-id}")
     private String clientId;
 
-    //徐扬执行器 5 陈道飞执行器6  3  18数据库测试执行器
-    private final Integer xxlGroup = 6;
+    //徐扬执行器 5 陈道飞执行器 6   18数据库测试执行器 3
+    private final Integer xxlGroup = 5;
 
 
     @Override
@@ -482,11 +482,10 @@ public class EleAirStrategyServiceImpl extends ServiceImpl<AirStrategyMapper, Ai
                 //如果是关闭操作
                 if ("close".equals(operation)) {
                     StringBuilder temSql = assToInfluxParam(lineIds);
-                    String sql = "select LineId from air_data_Real where " + temSql + " and ACInStat = 'On'";
+                    String sql = "select LineId,ACInStat from air_data_Real where " + temSql + " and ACInStat = 'On'";
                     QueryResult result = influxDbUtils.query(sql);
                     List<QueryResult.Series> listSeries = result.getResults().get(0).getSeries();
                     if (!CollectionUtils.isEmpty(listSeries)) {
-                        System.out.println(listSeries);
                         List<String> lineIdTem = new ArrayList<>();
                         listSeries.get(0).getValues().forEach(item -> {
                             lineIdTem.add(item.get(1).toString());