From d5d64f84b924163c02a1c14319a0d337e7beab6e Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 20 Jun 2024 16:10:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20i2=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/task/I2syncTask.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/xydl/cac/task/I2syncTask.java b/src/main/java/com/xydl/cac/task/I2syncTask.java
index c25a540..e753b5f 100644
--- a/src/main/java/com/xydl/cac/task/I2syncTask.java
+++ b/src/main/java/com/xydl/cac/task/I2syncTask.java
@@ -6,6 +6,7 @@ import com.xydl.cac.repository.I2syncRecordRepository;
 import com.xydl.cac.repository.NSensorRepository;
 import com.xydl.cac.service.DataService;
 import com.xydl.cac.service.I2syncService;
+import com.xydl.cac.socket.WebSocketServer;
 import com.xydl.cac.util.DateUtil;
 import com.xydl.cac.util.DingTalkPushUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,8 @@ public class I2syncTask {
     BusiAdapter busiAdapter;
     @Resource
     DingTalkPushUtil dingTalkPushUtil;
+    @Resource
+    WebSocketServer webSocketServer;
 
     @Scheduled(initialDelay = 60 * 1000, fixedDelay = 30 * 60 * 1000)
     public void syncAll() {
@@ -52,6 +55,7 @@ public class I2syncTask {
             } catch (Exception e) {
                 log.error("I2syncTask.syncAll error.", e);
                 String str = "i2同步导出数据异常: " + e.getMessage();
+                webSocketServer.sendMessage(str);
                 dingTalkPushUtil.pushText(str);
             }
         }
@@ -71,6 +75,7 @@ public class I2syncTask {
         }
         List<NSensor> list = sensorRepository.findByTypeId(config.getModevtypeId());
         for (NSensor sensor : list) {
+            sensor.setTableName(config.getTableName());
             this.syncOneSensor(sensor, fieldList, points);
         }
     }