信息发布问题

zc-business/src/main/java/com/zc/business/domain/DcWarning.java

@@ -56,14 +56,13 @@ public class DcWarning extends BaseEntity
     private Integer warningType;
 
     /** 事件子类：1-1 拥堵1-2 缓行 */
-    @Excel(name = "事件子类", readConverterExp ="1-1-拥堵,1-2=缓行,2-1=普通行人,2-2=工作人员,3-1=摩托车,3-2=自行车,3-3=三轮车,4-1=非工程车,4-2=工程车,4-3=主路有车,4-4=匝道有车,4-5=车辆故障（弃用),4-6=交通事故（弃用),4-7=应急车道被占用,4-8=车离开应急车道,4-9=其他,4-10=未知车辆,5-1=倒车/逆行,5-2=压线,5-3=掉头,5-4=超速,5-5=低速,5-6=违规变道,5-7=未保持安全距离,6-1=烟火,6-2=火灾,6-3=障碍物,6-4=抛洒物,7-1=道路施工,8-1=雨,8-2=冰雹,8-3=风,8-4=雾,8-5=高温,8-6=积水,8-7=路面湿滑,8-8=路面结冰,8-9=道路能见度低,8-10=道路团雾,9-1=只碰撞不倾斜,9-2=只倾斜无碰撞,9-3=碰撞后倾斜,10-1=未知,10-2单车事故,10-3=多车事故,11-1=车辆抛锚,11-2=车辆炸胎（有备胎),11-2=车辆炸胎（无备胎),99-1=其它")
+    @Excel(name = "事件子类", readConverterExp ="1-1=拥堵,1-2=缓行,2-1=普通行人,2-2=工作人员,3-1=摩托车,3-2=自行车,3-3=三轮车,4-1=非工程车,4-2=工程车,4-3=主路有车,4-4=匝道有车,4-5=车辆故障（弃用),4-6=交通事故（弃用),4-7=应急车道被占用,4-8=车离开应急车道,4-9=其他,4-10=未知车辆,5-1=倒车/逆行,5-2=压线,5-3=掉头,5-4=超速,5-5=低速,5-6=违规变道,5-7=未保持安全距离,6-1=烟火,6-2=火灾,6-3=障碍物,6-4=抛洒物,7-1=道路施工,8-1=雨,8-2=冰雹,8-3=风,8-4=雾,8-5=高温,8-6=积水,8-7=路面湿滑,8-8=路面结冰,8-9=道路能见度低,8-10=道路团雾,9-1=只碰撞不倾斜,9-2=只倾斜无碰撞,9-3=碰撞后倾斜,10-1=未知,10-2单车事故,10-3=多车事故,11-1=车辆抛锚,11-2=车辆炸胎（有备胎),11-2=车辆炸胎（无备胎),99-1=其它")
     private String warningSubclass;
 
     /** 事件解除原因 */
-    @Excel(name = "事件解除原因")
     private String relieveReason;
     /** 事件解除类型： 1-误报解除2-事件已结束3-无需处理事件4-其它 */
-    @Excel(name = "信息来源", readConverterExp = "1=误报解除2,2=事件已结束3,3=无需处理事件,4=其它")
+    //@Excel(name = "事件解除类型", readConverterExp = "1=误报解除2,2=事件已结束3,3=无需处理事件,4=其它")
     private Integer relieveType;
 
 
@@ -90,7 +89,6 @@ public class DcWarning extends BaseEntity
 
     private String latitude;
     /** 车辆类型  */
-    //@Excel(name = "车辆类型")
     private String vehicleType;
     /** 持续时长  */
     private int duration;

zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java

@@ -3,6 +3,7 @@ package com.zc.business.mapper;
 import java.util.HashMap;
 import java.util.List;
 import com.zc.business.domain.DcPublishManage;
+import com.zc.business.domain.DcPublishingChannels;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -69,7 +70,7 @@ public interface DcPublishManageMapper
     //查询交通事件类型
     public Integer selectEventType(@Param("eventId")String eventId);
     //获取发布渠道信息
-    public DcPublishManage selectPublishManage(@Param("dataCategory")Integer dataCategory);
+    public DcPublishingChannels selectPublishManage(@Param("dataCategory")Integer dataCategory);
     //查询信息发布列表
     public List<HashMap<String,Object>> selectDcPublishManageListMap(DcPublishManage dcPublishManage);
     //统计今日发布渠道分析

zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.zc.business.domain.DcEventProcess;
 import com.zc.business.domain.DcPublishManage;
+import com.zc.business.domain.DcPublishingChannels;
 import com.zc.business.mapper.DcPublishManageMapper;
 import com.zc.business.service.IMsmService;
 import com.zc.business.utils.HttpUtil;
@@ -220,7 +221,7 @@ public class MsmServiceImpl implements IMsmService {
         String eventId = map.get("eventId").toString();//事件id
         String content = map.get("content").toString();//信息内容
         Integer eventType = dcPublishManageMapper.selectEventType(eventId);//事件类型
-        DcPublishManage publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息
+        DcPublishingChannels publishManage = dcPublishManageMapper.selectPublishManage(eventType);//渠道信息
         if (publishManage!=null){
             dcPublishManage.setPublishChannelsId(publishManage.getId());//渠道id
         }

zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml

@@ -88,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEventType" resultType="java.lang.Integer">
         select event_type from dc_event where id=#{eventId}
     </select>
-    <select id="selectPublishManage" resultType="com.zc.business.domain.DcPublishManage">
-        select id,publish_channels from dc_publishing_channels where enabled=2 and data_category=#{dataCategory}
+    <select id="selectPublishManage" resultType="com.zc.business.domain.DcPublishingChannels">
+        select id,publish_channels publishChannels from dc_publishing_channels where enabled=2 and data_category=#{dataCategory}
     </select>
     <select id="selectDcPublishManageListMap" resultType="java.util.HashMap">
         select