代码提交

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

@@ -366,8 +366,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
                     break;
                 //平台下发设备后,主机上报该设备的全量数据(单设备)
                 case WebSocketConstants.INCREMENT_DEVICES_EVENT:
-                    final DvsBaseInfo dvsBaseInfo = JSON.parseObject(data.toString(), DvsBaseInfo.class);
-                    handleIncrementDevices(dvsBaseInfo, serverInfo);
+                    handleIncrementDevices(data.toString(), serverInfo);
                     break;
                 //平台下发设备后,主机上报该设备保存结果
                 case WebSocketConstants.INCREMENT_DEVICES_RESULT_EVENT:
@@ -406,7 +405,32 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         }
     }
 
-    private void handleIncrementDevices(DvsBaseInfo baseInfo, IotServerInfo serverInfo) {
+    private void handleIncrementDevices(String data, IotServerInfo serverInfo) {
+        final JSONObject object = JSON.parseObject(data);
+        final String deviceType = object.getString("deviceType");
+        final BaseDeviceTypeEnum deviceTypeEnum = BaseDeviceTypeEnum.valueOf(deviceType);
+        switch (deviceTypeEnum) {
+            case Dvs:
+                handleDvsIncrement(data, serverInfo);
+                break;
+            case AlarmHost:
+                handleAlarmHostIncrement(data, serverInfo);
+                break;
+        }
+
+
+    }
+
+    private void handleAlarmHostIncrement(String data, IotServerInfo serverInfo) {
+
+
+
+
+
+    }
+
+    private void handleDvsIncrement(String data, IotServerInfo serverInfo) {
+        final DvsBaseInfo baseInfo = JSON.parseObject(data, DvsBaseInfo.class);
         baseMapper.updateDvsAndChannelDeleted(serverInfo.getIotCode(), baseInfo.getDeviceCode());
         String code = BaseDeviceTypeEnum.valueOf(baseInfo.getType()).getCode();
         IotDeviceInfo hostInfo = selectByTypeAndCode(serverInfo.getIotCode(), code, baseInfo.getProductName(), baseInfo.getDeviceCode());
@@ -1038,6 +1062,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
     private JSONObject getAlarmHostJson(IotDeviceInfo deviceInfo) {
         final IotDeviceInfoExtend extend = iIotDeviceInfoExtendService.selectByDeviceId(deviceInfo.getId());
         JSONObject jsonObject = new JSONObject();
+        jsonObject.put("deviceId", deviceInfo.getId());
         jsonObject.put("deviceType", BaseDeviceTypeEnum.AlarmHost.name());
         jsonObject.put("name", deviceInfo.getDeviceCode());
         jsonObject.put("displayName", deviceInfo.getDeviceName());

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

@@ -134,7 +134,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
         final HashMap<String, Object> hashMap = new HashMap<>();
         final String userName = monitorCatConfig.getUserName();
         final String password = monitorCatConfig.getPassword();
-        hashMap.put("userName",userName);
+        hashMap.put("userName", userName);
         hashMap.put("userPwd", DigestUtil.sha1Hex(password));
         Object post = new Object();
         try {