Просмотр исходного кода

Web端录像文件自检 查询条件 录像质量诊断状态 新增“未知” 状态

zhulu 1 год назад
Родитель
Сommit
223fe277df

+ 2 - 2
project_data/sql/0.0.9/soc/soc.sql

@@ -80,6 +80,6 @@ delete from sys_menu where id in ('01788377780888264705','01788377908143448066')
 INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377780888264705, '导出机构补充信息', 103, 9, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportOrgExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:17:44', '', NULL, '');
 INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377908143448066, '导出GA38填写情况', 103, 10, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportDefenseDetailExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:18:14', '', NULL, '');
 
-
-
+delete from sys_dict_data where dict_type='video_diagnosis_state' and dict_label in ('未知');
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231115141, 2, '未知', '2', 'video_diagnosis_state', NULL, 'default', 'N', '0', '超级管理员', '2024-05-13 11:07:08', '', NULL, NULL);
 

+ 4 - 1
soc-modules/soc-modules-iot/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -118,9 +118,12 @@
         <if test="pageDto.daysState==1">
             and vdc.plan_days!=vdc.real_days
         </if>
-        <if test="pageDto.diagnosisState!=null">
+        <if test="pageDto.diagnosisState!=null and pageDto.diagnosisState!=2">
             and vdr.is_alarm=#{pageDto.diagnosisState}
         </if>
+        <if test="pageDto.diagnosisState!=null and pageDto.diagnosisState==2">
+            and vdr.id is null
+        </if>
         <!--        <if test="pageDto.status !=null">-->
         <!--            and dhd.`status` = #{pageDto.status}-->
         <!--        </if>-->