Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

project_data/sql/1.0.11/soc/soc.sql

@@ -279,9 +279,10 @@ INSERT INTO `iot_server_product`(`id`, `name`, `display_name`, `enabled`, `categ
 INSERT INTO `iot_server_product`(`id`, `name`, `display_name`, `enabled`, `categories`, `models`) VALUES ('20fa2a1a-a069-4975-8d64-091a39539e02', 'DOOR_HOST', '门禁主机', 1, '[\r\n  \"Host_Door\"\r\n]', '[\r\n  \"Normal\"\r\n]');
 
 -- 摄像机诊断菜单
-delete from `sys_menu` where id in (01747915341556742146,01761830909641408513);
-INSERT INTO `sys_menu` VALUES (01747915341556742146, '视频诊断任务', 1747911340288892930, 3, 'diagnoseMission', 'iot/diagnoseMission', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseMission', '1', 'client', NULL, '超级管理员', '2024-11-18 17:22:07', '超级管理员', '2024-11-18 17:22:07', '');
-INSERT INTO `sys_menu` VALUES (01761830909641408513, '视频诊断阈值', 1747911340288892930, 2, 'diagnoseThreshold', 'iot/diagnoseThreshold', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseThreshold', '1', 'client', NULL, '超级管理员', '2024-11-18 09:37:19', '超级管理员', '2024-11-18 09:37:19', '');
+delete from `sys_menu` where id in (01747912341556742146,01747915341556742146,01761830909641408513);
+INSERT INTO `sys_menu` VALUES (01747912341556742146, '规则配置', 0, 31, 'rule', NULL, NULL, 1, 0, 'M', '0', '0', '', '1', 'system', NULL, '超级管理员', '2024-11-18 13:55:15', '超级管理员', '2024-11-18 13:55:15', '');
+INSERT INTO `sys_menu` VALUES (01747915341556742146, '视频诊断任务', 1747912341556742146, 3, 'diagnoseMission', 'iot/diagnoseMission', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseMission', '1', 'client', NULL, '超级管理员', '2024-11-18 17:22:07', '超级管理员', '2024-11-18 17:22:07', '');
+INSERT INTO `sys_menu` VALUES (01761830909641408513, '视频诊断阈值', 1747912341556742146, 2, 'diagnoseThreshold', 'iot/diagnoseThreshold', NULL, 1, 0, 'C', '0', '0', 'iot:diagnoseThreshold', '1', 'client', NULL, '超级管理员', '2024-11-18 09:37:19', '超级管理员', '2024-11-18 09:37:19', '');
 
 update sys_multi_layer_dictionary set is_system=1 where id in (1,2,3,4);
 -- 新增预置品牌

soc-modules/soc-modules-host/src/main/resources/mapper/IotDeviceInfoMapper.xml

@@ -66,13 +66,13 @@
                     create_by = #{item.createBy},
                 </if>
                 <if test="item.updateBy != null">
-                    update_by = #{item.updateBy}
+                    update_by = #{item.updateBy},
                 </if>
                 <if test="item.enable != null">
-                    `enable` = #{item.updateBy}
+                    `enable` = #{item.enable},
                 </if>
                 <if test="item.syncStatus != null">
-                    sync_status = #{item.syncStatus}
+                    sync_status = #{item.syncStatus},
                 </if>
             </set>
             WHERE id = #{item.id}