diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/entity/LcPowerEnvAlertMessageEntity.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/entity/LcPowerEnvAlertMessageEntity.java
index d5650a1..06f5280 100644
--- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/entity/LcPowerEnvAlertMessageEntity.java
+++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/entity/LcPowerEnvAlertMessageEntity.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.jeelowcode.framework.utils.model.global.BaseTenantEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,7 +25,8 @@ public class LcPowerEnvAlertMessageEntity extends BaseTenantEntity {
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.NONE)
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/listener/LcPowerEnvMetricEventListener.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/listener/LcPowerEnvMetricEventListener.java
index eebe891..75545f3 100644
--- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/listener/LcPowerEnvMetricEventListener.java
+++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/listener/LcPowerEnvMetricEventListener.java
@@ -47,7 +47,8 @@ public class LcPowerEnvMetricEventListener {
         List<LcPowerEnvMonitorMetricEntity> recentData = metricService.getRecentData(metric.getDeviceUid(), metric.getPropertyCode(), metric.getCreateTime().minusMinutes(3));
         LcPowerEnvAlertMessageEntity alertMessage = alertService.getLatestAlertMessage(metric.getDeviceUid(), metric.getPropertyCode());
 
-        if (StrUtil.equals(metric.getMetricValue(), "true")) {
+        if ((StrUtil.equals(metric.getMetricValue(), "true") && !StrUtil.equals(metric.getPropertyCode(), "switch")) ||
+                (StrUtil.equals(metric.getMetricValue(), "false") && StrUtil.equals(metric.getPropertyCode(), "switch"))) {
             // 判断三分钟内是否有告警，如果有，则延续告警消息，延长告警消息时间，如果没有则创建新的告警消息
             if (CollUtil.isNotEmpty(recentData)
                     && StrUtil.equals(CollUtil.getFirst(recentData).getMetricValue(), "true")) {