|
@@ -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();
|