Browse Source

修复bug

Memory_LG 1 week ago
parent
commit
49bfe5099b

+ 3 - 2
event-ui/src/views/event/downloads/index.vue

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

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

@@ -550,7 +550,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             centereventTLog.setOperation(BUS_OPER_TYPE_2);
             centereventTLog.setOperation(BUS_OPER_TYPE_2);
 
 
             /*  存储下载记录 */
             /*  存储下载记录 */
-            /*String uuid = IdUtils.simpleUUID();
+            String uuid = IdUtils.simpleUUID();
             CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
             CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
             centereventTDownloads.setId(uuid);
             centereventTDownloads.setId(uuid);
             centereventTDownloads.setEventCode(centereventTEventcatalogue.getEventCode());
             centereventTDownloads.setEventCode(centereventTEventcatalogue.getEventCode());
@@ -559,7 +559,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             downloadsService.insertCentereventTDownloads(centereventTDownloads);
             downloadsService.insertCentereventTDownloads(centereventTDownloads);
 
 
             //开启线程下载视频
             //开启线程下载视频
-            DaHuaMp4VO daHuaMp4VO = new DaHuaMp4VO(uuid, centereventTEventcatalogue.getChnnaleCode(), centereventTEventcatalogue.getAlarmCode(), logId,centereventTEventcatalogue.getEventCode());
+            /*DaHuaMp4VO daHuaMp4VO = new DaHuaMp4VO(uuid, centereventTEventcatalogue.getChnnaleCode(), centereventTEventcatalogue.getAlarmCode(), logId,centereventTEventcatalogue.getEventCode());
             ArrayList<DaHuaMp4VO> daHuaMp4VOS = new ArrayList<>();
             ArrayList<DaHuaMp4VO> daHuaMp4VOS = new ArrayList<>();
             daHuaMp4VOS.add(daHuaMp4VO);
             daHuaMp4VOS.add(daHuaMp4VO);
             new Thread(() -> {
             new Thread(() -> {

+ 2 - 1
src/main/resources/mapper/download/CentereventTDownloadsMapper.xml

@@ -158,6 +158,7 @@
         from centerevent_t_fire_log l
         from centerevent_t_fire_log l
         LEFT JOIN centerevent_t_eventcatalogue a ON a.event_code = l.event_code
         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
         left join centerevent_t_downloads d on a.event_code = d.event_code
-        where a.id = #{id}
+
+        where a.id = #{id} AND l.log_content LIKE '%确认该事件%'
     </select>
     </select>
 </mapper>
 </mapper>