1、方案回放视频上传超时问题

2、优化查询告警日志列表sql
3、

industry-admin/src/api/largeScreen/playbackPlan.js

@@ -12,6 +12,7 @@ export function addPlaybackPlan(data) {
       isToken: true
     },
     method: 'post',
+    timeout: 0,
     data
   })
 }
@@ -28,6 +29,7 @@ export function updatePlaybackPlan(data) {
       isToken: true
     },
     method: 'post',
+    timeout: 0,
     data
   })
 }

industry-system/industry-da/src/main/resources/application-dev.yml

@@ -19,12 +19,12 @@ opcua:
 spring:
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1500MB
+      max-file-size: 1100MB
+      max-request-size: 1100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-    url: jdbc:mysql://192.168.1.253:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.253:3306/in_data_db3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     #password: root
     password: jd@2021

industry-system/industry-da/src/main/resources/application-prod-cf.yml

@@ -19,8 +19,8 @@ opcua:
 spring:
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1500MB
+      max-file-size: 1100MB
+      max-request-size: 1100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8

industry-system/industry-da/src/main/resources/application-prod-cy.yml

@@ -19,8 +19,8 @@ opcua:
 spring:
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1500MB
+      max-file-size: 1100MB
+      max-request-size: 1100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8

industry-system/industry-da/src/main/resources/application-test.yml

@@ -19,8 +19,8 @@ opcua:
 spring:
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1500MB
+      max-file-size: 1100MB
+      max-request-size: 1100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.1.253:3306/in_data_db3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8

industry-system/industry-da/src/main/resources/mapper/DeviceLedgerDao.xml

@@ -633,7 +633,8 @@
     <select id="getAllAlarmLogList" resultType="com.example.opc_common.entity.AlarmLog">
         SELECT
         c.id,c.item_id,e.item_read_name,e.describe,c.alarm_time,c.alarm_text,c.alarm_value,c.alarm_type
-        FROM t_alarm_log c LEFT JOIN t_item e ON c.item_id=e.id
+        from (select *
+        FROM t_alarm_log c
         WHERE c.item_id IN (SELECT a.item_id
         FROM (SELECT item_id
         FROM t_device_ledger_item
@@ -648,13 +649,15 @@
         </if>
         )) a
         INNER JOIN t_alarm_config b ON a.item_id = b.item_id
-        WHERE 1 = 1)
+        )
         <if test="(startTime != '') and (endTime!= '')">
             AND c.alarm_time BETWEEN #{startTime} AND #{endTime}
         </if>
 
         order by c.alarm_time desc
         limit #{startNum},#{limitNum}
+        ) c
+        LEFT JOIN t_item e ON c.item_id=e.id
     </select>
 
     <select id="getLedgerByDirectoryId" resultType="com.example.opc_common.entity.DeviceLedger">