wwh 1 rok temu
rodzic
commit
32b2bb0e48

+ 1 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/mqtt/subscribe/PushCallback.java

@@ -201,6 +201,7 @@ public class PushCallback implements MqttCallbackExtended {
                 envHumi.setDeviceCode(deviceRegister.getDeviceCode());
                 envHumi.setHumi(humi.divide(big2));
                 envHumi.setAskTime(date);
+                envHumi.setSensorSn(2);
                 envHumi.setAddTime(date);
                 envHumi.setAddDate(date);
                 envHumi.setFarmCode(deviceRegister.getFarmCode());

+ 6 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/BaseDeviceCofigServiceImpl.java

@@ -66,6 +66,12 @@ public class BaseDeviceCofigServiceImpl extends ServiceImpl<BaseDeviceCofigMappe
         String deviceCode = deviceRegister.getDeviceCode();
         Date beginOfDay = DateUtil.beginOfDay(new Date());
         AllDataDto dataDto = envDeviceRegisterMapper.selectAllData(deviceCode,beginOfDay);
+        if ("122".equals(deviceCode)) {
+            QueryWrapper<EnvHumi> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("device_code", 122).eq("sensor_sn", 2).orderByDesc("id").last(" limit 1");
+            EnvHumi envHumi = envHumiMapper.selectOne(queryWrapper);
+            dataDto.setEnvHumi(envHumi.getHumi().toString());
+        }
         return new Result(ResultCode.SUCCESS,dataDto);
 
        /* Map endMap = new HashMap();