fix: iot设备属性同步修改、配网保存设备属性

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

 package com.makeit.service.platform.device;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.common.dto.BaseIdDTO;
@@ -94,5 +93,5 @@ public interface PlatDeviceService extends IService<PlatDevice> {
 
     void devicePushLog(MultipartFile multipartFile, String deviceId) throws IOException;
 
-    void receiveIotProperties(String deviceId, JSONObject iotProperties);
+    void syncIotProperties(String deviceId);
 }

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

@@ -69,6 +69,7 @@ import com.makeit.shengwang.agora.service.ShengwangService;
 import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
 import com.makeit.utils.DeviceCacheUtil;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
+import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.old.StringUtils;
@@ -380,6 +381,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         for (PlatDeviceOther platDeviceOther : platDeviceOtherList) {
             BeanUtils.copyProperties(dto, platDeviceOther,"id");
             platDeviceOther.setDeviceId(id);
+            platDeviceOther.setAttribute(JSON.toJSONString(getDeviceBaseAttrDTO(db.getOriDeviceId())));
             platDeviceOther.setOriDeviceId(db.getOriDeviceId());
             platDeviceOtherService.saveOrUpdate(platDeviceOther);
         }
@@ -931,45 +933,9 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
     }
 
     @Override
-    @TenantIdIgnore
     @Transactional(rollbackFor = Exception.class)
-    public void receiveIotProperties(String deviceId, JSONObject iotProperties) {
-        PlatDeviceOther deviceOther = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
-                .eq(PlatDeviceOther::getOriDeviceId, deviceId)
-                .last("limit 1"));
-        if (deviceOther == null) {
-            log.warn("iot修改属性回复,设备其他信息不存在,设备id:{}", deviceId);
-            return;
-        }
-        PlatDeviceBaseAttrDTO platDeviceBaseAttrDTO = JSON.parseObject(deviceOther.getAttribute(), PlatDeviceBaseAttrDTO.class);
-        if (platDeviceBaseAttrDTO == null) {
-            platDeviceBaseAttrDTO = new PlatDeviceBaseAttrDTO();
-        }
-        PlatDeviceBaseAttrDTO iotAttr = iotProperties.toJavaObject(PlatDeviceBaseAttrDTO.class);
-        if (iotAttr.getRadarMode() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarMode(), iotAttr.getRadarMode())) {
-            platDeviceBaseAttrDTO.setRadarMode(iotAttr.getRadarMode());
-        }
-        if (iotAttr.getRadarMount() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarMount(), iotAttr.getRadarMount())) {
-            platDeviceBaseAttrDTO.setRadarMount(iotAttr.getRadarMount());
-        }
-        if (iotAttr.getRadarHight() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarHight(), iotAttr.getRadarHight())) {
-            platDeviceBaseAttrDTO.setRadarHight(iotAttr.getRadarHight());
-        }
-        if (iotAttr.getRadarDelay() != null && !Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), iotAttr.getRadarDelay())) {
-            platDeviceBaseAttrDTO.setRadarDelay(iotAttr.getRadarDelay());
-        }
-        PlatDeviceBaseAttrDTO.DeviceAttrRange radarDistance = platDeviceBaseAttrDTO.getRadarDistance();
-        if (iotAttr.getRadarDistance() != null && !Objects.equals(radarDistance, iotAttr.getRadarDistance())) {
-            if (radarDistance != null && radarDistance.getMax() != null && radarDistance.getMin() != null) {
-                platDeviceBaseAttrDTO.setRadarDistance(iotAttr.getRadarDistance());
-            }
-        }
-        PlatDeviceBaseAttrDTO.DeviceAttrRange radarAngle = platDeviceBaseAttrDTO.getRadarAngle();
-        if (iotAttr.getRadarAngle() != null && !Objects.equals(radarAngle, iotAttr.getRadarAngle())) {
-            if (radarAngle != null && radarAngle.getMax() != null && radarAngle.getMin() != null) {
-                platDeviceBaseAttrDTO.setRadarAngle(iotAttr.getRadarAngle());
-            }
-        }
+    public void syncIotProperties(String deviceId) {
+        PlatDeviceBaseAttrDTO platDeviceBaseAttrDTO = getDeviceBaseAttrDTO(deviceId);
         String attr = JSON.toJSONString(platDeviceBaseAttrDTO);
         platDeviceOtherService.update(new UpdateWrapper<PlatDeviceOther>().lambda()
                 .set(PlatDeviceOther::getAttribute, attr)
@@ -983,4 +949,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         }
     }
 
+    private PlatDeviceBaseAttrDTO getDeviceBaseAttrDTO(String deviceId) {
+        String propertiesName = "radarMount,radarMode,radarHight,radarDistance,radarAngle,radarDelay,radarSence,radarSPL";
+        PlatDeviceAttrWechatDTO dto = new PlatDeviceAttrWechatDTO();
+        dto.setDeviceId(deviceId);
+        dto.setReadProperties(propertiesName);
+        List<DeviceProperties> data = this.readDeviceProperties(dto);
+        Map<String, Object> attrMap = data.stream().filter(p -> !Objects.isNull(p.getValue())).collect(Collectors.toMap(DeviceProperties::getProperty, DeviceProperties::getValue));
+        PlatDeviceBaseAttrDTO platDeviceBaseAttrDTO = JsonUtil.mapToBean(attrMap, PlatDeviceBaseAttrDTO.class);
+        return platDeviceBaseAttrDTO;
+    }
+
 }

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -18,7 +18,6 @@ import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.saas.SaasSleepAnalysisModelService;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
-import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
@@ -36,7 +35,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 
@@ -119,26 +117,13 @@ public class PushCallback implements MqttCallback {
      * IOT端设备属性修改后同步
      * @param device
      */
+    @TenantIdIgnore
+    @Async
     public void syncProperties(DeviceInfo device) {
-        if (!(WRITE_PROPERTY.equals(device.getMessageType()) || WRITE_PROPERTY_REPLY.equals(device.getMessageType()))) {
-            return;
-        }
-        // 记录修改的属性
-        String key = DEVICE_WRITE_PROPERTY_KEY + device.getDeviceId();
-        if (WRITE_PROPERTY.equals(device.getMessageType())) {
-            RedisUtil.set(key, device.getProperties(), 10, TimeUnit.SECONDS);
-        }
-        // 收到修改属性回复
-        if (WRITE_PROPERTY_REPLY.equals(device.getMessageType())) {
-            JSONObject properties = RedisUtil.get(key);
-            if (properties == null) {
+        if (!WRITE_PROPERTY.equals(device.getMessageType())) {
             return;
         }
-            CompletableFuture.runAsync(() -> {
-                platDeviceService.receiveIotProperties(device.getDeviceId(), properties);
-                RedisUtil.delete(key);
-            });
-        }
+        platDeviceService.syncIotProperties(device.getDeviceId());
     }
 
     /**