diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
index 4a2870c4..25747caa 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
@@ -131,12 +131,11 @@ public class DcWarningServiceImpl implements IDcWarningService
             }
             //redis存在数据,取出redis的id找对对应事件的配置,合成事件配置,重新定义延迟时间
             HashMap<String, Object> map = dcWarningMapper.selectDcWarningById(dataId);
-            if (map==null){//redis中有id但是数据库中没有这条数据，那就删除这条redis数据,新数据加入到数据库,并加入到redis
+            if (map==null||(map.get("warningState")!=null&&!map.get("warningState").toString().equals("1"))){//redis中有id但是数据库中没有这条数据,或则数据库中有数据但是状态不为上报,那就删除这条redis数据,新数据加入到数据库,并加入到redis
                 redisCache.deleteObject(WARNINGDATA+key);
-                dcWarningMapper.insertDcWarning(dcWarning);
                 String id = dcWarning.getId();
                 redisCache.setCacheObject(WARNINGDATA+key,id,Integer.parseInt(strategyTime),TimeUnit.MINUTES);
-                return 1;
+                return dcWarningMapper.insertDcWarning(dcWarning);
             }
             String otherConfig="";
             if (map.get("otherConfig")!=null){