Merge branch 'fu-dev' of uskycloud/usky-modules into master

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/CdiDeliveryLogServiceImpl.java

@@ -345,7 +345,7 @@ public class CdiDeliveryLogServiceImpl extends AbstractCrudService<CdiDeliveryLo
             page = this.page(page, queryWrapper);
         }
         page.getRecords().forEach(log -> {
-            log.setNickName(userMap.get(log.getUserName()));
+            log.setNickName(userMap.getOrDefault(log.getUserName(), log.getUserName()));
             log.setDataTypeName((MqttTopics.getDescByTopic(log.getTopic())));
         });
 

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/IotDataTransferService.java

@@ -260,6 +260,14 @@ public class IotDataTransferService {
                         case 708:
                             sendHumidityData(deviceId, dataEndTime, deviceDataItem, engineeringId, transferVO.getUsername());
                             break;
+                        case 709:
+                            sendOxygenData(deviceId, dataEndTime, deviceDataItem, engineeringId, transferVO.getUsername());
+                            break;
+                        case 710:
+                            sendCo2Data(deviceId, dataEndTime, deviceDataItem, engineeringId, transferVO.getUsername());
+                            break;
+                        case 711:
+                            break;
                     }
                 } catch (Exception e) {
                     log.warn("设备{}推送失败：{}", deviceId, e.getMessage());
@@ -617,7 +625,7 @@ public class IotDataTransferService {
     }
 
     /**
-     * 推送氧气浓度信息（705）
+     * 推送氧气浓度信息（709）
      *
      * @param deviceDataItem 设备数据
      * @param deviceId 设备ID
@@ -1009,6 +1017,7 @@ public class IotDataTransferService {
                     result = sendPersonPresence(transferVO);
                     break;
                 case 704:
+                    if (tenantId == 1205) break;
                     result = sendElectricityLoad(transferVO);
                     break;
                 // case 712: