Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序分开实时数据类型

This commit is contained in:
zy 2025-12-06 16:58:26 +08:00
parent 96bfd3e3c3
commit ad7f11cc3d
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
View File

@ -274,7 +274,14 @@ public class SurvStationInfoController {
List<SurvDeviceDeploy> adds = iotutils.addOnlineStatus(camList);
jsonObject.put("survCamera",adds);
List<CommonDataTrans> jsonArray = new ArrayList<>();
List<CommonDataTrans> orientData = new ArrayList<>();
List<CommonDataTrans> LiveData = new ArrayList<>();
List<CommonDataTrans> stinkData = new ArrayList<>();
List<CommonDataTrans> airData = new ArrayList<>();
List<CommonDataTrans> soilData = new ArrayList<>();
List<CommonDataTrans> waterData = new ArrayList<>();
Integer finalDataCounts = 0;
//水实时
if(!orientList.isEmpty()) {
@ -282,7 +289,7 @@ public class SurvStationInfoController {
ConstructOrient constructOrient = new ConstructOrient();
constructOrient.setDeploy(deployMap.get(survTransdataOrientwaterVo.getDeployCode()));
constructOrient.setTransdataOrientwaterVo(survTransdataOrientwaterVo);
jsonArray.addAll(zhAdminFeignClient.constructOrient(constructOrient));
orientData.addAll(zhAdminFeignClient.constructOrient(constructOrient));
//计算历史数据量
Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList);
finalDataCounts=finalDataCounts+dataCounts;
@ -292,7 +299,7 @@ public class SurvStationInfoController {
ConstructLive constructLive = new ConstructLive();
constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode()));
constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo);
jsonArray.addAll(zhAdminFeignClient.constructLive(constructLive));
LiveData.addAll(zhAdminFeignClient.constructLive(constructLive));
//计算历史数据量
Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
finalDataCounts=finalDataCounts+dataCounts;
@ -305,7 +312,7 @@ public class SurvStationInfoController {
BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir);
constructAir.setTransdataAir(survTransdataAir);
constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
jsonArray.addAll(zhAdminFeignClient.constructAir(constructAir));
airData.addAll(zhAdminFeignClient.constructAir(constructAir));
//计算历史数据量
Integer dataCounts = hisdataAirService.getHisDataCount(airList);
finalDataCounts=finalDataCounts+dataCounts;
@ -318,7 +325,7 @@ public class SurvStationInfoController {
BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil);
constructSoil.setTransdataSoil(survTransdataSoil);
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
soilData.addAll(zhAdminFeignClient.constructSoil(constructSoil));
//计算历史数据量
Integer dataCounts = hisdataSoilService.getHisDataCount(soilList);
finalDataCounts=finalDataCounts+dataCounts;
@ -331,7 +338,7 @@ public class SurvStationInfoController {
BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil);
constructSoil.setTransdataSoil(survTransdataSoil);
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
waterData.addAll(zhAdminFeignClient.constructSoil(constructSoil));
//计算历史数据量
Integer dataCounts = hisdataSoilService.getHisDataCount(waterList);
finalDataCounts=finalDataCounts+dataCounts;
@ -341,7 +348,7 @@ public class SurvStationInfoController {
SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList);
ConstructStink constructStink = new ConstructStink();
constructStink.setTransdataStinkVo(survTransdataStinkVo);
jsonArray.addAll(zhAdminFeignClient.constructStink(constructStink));
stinkData.addAll(zhAdminFeignClient.constructStink(constructStink));
//计算历史数据量
Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList);
finalDataCounts=finalDataCounts+dataCounts;
@ -369,11 +376,15 @@ public class SurvStationInfoController {
survList = zhAdminFeignClient.translateArrPollution(transSurvObjVo);
}
curStation.setSurvColorItems(survList);
jsonObject.put("stationInfo",curStation);
//TODO 实时监测数据
jsonObject.put("liveSurvData",jsonArray);
//TODO 历史监测数据
//实时数据
jsonObject.put("airSurvData",airData);//空气
jsonObject.put("soilSurvData",soilData);//土壤
jsonObject.put("waterSurvData",waterData);//水五常
jsonObject.put("orientSurvData",orientData);//面源
jsonObject.put("liveSurvData",liveList);//畜禽
jsonObject.put("stinkSurvData",stinkData);//恶臭
//历史数据
JSONArray hisjsonArray = new JSONArray();
if(!orientList.isEmpty()) {
List<SurvTransdataOrientwaterVo> oriDataList = hisdataOrientwaterService.getResentData(orientList,5);