资产设备表sys_device 同步代码提交

project_data/sql/0.1.1/soc/soc.sql

@@ -1156,3 +1156,4 @@ INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_na
 INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_name, level, sort, create_time, modified_name, update_time, modified_id, deleted) VALUES (3713672266842155, '314', '紧急消防报警器', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, null, null, null, null, 0);
 INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_name, level, sort, create_time, modified_name, update_time, modified_id, deleted) VALUES (3713672266842156, '315', '火灾报警控制器', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, null, null, null, null, 0);
 INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_name, level, sort, create_time, modified_name, update_time, modified_id, deleted) VALUES (3713672266842157, '316', '防火门', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, null, null, null, null, 0);
+INSERT INTO sys_multi_layer_dictionary (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (6, '226', '报警控制器', 3713670431768576, 'AssetDeviceType', '资产设备类', 2, 0, NULL, NULL, NULL, NULL, 0);

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

@@ -67,7 +67,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         SysDevice sysDevice = new SysDevice();
         sysDevice.setDeviceName(deviceInfo.getDeviceName());
         sysDevice.setUseTime(now);
-        sysDevice.setDeviceStatus(0);
+        sysDevice.setDeviceStatus(1);
         sysDevice.setDelFlag("0");
         sysDevice.setOrgId(deviceInfo.getOrgId());
         sysDevice.setOrgName(deviceInfo.getOrgName());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeviceServiceImpl.java

@@ -259,7 +259,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         /**
          * 这块逻辑代码，上层出错时，会导致新增设备出错
          */
-        if (sysDevice.getDeviceType().equals("1")) {
+        if ("6".equals(sysDevice.getDeviceType()) && ObjectUtil.isNull(sysDevice.getBusinessDeviceId())) {
             ProtectionDTO protectionDTO = new ProtectionDTO();
             protectionDTO.setName(sysDevice.getDeviceName());
             protectionDTO.setOrgPath(sysOrg.getPath());

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

@@ -654,7 +654,7 @@
         u.deleted,
         u.last_ip,
         u.last_time,
-        o.NAME AS org_name,
+        o.short_name AS org_name,
         o.path AS org_path,
         o.affiliated_area,
         o.affiliated_bank,