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

整合数据统计、最新数据查询接口

This commit is contained in:
zy 2025-11-28 18:31:33 +08:00
parent 7e8f611308
commit 0d4da4e438
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,7 +667,7 @@ public class WxAppletController {
return R.ok(jsonArray); return R.ok(jsonArray);
} }
//获取最新数据 //获取最新数据
log.warn(pollutionEnum.getCode()+"================="+waterList);
if (PollutionConstants.AIR_SURV.equals(pollutionEnum.getType()) && airList.size() > 0) {//大气 if (PollutionConstants.AIR_SURV.equals(pollutionEnum.getType()) && airList.size() > 0) {//大气
// List<SurvTransdataAirVo> dataList= hisdataAirService.getResentData(airList,dataCounts); // List<SurvTransdataAirVo> dataList= hisdataAirService.getResentData(airList,dataCounts);
// jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList)); // jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
@ -680,13 +680,13 @@ public class WxAppletController {
Page<SurvTransdataSoilVo> page = new Page<SurvTransdataSoilVo>(pageNo, pageSize); Page<SurvTransdataSoilVo> page = new Page<SurvTransdataSoilVo>(pageNo, pageSize);
IPage<SurvTransdataSoilVo> pages = hisdataSoilService.getPageResentData(page, soilList); IPage<SurvTransdataSoilVo> pages = hisdataSoilService.getPageResentData(page, soilList);
return R.ok(pages); return R.ok(pages);
} else if (StationConstants.ORIENT.equals(survStationInfo.getStationType()) && pollutionEnum.getType().contains("water") && orientList.size() > 0) {//面源 } else if (StationConstants.ORIENT.equals(survStationInfo.getStationType()) && pollutionEnum.getType().startsWith("water") && !orientList.isEmpty()) {//面源
// List<SurvTransdataOrientwaterVo> dataList= hisdataOrientwaterService.getResentData(orientList,dataCounts); // List<SurvTransdataOrientwaterVo> dataList= hisdataOrientwaterService.getResentData(orientList,dataCounts);
// jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList)); // jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
Page<SurvTransdataOrientwaterVo> page = new Page<SurvTransdataOrientwaterVo>(pageNo, pageSize); Page<SurvTransdataOrientwaterVo> page = new Page<SurvTransdataOrientwaterVo>(pageNo, pageSize);
IPage<SurvTransdataOrientwaterVo> pages = hisdataOrientwaterService.getPageResentData(page, orientList); IPage<SurvTransdataOrientwaterVo> pages = hisdataOrientwaterService.getPageResentData(page, orientList);
return R.ok(pages); return R.ok(pages);
} else if (StationConstants.LIVE_STOCK.equals(survStationInfo.getStationType()) && pollutionEnum.getType().contains("water") && liveList.size() > 0) {//畜禽 } else if (StationConstants.LIVE_STOCK.equals(survStationInfo.getStationType()) && pollutionEnum.getType().startsWith("water") && !liveList.isEmpty()) {//畜禽
// List<SurvTransdataLivestockwaterVo> dataList= hisdataLivestockwaterService.getResentData(liveList,dataCounts); // List<SurvTransdataLivestockwaterVo> dataList= hisdataLivestockwaterService.getResentData(liveList,dataCounts);
// jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList)); // jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize); Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize);