From 04d19d8dfacdc525066b8dc9dc8a52917fc1f926 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Tue, 5 Nov 2024 14:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E7=A1=AE=E8=AE=A4=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/data/domain/DeviceEventInfo.java   |  7 ++++++-
 .../com/das/modules/data/service/TDEngineService.java  | 10 +++++-----
 .../das/modules/event/controller/EventController.java  |  3 ++-
 .../node/service/impl/NodeMessageServiceImpl.java      |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/das/src/main/java/com/das/modules/data/domain/DeviceEventInfo.java b/das/src/main/java/com/das/modules/data/domain/DeviceEventInfo.java
index c8b56ba9..7f523ced 100644
--- a/das/src/main/java/com/das/modules/data/domain/DeviceEventInfo.java
+++ b/das/src/main/java/com/das/modules/data/domain/DeviceEventInfo.java
@@ -1,11 +1,15 @@
 package com.das.modules.data.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 @Data
 public class DeviceEventInfo {
-    private Long updateTime;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long eventTime;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long eventId;
 
     private Integer eventType;
@@ -18,6 +22,7 @@ public class DeviceEventInfo {
 
     private String confirmAccount;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long confirmTime;
 
     private String deviceId;
diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
index f785cc08..71386e74 100644
--- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
@@ -393,7 +393,7 @@ public class TDEngineService {
                     sb.append("','");
                     sb.append(dv.getDeviceName());
                     sb.append("') values (");
-                    sb.append(dv.getUpdateTime());
+                    sb.append(dv.getEventTime());
                     sb.append(",");
                     sb.append(dv.getEventId());
                     sb.append(",");
@@ -627,15 +627,15 @@ public class TDEngineService {
                 }
             }
         }
-        sb.append(" order by t.updatetime");
+        sb.append(" order by t.event_time");
         log.debug(sb.toString());
         try (Connection conn = hikariDataSource.getConnection();
              Statement smt = conn.createStatement();
              ResultSet rs = smt.executeQuery(sb.toString())) {
             while (rs.next()) {
                 DeviceEventInfo deviceEventInfo = new DeviceEventInfo();
-                deviceEventInfo.setUpdateTime(rs.getLong("event_time"));
-                deviceEventInfo.setDeviceId(rs.getString("event_id"));
+                deviceEventInfo.setEventTime(rs.getLong("event_time"));
+                deviceEventInfo.setEventId(rs.getLong("event_id"));
                 deviceEventInfo.setEventLevel(rs.getInt("event_level"));
                 deviceEventInfo.setEventType(rs.getInt("event_type"));
                 deviceEventInfo.setEventText(rs.getString("event_text"));
@@ -658,7 +658,7 @@ public class TDEngineService {
         sb.append("insert into e_");
         sb.append(deviceEventInfo.getDeviceId());
         sb.append(" USING event_info (device_id)TAGS (null) (event_time,event_id,confirmed,confirm_account,confirm_time) VALUES (");
-        sb.append(deviceEventInfo.getUpdateTime());
+        sb.append(deviceEventInfo.getEventTime());
         sb.append(",");
         sb.append(deviceEventInfo.getEventId());
         sb.append(",");
diff --git a/das/src/main/java/com/das/modules/event/controller/EventController.java b/das/src/main/java/com/das/modules/event/controller/EventController.java
index fc51d0eb..2f1345e4 100644
--- a/das/src/main/java/com/das/modules/event/controller/EventController.java
+++ b/das/src/main/java/com/das/modules/event/controller/EventController.java
@@ -46,7 +46,8 @@ public class EventController {
      * @param deviceEventInfo 确认信息
      */
     @PostMapping("/confirm")
-    public void confirmEvent(@RequestBody DeviceEventInfo deviceEventInfo){
+    public R<Void> confirmEvent(@RequestBody DeviceEventInfo deviceEventInfo){
         eventService.confirmEvent(deviceEventInfo);
+        return R.success();
     }
 }
diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index 0b36e4a5..b71c256b 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -301,7 +301,7 @@ public class NodeMessageServiceImpl implements NodeMessageService {
         for (DeviceEventVo item : list){
             DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(Long.valueOf(item.getDeviceId()));
             DeviceEventInfo deviceEventInfo = new DeviceEventInfo();
-            deviceEventInfo.setUpdateTime(item.getEventTime());
+            deviceEventInfo.setEventTime(item.getEventTime());
             deviceEventInfo.setEventId(IdWorker.getId());
             deviceEventInfo.setDeviceId(item.getDeviceId());
             deviceEventInfo.setDeviceName(deviceInfoCache.getDeviceName());