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

增加字段STATION_SHORT_NAME

This commit is contained in:
wgx 2026-01-10 11:36:09 +08:00
parent 653505dd4a
commit 5aa40eb13d
1 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ public class SurvStationInfoController {
List<String> orientList = new ArrayList<>(); List<String> orientList = new ArrayList<>();
List<String> liveList = new ArrayList<>(); List<String> liveList = new ArrayList<>();
List<String> orientIds = new ArrayList<>(); List<String> orientIds = new ArrayList<>();
List<String> waterList = new ArrayList<>();
if(record.getDeviceList()!=null&&record.getDeviceList().size()>0){ if(record.getDeviceList()!=null&&record.getDeviceList().size()>0){
List<String> deployList = new ArrayList<>(); List<String> deployList = new ArrayList<>();
for (SurvDeviceDeploy survDeviceDeploy : record.getDeviceList()) { for (SurvDeviceDeploy survDeviceDeploy : record.getDeviceList()) {
@ -130,6 +131,8 @@ public class SurvStationInfoController {
soilList.add(survDeviceDeploy.getDeployCode()); soilList.add(survDeviceDeploy.getDeployCode());
}else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备 }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备
airList.add(survDeviceDeploy.getDeployCode()); airList.add(survDeviceDeploy.getDeployCode());
}else if(PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())){//水质设备
waterList.add(survDeviceDeploy.getDeployCode());
}else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源 }else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
orientList.add(survDeviceDeploy.getDeployCode()); orientList.add(survDeviceDeploy.getDeployCode());
orientIds.add(survDeviceDeploy.getId()); orientIds.add(survDeviceDeploy.getId());
@ -154,24 +157,31 @@ public class SurvStationInfoController {
Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList); Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList);
finalDataCounts=finalDataCounts+dataCounts; finalDataCounts=finalDataCounts+dataCounts;
} }
if(!liveList.isEmpty()) { // //畜禽
//计算历史数据量 // if(!liveList.isEmpty()) {
Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList); // //计算历史数据量
finalDataCounts=finalDataCounts+dataCounts; // Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
} // finalDataCounts=finalDataCounts+dataCounts;
// }
//气实时 //气实时
if(!airList.isEmpty()) { // if(!airList.isEmpty()) {
//
//计算历史数据量 // //计算历史数据量
Integer dataCounts = hisdataAirService.getHisDataCount(airList); // Integer dataCounts = hisdataAirService.getHisDataCount(airList);
finalDataCounts=finalDataCounts+dataCounts; // finalDataCounts=finalDataCounts+dataCounts;
} // }
//土壤实时 //土壤实时
if(!soilList.isEmpty()){ if(!soilList.isEmpty()){
//计算历史数据量 //计算历史数据量
Integer dataCounts = hisdataSoilService.getHisDataCount(soilList); Integer dataCounts = hisdataSoilService.getHisDataCount(soilList);
finalDataCounts=finalDataCounts+dataCounts; finalDataCounts=finalDataCounts+dataCounts;
} }
//水质实时
if(!waterList.isEmpty()){
//计算历史数据量
Integer dataCounts = hisdataSoilService.getHisDataCount(waterList);
finalDataCounts=finalDataCounts+dataCounts;
}
//获取数据量 //获取数据量
record.setSurvDataCount(finalDataCounts); record.setSurvDataCount(finalDataCounts);
//补充设备在线状态 //补充设备在线状态
@ -294,29 +304,30 @@ public class SurvStationInfoController {
Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList); Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList);
finalDataCounts=finalDataCounts+dataCounts; finalDataCounts=finalDataCounts+dataCounts;
} }
if(!liveList.isEmpty()) { // //畜禽
SurvTransdataLivestockwaterVo survTransdataLivestockwaterVo = livestockwaterService.getNewestDataWithStation(liveList); // if(!liveList.isEmpty()) {
ConstructLive constructLive = new ConstructLive(); // SurvTransdataLivestockwaterVo survTransdataLivestockwaterVo = livestockwaterService.getNewestDataWithStation(liveList);
constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode())); // ConstructLive constructLive = new ConstructLive();
constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo); // constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode()));
LiveData.addAll(zhAdminFeignClient.constructLive(constructLive)); // constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo);
//计算历史数据量 // LiveData.addAll(zhAdminFeignClient.constructLive(constructLive));
Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList); // //计算历史数据量
finalDataCounts=finalDataCounts+dataCounts; // Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
} // finalDataCounts=finalDataCounts+dataCounts;
//气实时 // }
if(!airList.isEmpty()) { // //气实时
SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList); // if(!airList.isEmpty()) {
ConstructAir constructAir = new ConstructAir(); // SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
SurvTransdataAir survTransdataAir = new SurvTransdataAir(); // ConstructAir constructAir = new ConstructAir();
BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir); // SurvTransdataAir survTransdataAir = new SurvTransdataAir();
constructAir.setTransdataAir(survTransdataAir); // BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir);
constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode())); // constructAir.setTransdataAir(survTransdataAir);
airData.addAll(zhAdminFeignClient.constructAir(constructAir)); // constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
//计算历史数据量 // airData.addAll(zhAdminFeignClient.constructAir(constructAir));
Integer dataCounts = hisdataAirService.getHisDataCount(airList); // //计算历史数据量
finalDataCounts=finalDataCounts+dataCounts; // Integer dataCounts = hisdataAirService.getHisDataCount(airList);
} // finalDataCounts=finalDataCounts+dataCounts;
// }
//土壤实时 //土壤实时
if(!soilList.isEmpty()){ if(!soilList.isEmpty()){
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(soilList); SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(soilList);
@ -343,16 +354,16 @@ public class SurvStationInfoController {
Integer dataCounts = hisdataSoilService.getHisDataCount(waterList); Integer dataCounts = hisdataSoilService.getHisDataCount(waterList);
finalDataCounts=finalDataCounts+dataCounts; finalDataCounts=finalDataCounts+dataCounts;
} }
//恶臭实时 // //恶臭实时
if(!stinkList.isEmpty()){ // if(!stinkList.isEmpty()){
SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList); // SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList);
ConstructStink constructStink = new ConstructStink(); // ConstructStink constructStink = new ConstructStink();
constructStink.setTransdataStinkVo(survTransdataStinkVo); // constructStink.setTransdataStinkVo(survTransdataStinkVo);
stinkData.addAll(zhAdminFeignClient.constructStink(constructStink)); // stinkData.addAll(zhAdminFeignClient.constructStink(constructStink));
//计算历史数据量 // //计算历史数据量
Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList); // Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList);
finalDataCounts=finalDataCounts+dataCounts; //// finalDataCounts=finalDataCounts+dataCounts;
} // }
//获取数据量 //获取数据量
curStation.setSurvDataCount(finalDataCounts); curStation.setSurvDataCount(finalDataCounts);
//重新计算设备数 //重新计算设备数