设备同步代码提交

project_data/sql/1.0.11/soc.sql

@@ -250,4 +250,19 @@ INSERT INTO `iot_server_product`(`id`, `name`, `display_name`, `enabled`, `categ
 
 -- 摄像机诊断菜单
 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', '');
+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', '');
+
+update sys_multi_layer_dictionary set is_system=1 where id in (1,2,3,4);
+
+
+
+
+
+
+
+
+
+
+
+
+

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -231,7 +231,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
             deviceInfo.setDeviceCode(generalDeviceCode(BaseDeviceTypeEnum.Dvs, null));
         }
         IotServerProduct product = baseMapper.selectProduct(req.getDeviceProduct());
-        SysMultiLayerDictionary dictionary = baseMapper.selectMultiLayerDictionaryByName(product.getName());
+        SysMultiLayerDictionary dictionary = baseMapper.selectMultiLayerDictionaryByName(product.getProducer());
         if (dictionary!=null){
             deviceInfo.setDeviceBrand(dictionary.getId());
         }