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

调整站点类型判定

This commit is contained in:
zy 2026-03-19 17:04:27 +08:00
parent 127764115f
commit eb36d2bdea
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,10 +449,10 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl<SurvDeviceDeployMap
Assert.notNull(stationInfo,"无效站点"); Assert.notNull(stationInfo,"无效站点");
Assert.notBlank(stationInfo.getStationType(),"无效站点类型"); Assert.notBlank(stationInfo.getStationType(),"无效站点类型");
String deployType =""; String deployType ="";
if(stationInfo.getStationType().contains("orient")){//面源站 if(stationInfo.getStationType().contains("live")){//畜禽站
deployType = PollutionConstants.WATER_ORIENT;
}else if(stationInfo.getStationType().contains("live")) {//畜禽站
deployType = PollutionConstants.WATER_LIVE; deployType = PollutionConstants.WATER_LIVE;
}else {// 其他都视为面源 stationInfo.getStationType().contains("orient")
deployType = PollutionConstants.WATER_ORIENT;
} }
SurvDeviceDeploy deploy = getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery() SurvDeviceDeploy deploy = getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()

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

@ -748,6 +748,10 @@ public class WxAppletController {
Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize); Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize);
IPage<SurvTransdataLivestockwaterVo> pages = hisdataLivestockwaterService.getPageResentData(page, liveList); IPage<SurvTransdataLivestockwaterVo> pages = hisdataLivestockwaterService.getPageResentData(page, liveList);
return R.ok(pages); return R.ok(pages);
} else if (pollutionEnum.getType().startsWith("water") && !liveList.isEmpty()) {//匹配新站点类型，如果为water的检测项，都归入面源站点
Page<SurvTransdataOrientwaterVo> page = new Page<SurvTransdataOrientwaterVo>(pageNo, pageSize);
IPage<SurvTransdataOrientwaterVo> pages = hisdataOrientwaterService.getPageResentData(page, orientList);
return R.ok(pages);
} else if (PollutionConstants.STINK.equals(pollutionEnum.getType()) && !stinkList.isEmpty()) {//恶臭 } else if (PollutionConstants.STINK.equals(pollutionEnum.getType()) && !stinkList.isEmpty()) {//恶臭
Page<SurvTransdataStinkVo> page = new Page<SurvTransdataStinkVo>(pageNo, pageSize); Page<SurvTransdataStinkVo> page = new Page<SurvTransdataStinkVo>(pageNo, pageSize);
IPage<SurvTransdataStinkVo> pages = vocsService.getPageResentData(page, stinkList); IPage<SurvTransdataStinkVo> pages = vocsService.getPageResentData(page, stinkList);