diff --git a/ruoyi-common/src/test/java/OkhttpTest.java b/ruoyi-common/src/test/java/OkhttpTest.java
index 83ffe792..a05780f9 100644
--- a/ruoyi-common/src/test/java/OkhttpTest.java
+++ b/ruoyi-common/src/test/java/OkhttpTest.java
@@ -1,3 +1,4 @@
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.zc.common.core.httpclient.OkHttp;
 import com.zc.common.core.httpclient.exception.HttpException;
 import com.zc.common.core.httpclient.request.RequestParams;
@@ -172,4 +173,10 @@ public class OkhttpTest {
             }); // 请求方法
 
     }
+    @Test
+    public void aaa(){
+        String uuid = IdUtils.fastSimpleUUID();
+        System.out.println(uuid.length());
+        System.out.println(uuid);
+    }
 }
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
index 3843bfed..54e75d83 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
@@ -13,6 +13,12 @@ public class DcDevice {
 
     public static final Integer UNUSEDSTATE = 0;
     public static final Integer USEOFSTATE = 1;
+
+    // 离线状态
+    public static final String OFFLINE = "0";
+    // 在线状态
+    public static final String ONLINE = "1";
+
     @ApiModelProperty("ID")
     private Long id;
     @ApiModelProperty("物联设备ID")
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
index 14e5c63c..b7b52bd0 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
@@ -29,6 +29,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @NoArgsConstructor
 public class DcEvent extends BaseEntity {
     private static final long serialVersionUID = 1L;
+    private static final long event_state = 0L;
     /**
      * 事件编号
      */
diff --git a/zc-business/src/main/java/com/zc/business/message/device/OfflineMessageListener.java b/zc-business/src/main/java/com/zc/business/message/device/OfflineMessageListener.java
index ebd7bded..4104bd6f 100644
--- a/zc-business/src/main/java/com/zc/business/message/device/OfflineMessageListener.java
+++ b/zc-business/src/main/java/com/zc/business/message/device/OfflineMessageListener.java
@@ -1,6 +1,8 @@
 package com.zc.business.message.device;
 
 import com.alibaba.fastjson.JSON;
+import com.zc.business.domain.DcDevice;
+import com.zc.business.service.IDcDeviceService;
 import com.zc.common.core.redis.stream.RedisStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 离线消息监听
@@ -24,6 +27,9 @@ public class OfflineMessageListener implements StreamListener<String, ObjectReco
     @Resource
     private RedisStream redisStream;
 
+    @Resource
+    private IDcDeviceService dcDeviceService;
+
     @Resource
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
@@ -43,8 +49,18 @@ public class OfflineMessageListener implements StreamListener<String, ObjectReco
 
     /**
      * 处理离线消息
+     * @param msg 离线消息
      */
     private void handle(List<String> msg) {
-        System.out.println(msg);
+
+        List<DcDevice> dcDevices =  msg.stream().map(iotDeviceId -> {
+            DcDevice dcDevice = new DcDevice();
+            dcDevice.setDeviceState(DcDevice.OFFLINE);
+            dcDevice.setIotDeviceId(iotDeviceId);
+            return dcDevice;
+        }).collect(Collectors.toList());
+
+        // 批量更新设备状态
+        dcDeviceService.batchUpdate(dcDevices);
     }
 }
diff --git a/zc-business/src/main/java/com/zc/business/message/device/OnlineMessageListener.java b/zc-business/src/main/java/com/zc/business/message/device/OnlineMessageListener.java
index 73e897e6..e2a90c2d 100644
--- a/zc-business/src/main/java/com/zc/business/message/device/OnlineMessageListener.java
+++ b/zc-business/src/main/java/com/zc/business/message/device/OnlineMessageListener.java
@@ -1,5 +1,8 @@
 package com.zc.business.message.device;
 
+import com.alibaba.fastjson.JSON;
+import com.zc.business.domain.DcDevice;
+import com.zc.business.service.IDcDeviceService;
 import com.zc.common.core.redis.stream.RedisStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +10,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.ObjectRecord;
 import org.springframework.data.redis.connection.stream.RecordId;
 import org.springframework.data.redis.stream.StreamListener;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 在线消息监听
  */
@@ -20,12 +28,40 @@ public class OnlineMessageListener implements StreamListener<String, ObjectRecor
     @Autowired
     private RedisStream redisStream;
 
+    @Resource
+    private IDcDeviceService dcDeviceService;
+
+    @Resource
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
     @Override
     public void onMessage(ObjectRecord<String, String> message) {
         String streamKay = message.getStream();
         RecordId recordId = message.getId();
 
+        threadPoolTaskExecutor.execute(() -> {
+            List<String> list = JSON.parseArray(message.getValue(), String.class);
+            this.handle(list);
+        });
+
         // 消费完后直接删除消息
         redisStream.del(streamKay, String.valueOf(recordId));
     }
+
+
+    /**
+     * 处理在线消息
+     * @param msg 在线消息
+     */
+    private void handle(List<String> msg) {
+        List<DcDevice> dcDevices =  msg.stream().map(iotDeviceId -> {
+            DcDevice dcDevice = new DcDevice();
+            dcDevice.setDeviceState(DcDevice.ONLINE);
+            dcDevice.setIotDeviceId(iotDeviceId);
+            return dcDevice;
+        }).collect(Collectors.toList());
+
+        // 批量更新设备状态
+        dcDeviceService.batchUpdate(dcDevices);
+    }
 }
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
index ae94903b..8380fcb5 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zc.business.service.impl;
 
+import java.awt.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -105,6 +106,7 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper;
         //设置事件Id UUID无下划线格式32
         String uuid = IdUtils.fastSimpleUUID();
         dcEvent.setId(uuid);
+        dcEvent.setEventState(0L);
 //获取部门信息
 dcEvent.setDeptId(SecurityUtils.getDeptId());
         dcEvent.setCreateTime(DateUtils.getNowDate());
diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
index 8269b757..bb4e6d2b 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml
@@ -581,7 +581,6 @@
         <if test="eventState != null "> and event_state = #{eventState}</if>
         <if test="startTime != null "> and start_time BETWEEN #{startTime} and #{endTime}  </if>
     </where>
-
 </select>
 
     <select id="selectCount"  resultMap="countMap" resultType="map">