fix: iot修改网络属性同步

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -1078,12 +1078,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
     public void syncIotProperties(String deviceId, JSONObject iotProperties) {
     public void syncIotProperties(String deviceId, JSONObject iotProperties) {
         // 网络属性
         // 网络属性
         if (iotProperties.containsKey("usrServerInfo")) {
         if (iotProperties.containsKey("usrServerInfo")) {
-            UserServerInfo userServerInfo = iotProperties.toJavaObject(UserServerInfo.class);
+            UserServerInfo userServerInfo = iotProperties.getJSONObject("usrServerInfo").toJavaObject(UserServerInfo.class);
+            if (userServerInfo == null) {
+                return;
+            }
             platDeviceOtherService.update(new UpdateWrapper<PlatDeviceOther>().lambda()
             platDeviceOtherService.update(new UpdateWrapper<PlatDeviceOther>().lambda()
-                    .set(PlatDeviceOther::getProtocolAddress, userServerInfo.getAddr())
-                    .set(PlatDeviceOther::getProtocolPort, userServerInfo.getPort())
-                    .set(PlatDeviceOther::getProtocolAccount, userServerInfo.getUsername())
-                    .set(PlatDeviceOther::getProtocolPassword, userServerInfo.getPassword())
+                    .set(StringUtils.isNotBlank(userServerInfo.getAddr()), PlatDeviceOther::getProtocolAddress, userServerInfo.getAddr())
+                    .set(userServerInfo.getPort() != null, PlatDeviceOther::getProtocolPort, userServerInfo.getPort())
+                    .set(StringUtils.isNotBlank(userServerInfo.getUsername()), PlatDeviceOther::getProtocolAccount, userServerInfo.getUsername())
+                    .set(StringUtils.isNotBlank(userServerInfo.getPassword()), PlatDeviceOther::getProtocolPassword, userServerInfo.getPassword())
                     .eq(PlatDeviceOther::getOriDeviceId, deviceId));
                     .eq(PlatDeviceOther::getOriDeviceId, deviceId));
             return;
             return;
         }
         }