优化提示词, 修复错误key chnnale->channel

event-ui/src/views/event/downloads/index.vue

@@ -161,15 +161,17 @@
       handleDownload(row) {
         const id = row.eventCode
         eventhandleDownload(id).then(response => {
-          if (response.code == 200) {
+          this.$modal.msgSuccess(response.msg)
+          this.getList();
+          /*if (response.code == 200) {
             this.$modal.msgSuccess("下载成功");
             this.getList();
           } else {
             if (response.msg == null) {
               response.data.msg = "下载失败";
             }
-            this.$modal.msgError(response.data.msg);
-          }
+            this.$modal.msgError(response.msg);
+          }*/
         });
       },
       // 表单重置

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/CentereventTEventcatalogue.java

@@ -35,7 +35,7 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.address = address;
     }
 
-    public CentereventTEventcatalogue(String eventType, String eventTypeXl, String eventName, String eventDescription, String longitude, String latitude, String reportor, Date reportTime, String address, String alarmCode, String chnnaleCode) {
+    public CentereventTEventcatalogue(String eventType, String eventTypeXl, String eventName, String eventDescription, String longitude, String latitude, String reportor, Date reportTime, String address, String alarmCode, String channelCode) {
         this.eventType = eventType;
         this.eventTypeXl = eventTypeXl;
         this.eventName = eventName;
@@ -46,7 +46,7 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.reportTime = reportTime;
         this.address = address;
         this.alarmCode = alarmCode;
-        this.chnnaleCode = chnnaleCode;
+        this.channelCode = channelCode;
     }
 
     public CentereventTEventcatalogue(String eventName, String eventDescription, String longitude, String latitude, String reportor, Date reportTime, String address) {
@@ -180,7 +180,7 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
 
     private String alarmCode;
 
-    private String chnnaleCode;
+    private String channelCode;
 
     public String getDownloadId() {
         return downloadId;
@@ -501,12 +501,12 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.alarmCode = alarmCode;
     }
 
-    public String getChnnaleCode() {
-        return chnnaleCode;
+    public String getChannelCode() {
+        return channelCode;
     }
 
-    public void setChnnaleCode(String chnnaleCode) {
-        this.chnnaleCode = chnnaleCode;
+    public void setChannelCode(String channelCode) {
+        this.channelCode = channelCode;
     }
 
     @Override

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTDownloadsServiceImpl.java

@@ -122,7 +122,7 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
                 centereventTDownloads.setEventName(eventcatalogue.getEventName());
                 centereventTDownloads.setLogId(eventcatalogue.getId());
                 this.insertCentereventTDownloads(centereventTDownloads);
-                resultList.add(new DaHuaMp4VO(uuid, eventcatalogue.getChnnaleCode(), eventcatalogue.getAlarmCode(), eventcatalogue.getId(), eventcatalogue.getEventCode()));
+                resultList.add(new DaHuaMp4VO(uuid, eventcatalogue.getChannelCode(), eventcatalogue.getAlarmCode(), eventcatalogue.getId(), eventcatalogue.getEventCode()));
             }
             return resultList;
         }else{
@@ -130,7 +130,7 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
 
             List<DaHuaMp4VO> resultList = new ArrayList<>();
             for (CentereventTEventcatalogue eventcatalogue : eventcatalogues) {
-                resultList.add(new DaHuaMp4VO(eventcatalogue.getDownloadId(), eventcatalogue.getChnnaleCode(), eventcatalogue.getAlarmCode(), eventcatalogue.getId(), eventcatalogue.getEventCode()));
+                resultList.add(new DaHuaMp4VO(eventcatalogue.getDownloadId(), eventcatalogue.getChannelCode(), eventcatalogue.getAlarmCode(), eventcatalogue.getId(), eventcatalogue.getEventCode()));
             }
             return resultList;
         }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTEventcatalogueServiceImpl.java

@@ -559,7 +559,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             downloadsService.insertCentereventTDownloads(centereventTDownloads);
 
             //开启线程下载视频
-            /*DaHuaMp4VO daHuaMp4VO = new DaHuaMp4VO(uuid, centereventTEventcatalogue.getChnnaleCode(), centereventTEventcatalogue.getAlarmCode(), logId,centereventTEventcatalogue.getEventCode());
+            /*DaHuaMp4VO daHuaMp4VO = new DaHuaMp4VO(uuid, centereventTEventcatalogue.getChannelCode(), centereventTEventcatalogue.getAlarmCode(), logId,centereventTEventcatalogue.getEventCode());
             ArrayList<DaHuaMp4VO> daHuaMp4VOS = new ArrayList<>();
             daHuaMp4VOS.add(daHuaMp4VO);
             new Thread(() -> {

src/main/resources/mapper/centereventteventcatalogue/CentereventTEventcatalogueMapper.xml

@@ -37,7 +37,7 @@
         <result property="isExamine" column="is_examine"/>
         <result property="isPush" column="is_push"/>
         <result property="alarmCode" column="alarm_code"/>
-        <result property="chnnaleCode" column="chnnale_code"/>
+        <result property="channelCode" column="channel_code"/>
     </resultMap>
 
     <sql id="selectCentereventTEventcatalogueVo">
@@ -156,7 +156,7 @@
         b.fire_radius fireRadius,
         b.reserve reserve,
         a.alarm_code,
-        a.chnnale_code
+        a.channel_code
         from centerevent_t_eventcatalogue a
         left join centerevent_t_fire_event b on b.event_code = a.event_code
         where a.id = #{id}
@@ -213,7 +213,7 @@
             <if test="deptName != null">dept_name,</if>
             <if test="address != null ">address,</if>
             <if test="alarmCode != null ">alarm_code,</if>
-            <if test="chnnaleCode != null ">chnnale_code,</if>
+            <if test="channelCode != null ">channel_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -241,7 +241,7 @@
             <if test="deptName != null">#{deptName},</if>
             <if test="address != null ">#{address},</if>
             <if test="alarmCode != null ">#{alarmCode},</if>
-            <if test="chnnaleCode != null ">#{chnnaleCode},</if>
+            <if test="channelCode != null ">#{channelCode},</if>
         </trim>
     </insert>
 

src/main/resources/mapper/download/CentereventTDownloadsMapper.xml

@@ -27,7 +27,7 @@
         <result property="reportTime" column="report_time"/>
         <result property="createBy" column="create_by"/>
         <result property="alarmCode" column="alarm_code"/>
-        <result property="chnnaleCode" column="chnnale_code"/>
+        <result property="channelCode" column="channel_code"/>
         <result property="downloadId" column="download_id"/>
     </resultMap>
 
@@ -117,7 +117,7 @@
     </delete>
 
     <select id="getbeforedateDownload" parameterType="map" resultMap="CentereventTEventcatalogueResult">
-        SELECT l.id, l.event_code, a.event_name, a.report_time, a.create_by, a.alarm_code, a.chnnale_code
+        SELECT l.id, l.event_code, a.event_name, a.report_time, a.create_by, a.alarm_code, a.channel_code
         from centerevent_t_fire_log l
         LEFT JOIN centerevent_t_eventcatalogue a ON a.event_code = l.event_code
         <where>
@@ -130,7 +130,7 @@
             <if test="monthValueStart != null and monthValueStart != ''">
                 AND DATE_FORMAT(l.create_time,'%Y-%m-%d') = #{monthValueStart}
             </if>
-            AND a.alarm_code is not null AND a.chnnale_code is not null
+            AND a.alarm_code is not null AND a.channel_code is not null
             AND l.log_content LIKE '%确认该事件%' AND l.event_code NOT IN (
             SELECT event_code FROM centerevent_t_downloads
             <where>
@@ -154,11 +154,10 @@
     </select>
 
     <select id="getInfoById" parameterType="map" resultMap="CentereventTEventcatalogueResult">
-        SELECT l.id, l.event_code, a.event_name, a.report_time, a.create_by, a.alarm_code, a.chnnale_code, d.id download_id
+        SELECT l.id, l.event_code, a.event_name, a.report_time, a.create_by, a.alarm_code, a.channel_code, d.id download_id
         from centerevent_t_fire_log l
         LEFT JOIN centerevent_t_eventcatalogue a ON a.event_code = l.event_code
         left join centerevent_t_downloads d on a.event_code = d.event_code
-
         where a.id = #{id} AND l.log_content LIKE '%确认该事件%'
     </select>
 </mapper>