fix: 编辑设备属性

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

@@ -620,19 +620,20 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         if (StringUtils.isNotEmpty(result)) {
             throw new RuntimeException("设备写入失败：" + result);
         }
-        List<PlatDeviceOther> platDeviceOtherList = platDeviceOtherService.list(new QueryWrapper<PlatDeviceOther>().lambda()
-                .eq(PlatDeviceOther::getOriDeviceId, deviceId));
-        for (PlatDeviceOther platDeviceOther : platDeviceOtherList) {
-            platDeviceOther.setAttribute(reqJson);
-            platDeviceOtherService.updateById(platDeviceOther);
-        }
-        if (dto.getRadarMount() != null) {
-            List<PlatDevice> platDeviceList = list(new QueryWrapper<PlatDevice>().lambda().eq(PlatDevice::getOriDeviceId, deviceId));
-            //更新区域设置设备安装方式
-            platRegionSettingService.update(new UpdateWrapper<PlatRegionSetting>().lambda()
-                    .set(PlatRegionSetting::getInstallType, dto.getRadarMount())
-                    .in(CollectionUtils.isNotEmpty(platDeviceList),PlatRegionSetting::getDeviceId, StreamUtil.map(platDeviceList,BaseEntity::getId)));
-        }
+        // 写入设备后等iot MQTT消息回复单独更新，不直接修改数据库属性
+        // List<PlatDeviceOther> platDeviceOtherList = platDeviceOtherService.list(new QueryWrapper<PlatDeviceOther>().lambda()
+        //         .eq(PlatDeviceOther::getOriDeviceId, deviceId));
+        // for (PlatDeviceOther platDeviceOther : platDeviceOtherList) {
+        //     platDeviceOther.setAttribute(reqJson);
+        //     platDeviceOtherService.updateById(platDeviceOther);
+        // }
+        // if (dto.getRadarMount() != null) {
+        //     List<PlatDevice> platDeviceList = list(new QueryWrapper<PlatDevice>().lambda().eq(PlatDevice::getOriDeviceId, deviceId));
+        //     //更新区域设置设备安装方式
+        //     platRegionSettingService.update(new UpdateWrapper<PlatRegionSetting>().lambda()
+        //             .set(PlatRegionSetting::getInstallType, dto.getRadarMount())
+        //             .in(CollectionUtils.isNotEmpty(platDeviceList),PlatRegionSetting::getDeviceId, StreamUtil.map(platDeviceList,BaseEntity::getId)));
+        // }
     }
 
     private PlatDeviceBaseAttrDTO getPlatDeviceBaseAttrDTO(String deviceId) {
@@ -645,35 +646,31 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
 
     private static Map<String, Object> getReqMap(PlatDeviceBaseAttrDTO dto, PlatDeviceBaseAttrDTO platDeviceBaseAttrDTO) {
         Map<String, Object> map = Maps.newHashMap();
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarMode(), dto.getRadarMode())) {
+        if (dto.getRadarMode() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarMode(), dto.getRadarMode())) {
             map.put("radarMode", dto.getRadarMode());
         }
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarMount(), dto.getRadarMount())) {
+        if (dto.getRadarMount() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarMount(), dto.getRadarMount())) {
             map.put("radarMount", dto.getRadarMount());
         }
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarHight(), dto.getRadarHight())) {
+        if (dto.getRadarHight() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarHight(), dto.getRadarHight())) {
             map.put("radarHight", dto.getRadarHight());
         }
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), dto.getRadarDelay())) {
-            map.put("radarDelay", dto.getRadarDelay() );
+        if (dto.getRadarDelay() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), dto.getRadarDelay())) {
+            map.put("radarDelay", dto.getRadarDelay());
         }
         PlatDeviceBaseAttrDTO.DeviceAttrRange radarDistance = platDeviceBaseAttrDTO.getRadarDistance();
-        if (!Objects.equals(radarDistance, dto.getRadarDistance())) {
-            if (dto.getRadarDistance() != null) {
+        if (dto.getRadarDistance() != null && !Objects.equals(radarDistance, dto.getRadarDistance())) {
             map.put("radarDistance", JSON.toJSONString(dto.getRadarDistance()));
         }
-        }
         PlatDeviceBaseAttrDTO.DeviceAttrRange radarAngle = platDeviceBaseAttrDTO.getRadarAngle();
-        if (!Objects.equals(radarAngle, dto.getRadarAngle())) {
-            if (dto.getRadarAngle() != null) {
+        if (dto.getRadarAngle() != null && !Objects.equals(radarAngle, dto.getRadarAngle())) {
             map.put("radarAngle", JSON.toJSONString(dto.getRadarAngle()));
         }
+        if (dto.getRadarSence() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarSence(), dto.getRadarSence())) {
+            map.put("radarSence", dto.getRadarSence());
         }
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarSence(), dto.getRadarSence())) {
-            map.put("radarSence", dto.getRadarSence() );
-        }
-        if (!Objects.equals(platDeviceBaseAttrDTO.getRadarSPL(), dto.getRadarSPL())) {
-            map.put("radarSPL", dto.getRadarSPL() );
+        if (dto.getRadarSPL() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarSPL(), dto.getRadarSPL())) {
+            map.put("radarSPL", dto.getRadarSPL());
         }
         return map;
     }