报警修改

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

@@ -202,15 +202,15 @@ public class IotDeviceStatusServiceImpl extends ServiceImpl<IotDeviceStatusMappe
             iotAlarmData.setOrgId(sysOrg.getId());
             iotAlarmData.setDeviceId(String.valueOf(deviceInfo.getId()));
             iotAlarmData.setTime(dataReq.getStartTime());
-            final String sourceType = SensorType.getCodeByProduct(dataReq.getProductType());
+            //final String sourceType = SensorType.getCodeByProduct(dataReq.getProductType());
             fieldList.stream()
-                    .filter(r -> ObjectUtil.equal(String.valueOf(r.getProductType()), sourceType))
+                    .filter(r -> ObjectUtil.equal(String.valueOf(r.getProductType()), dataReq.getProductType()))
                     .filter(r -> ObjectUtil.equal(r.getProductProperty(), dataReq.getProductProperty()))
                     .findAny()
                     .ifPresent(r -> {
                         iotAlarmData.setSourceType(r.getProductType());
                         iotAlarmData.setSourceTypeDes(r.getProductName());
-                        iotAlarmData.setFieldCode(r.getProductType());
+                        iotAlarmData.setFieldCode(r.getProductProperty());
                     });
             iotAlarmDataService.saveOrUpdate(iotAlarmData);
             // 发生报警