手动消警 gengdidi

src/main/java/com/zehong/gassdevicereport/task/impl/DealWithAndSendRecevieDataTask.java

@@ -4,7 +4,6 @@ import com.zehong.gassdevicereport.constant.Constant;
 import com.zehong.gassdevicereport.entity.ReciveReportData;
 import com.zehong.gassdevicereport.entity.TDeviceAlarm;
 import com.zehong.gassdevicereport.entity.TMonitorDevice;
-import com.zehong.gassdevicereport.service.ISysDictTypeService;
 import com.zehong.gassdevicereport.service.ITDeviceAlarmService;
 import com.zehong.gassdevicereport.service.ITMonitorDeviceService;
 import com.zehong.gassdevicereport.task.ScheduledOfTask;
@@ -104,6 +103,10 @@ public class DealWithAndSendRecevieDataTask implements ScheduledOfTask {
         }else {
             if(null != alarm){
                 if(null == alarm.getEndTime()){
+                    //手动消警的报警结束更新状态
+                    if("4".equals(alarm.getDealStatus())){
+                        alarm.setDealStatus("");
+                    }
                     alarm.setEndTime(DateUtils.getNowDate());
                     itDeviceAlarmService.updateTDeviceAlarm(alarm);
                     pushWedSocket(alarm.getAlarmId());