设备查询bug修改 与 历史数据兼容处理sql提交

project_data/sql/0.1.1/soc/soc.sql

@@ -1073,6 +1073,8 @@ INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `ty
 INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `status`, `is_system`, `path`, `remark`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (3713672266842155, '314', '紧急消防报警器', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, '0', '0', '3713672266842141-3713672266842155-', NULL, '2024-10-09 14:27:11.000000', NULL, NULL, NULL, 0);
 INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `status`, `is_system`, `path`, `remark`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (3713672266842156, '315', '火灾报警控制器', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, '0', '0', '3713672266842141-3713672266842156-', NULL, '2024-10-09 14:27:11.000000', NULL, NULL, NULL, 0);
 INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `status`, `is_system`, `path`, `remark`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (3713672266842157, '316', '防火门', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, '0', '0', '3713672266842141-3713672266842157-', NULL, '2024-10-09 14:27:11.000000', NULL, NULL, NULL, 0);
+INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `status`, `is_system`, `path`, `remark`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (1849277638232182785, '500', '霍尼韦尔', -1, 'BrandModelType', '品牌型号类', 1, 0, '0', '0', '1849277638232182785-', NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_multi_layer_dictionary` (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `status`, `is_system`, `path`, `remark`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (1849277638232182790, '600', '域适都', -1, 'BrandModelType', '品牌型号类', 1, 0, '0', '0', '1849277638232182790-', NULL, NULL, NULL, NULL, NULL, 0);
 
 
 delete from sys_dict_type where dict_type='sys_yes_no_num';
@@ -1395,4 +1397,26 @@ INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`
 INSERT INTO `sys_dict_data`(`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 (8, '防盗告警', 'FSU_Theft', 'sms_notify_type', NULL, 'default', 'N', '0', '超级管理员', '2024-06-06 14:19:44', '', NULL, NULL);
 INSERT INTO `sys_dict_data`(`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 (9, '门磁告警', 'FSU_DoorMagnetic', 'sms_notify_type', NULL, 'default', 'N', '0', '超级管理员', '2024-06-06 14:20:53', '', NULL, NULL);
 
+-- 处理历史设备数据
+-- 修改历史设备数据为使用中
+update  sys_device  set device_status =1 WHERE device_status is null;
+update  sys_device d INNER JOIN iot_alarm_subsystem s on d.id = s.device_id set s.source =0 WHERE s.source is null;
+
+-- 修改报警控制器的资产分类与设备类型;
+update  sys_device d INNER JOIN iot_alarm_subsystem s on d.id = s.device_id set d.asset_type='3713670431768576',device_type='6';
+-- 资产类型为技防的设备修改为主机设备类
+update  sys_device d   set asset_type='3713670431768576' WHERE asset_type='2';
+-- 修改设备类别为硬盘录像机的设备为 监控主机
+update  sys_device d   set device_type='3713671510851584' WHERE device_type='2';
+-- 修改设备类别为摄像头的设备为 摄像头
+update  sys_device d   set device_type='3713671711473664' WHERE device_type='0';
+-- 修改历史设备的品牌信息
+update  sys_device  set device_brand = '1' WHERE device_brand like '%海康%';
+update  sys_device  set device_brand = '2' WHERE device_brand like '%大华%';
+update  sys_device  set device_brand = '1849277638232182785' WHERE device_brand like '%霍尼韦尔%';
+update  sys_device  set device_brand = '1849277638232182790' WHERE device_brand like '%域适都%';
+
+
+
+
 -- 升级脚本执行完成

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysDeviceMapper.xml

@@ -348,7 +348,7 @@
             and d.org_id = #{req.orgId}
         </if>
         <if test="req.checkSub == true">
-            and d.org_path like concat(#{req.orgPath},'%')
+            and o.path like concat(#{req.orgPath},'%')
         </if>
         order by d.create_time desc
     </select>