From b33ddd486fb61e9e710c1f1feb394708ff763dfb Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Sun, 3 Sep 2023 18:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervise/report/api/imgmessageslog/ImgMessagesLog.java   | 2 +-
 .../supervise/report/api/imgmessageuser/ImgMessageUser.java   | 2 +-
 .../com/supervise/rms/biz/riskalarm/RiskAlarmService.java     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java
index 6bd7c584..756b29e4 100644
--- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * @date 2023/7/27 9:56
  */
 @ApiModel(value = "消息推送日志", description = "消息推送日志")
-@TableName("risk_messages_log")
+@TableName("img_messages_log")
 @Data
 public class ImgMessagesLog extends EntityWithId {
     private String sid;
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java
index 606cd030..4191ef3c 100644
--- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2023/7/27 10:34
  */
 @ApiModel(value = "消息用户微信openid关联", description = "消息用户微信openid关联")
-@TableName("risk_message_user")
+@TableName("img_message_user")
 @Data
 public class ImgMessageUser {
     private String id;
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java
index 8168ee5b..3095647d 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java
@@ -110,7 +110,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
             riskAlarm.setIndicatorName(riskIndicators.getName());
             riskAlarm.setPositionSid(dto.getSid());
             riskAlarm.setPositionName(dto.getName());
-            riskAlarm.setTriggerTime(dto.getTriggerTime());
+            riskAlarm.setTriggerTime(new Date());
             riskAlarm.setSid(UUID.randomUUID().toString());
             riskAlarm.setTreatmentTime(new Date());
             riskAlarm.setContent(dto.getDevices().toString());
@@ -173,7 +173,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
                 riskAlarm.setIndicatorName(riskIndicators.getName());
                 riskAlarm.setPositionSid(dto.getSid());
                 riskAlarm.setPositionName(dto.getName());
-                riskAlarm.setTriggerTime(dto.getTriggerTime());
+                riskAlarm.setTriggerTime(new Date());
                 riskAlarm.setSid(UUID.randomUUID().toString());
                 riskAlarm.setTreatmentTime(new Date());
                 riskAlarm.setContent(dto.getDeviceImages().toString());