|
@@ -205,7 +205,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
jsonObject.put("temp", 0);//温度
|
|
|
jsonObject.put("hum", 0);//湿度
|
|
|
jsonObject.put("location", basePigpens.get(i).getBuildName());
|
|
|
- jsonObject.put("unit_id", 0);//单元id
|
|
|
+ jsonObject.put("unit_id", basePigpens.get(i).getId());//单元id
|
|
|
} else {
|
|
|
jsonObject.put("temp", envData.getEnvTemp());//温度
|
|
|
jsonObject.put("hum", envData.getEnvHum());//湿度
|
|
@@ -243,6 +243,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
endTime = endTime + " 23:59:59";
|
|
|
queryWrapper.between("create_time", startTime, endTime);
|
|
|
List<EnvData> envData = dataMapper.listDay(queryWrapper);
|
|
|
+
|
|
|
map.put("location", basePigpen.getBuildName());
|
|
|
map.put("data", envData);
|
|
|
}
|
|
@@ -272,6 +273,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
|
Date timesmorning = DataUill.getTimesmorning();
|
|
|
queryWrapper.ge("create_time", timesmorning);
|
|
|
List<EnvData> envData = dataMapper.listDay(queryWrapper);
|
|
|
+
|
|
|
map.put("location", basePigpen.getBuildName());
|
|
|
map.put("data", envData);
|
|
|
}
|