diff --git a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java
index d3fd67232..84e38d1a6 100644
--- a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhgd.xmgl.modules.electrical.entity.ElectricalData;
 import com.zhgd.xmgl.modules.electrical.entity.ElectricalDev;
 import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDataMapper;
+import com.zhgd.xmgl.modules.electrical.mapper.ElectricalDevMapper;
+import com.zhgd.xmgl.modules.electrical.service.IElectricAlarmService;
 import com.zhgd.xmgl.modules.electrical.service.IElectricalDataService;
 import com.zhgd.xmgl.modules.electrical.service.IElectricalDevService;
 import com.zhgd.xmgl.modules.project.entity.Project;
@@ -14,6 +16,7 @@ import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.util.XiwonUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.core.SchedulerLock;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +47,10 @@ public class ElectricalTask {
     private ElectricalDataMapper electricalDataMapper;
     @Resource
     private ProjectMapper projectMapper;
-
+    @Autowired
+    private IElectricAlarmService electricAlarmService;
+    @Autowired
+    private ElectricalDevMapper electricalDevMapper;
     @Resource
     private IElectricalDevService electricalDevService;
 
@@ -98,6 +105,10 @@ public class ElectricalTask {
         Integer code = realTimeData.getInteger("code");
         // code校验是否成功请求
         if (code == HttpStatus.OK.value()) {
+            ElectricalDev tempElectricalDev = new ElectricalDev();
+            tempElectricalDev.setId(dev.getId());
+            tempElectricalDev.setRealTime(new Date());
+            electricalDevMapper.updateById(tempElectricalDev);
             JSONArray dataArray = realTimeData.getJSONArray("data");
             if (CollUtil.isNotEmpty(dataArray)) {
                 // 解析请求到的参数，保存到我们的数据库
@@ -107,6 +118,8 @@ public class ElectricalTask {
                         data.getString("leakage"), data.getString("temperatureA"), data.getString("temperatureB"), data.getString("temperatureC"), data.getString("temperatureD"));
                 electricalData.setXiewenId(data.getLong("id"));
                 electricalDataService.saveElectricalData(electricalData);
+                electricAlarmService.addAlarm(electricalData, dev);
+
             } else {
                 log.error("设备sn：{}，当前无数据！", devSn);
             }