修改上传视频、按管网分类统计增加报警数量

operation_manager/src/main/java/com/huaxu/common/MimeType.java

@@ -21,7 +21,10 @@ public class MimeType {
             //许可证书
             "lic",
             // pdf
-            "pdf"};
+            "pdf",
+            //视频
+            "mp4","avi","rm","mov","qt"
+    };
 
     public static String getExtension(String urlPrefix) {
         switch (urlPrefix) {

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -307,9 +307,12 @@
     </select>
     <!--按管网名称分类查询设备数量-->
     <select id="selectDeviceCount" resultType="java.util.Map">
-        select  t1.id sceneId,t1.scene_name sceneName,sum(if(t5.id is null,0,1)) deviceCount
+        select  t1.id sceneId,t1.scene_name sceneName,sum(if(t5.id is null,0,1)) deviceCount,sum(if(t7.device_id is null,0,1)) alarmCount
         from sms_scene t1
         <include refid="deviceLeftJoins"/>
+        left join(
+            select a1.scene_id, a1.device_id from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
+        )t7 on t7.scene_id=t2.scene_id and t7.device_id=t2.device_id
         where t1.parent_scene_id = 0 and t1. status = 1 and t1. enable_state = 1 and t3.scene_type_name = '管网'
         <if test="sceneIds != null and sceneIds.size() > 0">
             and t1.id  in
@@ -336,7 +339,7 @@
         left join sms_device_parm t2 on t2.device_id=t1.id and t2.is_map=1 and t2.status=1
         left join sms_device_attribute t3 on t2.attribute_id=t3.id and t3.status=1
         left join (
-        select a1.device_id,count(1) alarm_count from sms_alarm_details a1 where a1.device_id= #{deviceId} and a1.`status` = 1 and a1.state = 1
+            select a1.device_id,count(1) alarm_count from sms_alarm_details a1 where a1.device_id= #{deviceId} and a1.`status` = 1 and a1.state = 1
         )t4 on t4.device_id=t1.id
         left join sms_alarm_details t6 on t6.device_id=t1.id and t6.attribute_id=t2.attribute_id and t6.status = 1 and t6.state=1
         where t1. status = 1 and t1. enable_state = 1 and t1.id= #{deviceId}
@@ -348,7 +351,7 @@
         from sms_scene t1
         <include refid="deviceInnerJoins"/>
         left join(
-         select a1.scene_id, a1.device_id from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
+            select a1.scene_id, a1.device_id from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
         )t7 on t7.scene_id=t2.scene_id and t7.device_id=t2.device_id
         where t1.parent_scene_id = 0 and t1. status = 1 and t1. enable_state = 1 and t3.scene_type_name = '管网'
         <choose>
@@ -470,7 +473,7 @@
         from sms_scene t1
         <include refid="deviceInnerJoins"/>
         left join(
-        select a1.scene_id, a1.device_id ,count(1) alarm_count from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
+            select a1.scene_id, a1.device_id ,count(1) alarm_count from sms_alarm_details a1 where a1.`status` = 1 and a1.state = 1 group by a1.scene_id, a1.device_id
         )t7 on t7.scene_id=t2.scene_id and t7.device_id=t2.device_id
         where t1.parent_scene_id = 0 and t1. status = 1 and t1. enable_state = 1 and t3.scene_type_name = '管网' and t5.scene_type_name = #{onlineDataDto.sceneTypeName}
         <if test="onlineDataDto.sceneIds != null and onlineDataDto.sceneIds.size() > 0">
@@ -524,7 +527,7 @@
         from sms_scene t1
         <include refid="sceneDeviceJoins"/>
         inner join sms_month_report t8 on t8.device_id=t2.device_id and t8.attribute_id =t5.attribute_id
-        and t8.year = year(now() + interval-1 day) and t8.month = month(now() + interval-1 day) and t8.day = day(now() + interval-1 day)
+            and t8.year = year(now() + interval-1 day) and t8.month = month(now() + interval-1 day) and t8.day = day(now() + interval-1 day)
         where t1.parent_scene_id = 0 and t1. status = 1 and t5.parm_type in(3) and t3.scene_type_name = '水厂'
         <if test="sceneIds != null and sceneIds.size() > 0">
             and t1.id  in