diff --git a/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java b/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
index a6983e17..afe6ae94 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
@@ -100,11 +100,7 @@ public class DcPublishingChannelsController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody DcPublishingChannels dcPublishingChannels)
     {
-        List<DcPublishingChannels> channelsList = dcPublishingChannelsService.
-                selectChannelsDataCategory(dcPublishingChannels.getDataCategory());
-        if (channelsList!=null&&channelsList.size()>0){
-            return AjaxResult.error("事件类型已存在");
-        }
+
         return toAjax(dcPublishingChannelsService.updateDcPublishingChannels(dcPublishingChannels));
     }
 
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java
index 89524611..ad4fe4ef 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java
@@ -118,6 +118,26 @@ public class DcPublishManage extends BaseEntity
     private String facilityName;
     //事件状态：0-待确认1-处理中2-已完成
     private Integer eventState;
+    //关联情报板id
+    private Long logId;
+    //关联语音广告发布id
+    private Long voiceId;
+
+    public Long getLogId() {
+        return logId;
+    }
+
+    public void setLogId(Long logId) {
+        this.logId = logId;
+    }
+
+    public Long getVoiceId() {
+        return voiceId;
+    }
+
+    public void setVoiceId(Long voiceId) {
+        this.voiceId = voiceId;
+    }
 
     public Integer getEventState() {
         return eventState;
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 092a3abe..6f08a2bb 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
@@ -183,6 +183,9 @@ public class DcWarningServiceImpl implements IDcWarningService
             redisCache.setCacheObject(WARNINGDATA+key,dataId,Integer.parseInt(strategyTime),TimeUnit.MINUTES);//重新设置延迟时间
             return  dcWarningMapper.updateOtherConfig(dataId, jsonObject.toString(),dcWarning.getEndTime());//修改数据库配置
         }
+        if (redisValueTwo==null){ //如果传进来的事件未配置策略,在这里出入默认的过去时间值
+            dcWarning.setEndTime(DateUtils.getObtainDateAfter(60));//注入过期时间(默认值为60分钟)
+        }
         //事件推送至 Websocket
         extracted(dcWarning);
         return dcWarningMapper.insertDcWarning(dcWarning);//如果没有配置策略直接加入数据库;
diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
index 5cf86603..65358545 100644
--- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="eventTime"    column="eventTime"    />
         <result property="facilityName"    column="facility_name"    />
         <result property="eventState"    column="event_state"    />
+        <result property="logId"    column="log_id"    />
+        <result property="voiceId"    column="voice_id"    />
     </resultMap>
 
     <sql id="selectDcPublishManageVo">
@@ -123,6 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="logId != null">log_id,</if>
+            <if test="voiceId != null">voice_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="eventId != null and eventId != ''">#{eventId},</if>
@@ -144,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="logId != null">#{logId},</if>
+            <if test="voiceId != null">#{voiceId},</if>
          </trim>
     </insert>
 
@@ -169,6 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="logId != null">log_id = #{logId},</if>
+            <if test="voiceId != null">voice_id = #{voiceId},</if>
         </trim>
         where id = #{id}
     </update>