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

空气报错bug

This commit is contained in:
zhangyue 2026-08-12 17:44:33 +08:00
parent e2431f6777
commit cda4991428
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataAirController.java
View File

@ -63,9 +63,8 @@ public class SurvHisdataAirController extends JeecgController<SurvHisdataAir, IS
List<String> deviceList = new ArrayList<>(); List<String> deviceList = new ArrayList<>();
if(StringUtils.isNotBlank(survHisdataAir.getStationCode())){ if(StringUtils.isNotBlank(survHisdataAir.getStationCode())){
deviceList = deployService.getDeviceListByStation(survHisdataAir.getStationCode(), PollutionConstants.AIR_SURV); deviceList = deployService.getDeviceListByStation(survHisdataAir.getStationCode(), PollutionConstants.AIR_SURV);
if(deviceList.size() ==0){//如果没有此类设备，则返回空 if(deviceList.isEmpty()){//如果没有此类设备，则返回空
IPage emptyPage = new Page(1,1); return Result.OK(new Page<>(pageNo,pageSize));
return Result.OK(emptyPage);
} }
} }
IPage<SurvHisdataAir> pageList = survHisdataAirService.pages(page, survHisdataAir,deviceList); IPage<SurvHisdataAir> pageList = survHisdataAirService.pages(page, survHisdataAir,deviceList);

5
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataAirController.java
View File

@ -63,9 +63,8 @@ public class SurvTransdataAirController extends JeecgController<SurvTransdataAir
List<String> deviceList = new ArrayList<>(); List<String> deviceList = new ArrayList<>();
if(StringUtils.isNotBlank(survTransdataAir.getStationCode())) { if(StringUtils.isNotBlank(survTransdataAir.getStationCode())) {
deviceList = deployService.getDeviceListByStation(survTransdataAir.getStationCode(), PollutionConstants.AIR_SURV); deviceList = deployService.getDeviceListByStation(survTransdataAir.getStationCode(), PollutionConstants.AIR_SURV);
if (deviceList.size() == 0) {//如果没有此类设备，则返回空 if (deviceList.isEmpty()) {//如果没有此类设备，则返回空
IPage emptyPage = new Page(1,1); return Result.OK(new Page<>(pageNo,pageSize));
return Result.OK(emptyPage);
} }
} }
IPage<SurvTransdataAir> pageList = survTransdataAirService.pages(page, survTransdataAir,deviceList); IPage<SurvTransdataAir> pageList = survTransdataAirService.pages(page, survTransdataAir,deviceList);

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataAirServiceImpl.java
View File

@ -44,7 +44,7 @@ public class SurvHisdataAirServiceImpl extends ServiceImpl<SurvHisdataAirMapper,
} }
survHisdataAir.setDeployList(deployList); survHisdataAir.setDeployList(deployList);
IPage<SurvHisdataAir> p = baseMapper.pages(page,survHisdataAir,deviceList); IPage<SurvHisdataAir> p = baseMapper.pages(page,survHisdataAir,deviceList);
fill(p.getRecords()); // fill(p.getRecords());
return p; return p;
} }
@ -56,7 +56,7 @@ public class SurvHisdataAirServiceImpl extends ServiceImpl<SurvHisdataAirMapper,
@Override @Override
public List<SurvHisdataAir> listByParams(String deployCode, LocalDateTime startDateTime, LocalDateTime endDateTime) { public List<SurvHisdataAir> listByParams(String deployCode, LocalDateTime startDateTime, LocalDateTime endDateTime) {
List<SurvHisdataAir> l = baseMapper.listByParams(deployCode,startDateTime,endDateTime); List<SurvHisdataAir> l = baseMapper.listByParams(deployCode,startDateTime,endDateTime);
fill(l); // fill(l);
return l; return l;
} }

2
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java
View File

@ -48,7 +48,7 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl<SurvTransdataAirMap
} }
survTransdataAir.setDeployList(deployList); survTransdataAir.setDeployList(deployList);
IPage<SurvTransdataAir> p = baseMapper.pages(page,survTransdataAir,deviceList); IPage<SurvTransdataAir> p = baseMapper.pages(page,survTransdataAir,deviceList);
fill(p.getRecords()); // fill(p.getRecords());
return p; return p;
} }