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

查询列表使用原始

This commit is contained in:
wgx 2026-03-24 10:34:07 +08:00
parent c51ed2deb9
commit 2869a87e91
5 changed files with 25 additions and 13 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/controller/SurvAlertRecordController.java
View File

@ -53,10 +53,10 @@ public class SurvAlertRecordController extends JeecgController<SurvAlertRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// QueryWrapper<SurvAlertRecord> queryWrapper = QueryGenerator.initQueryWrapper(survAlertRecord, req.getParameterMap()); QueryWrapper<SurvAlertRecord> queryWrapper = QueryGenerator.initQueryWrapper(survAlertRecord, req.getParameterMap());
Page<SurvAlertRecord> page = new Page<>(pageNo, pageSize); Page<SurvAlertRecord> page = new Page<>(pageNo, pageSize);
IPage<SurvAlertRecord> pageList = survAlertRecordService.pages(page, survAlertRecord); // IPage<SurvAlertRecord> pageList = survAlertRecordService.pages(page, survAlertRecord);
// IPage<SurvAlertRecord> pageList = survAlertRecordService.page(page, queryWrapper); IPage<SurvAlertRecord> pageList = survAlertRecordService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }

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

@ -1,5 +1,6 @@
package org.jeecg.modules.appmana.controller; package org.jeecg.modules.appmana.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -11,7 +12,9 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.PollutionConstants; import org.jeecg.common.constant.PollutionConstants;
import org.jeecg.common.entity.SurvHisdataLivestockwater; import org.jeecg.common.entity.SurvHisdataLivestockwater;
import org.jeecg.common.entity.SurvHisdataOrientwater;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.appmana.service.ISurvDeviceDeployService; import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
import org.jeecg.modules.appmana.service.ISurvHisdataLivestockwaterService; import org.jeecg.modules.appmana.service.ISurvHisdataLivestockwaterService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -56,7 +59,7 @@ public class SurvHisdataLivestockwaterController extends JeecgController<SurvHis
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// QueryWrapper<SurvHisdataLivestockwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataLivestockwater, req.getParameterMap()); QueryWrapper<SurvHisdataLivestockwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataLivestockwater, req.getParameterMap());
Page<SurvHisdataLivestockwater> page = new Page<SurvHisdataLivestockwater>(pageNo, pageSize); Page<SurvHisdataLivestockwater> page = new Page<SurvHisdataLivestockwater>(pageNo, pageSize);
//查询站点设备 //查询站点设备
List<String> deviceList = new ArrayList<>(); List<String> deviceList = new ArrayList<>();
@ -67,8 +70,9 @@ public class SurvHisdataLivestockwaterController extends JeecgController<SurvHis
return Result.OK(emptyPage); return Result.OK(emptyPage);
} }
} }
queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataLivestockwater::getDeployCode, deviceList);
IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList); // IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList);
IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }

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

@ -1,5 +1,6 @@
package org.jeecg.modules.appmana.controller; package org.jeecg.modules.appmana.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -12,6 +13,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.PollutionConstants; import org.jeecg.common.constant.PollutionConstants;
import org.jeecg.common.entity.SurvHisdataOrientwater; import org.jeecg.common.entity.SurvHisdataOrientwater;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.appmana.service.ISurvDeviceDeployService; import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
import org.jeecg.modules.appmana.service.ISurvHisdataOrientwaterService; import org.jeecg.modules.appmana.service.ISurvHisdataOrientwaterService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -56,8 +58,8 @@ public class SurvHisdataOrientwaterController extends JeecgController<SurvHisdat
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// QueryWrapper<SurvHisdataOrientwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataOrientwater, req.getParameterMap()); QueryWrapper<SurvHisdataOrientwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataOrientwater, req.getParameterMap());
Page<SurvHisdataOrientwater> page = new Page<SurvHisdataOrientwater>(pageNo, pageSize); Page<SurvHisdataOrientwater> page = new Page<>(pageNo, pageSize);
//查询站点设备 //查询站点设备
List<String> deviceList = new ArrayList<>(); List<String> deviceList = new ArrayList<>();
@ -69,7 +71,9 @@ public class SurvHisdataOrientwaterController extends JeecgController<SurvHisdat
return Result.OK(emptyPage); return Result.OK(emptyPage);
} }
} }
IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList); queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataOrientwater::getDeployCode, deviceList);
// IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList);
IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }

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

@ -1,5 +1,6 @@
package org.jeecg.modules.appmana.controller; package org.jeecg.modules.appmana.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -10,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.entity.SurvHisdataSoil; import org.jeecg.common.entity.SurvHisdataSoil;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.appmana.service.ISurvDeviceDeployService; import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
import org.jeecg.modules.appmana.service.ISurvHisdataSoilService; import org.jeecg.modules.appmana.service.ISurvHisdataSoilService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -52,8 +54,9 @@ public class SurvHisdataSoilController extends JeecgController<SurvHisdataSoil,
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<SurvHisdataSoil>> queryPageList(SurvHisdataSoil survHisdataSoil, public Result<IPage<SurvHisdataSoil>> queryPageList(SurvHisdataSoil survHisdataSoil,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
// QueryWrapper<SurvHisdataSoil> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataSoil, req.getParameterMap()); HttpServletRequest req) {
QueryWrapper<SurvHisdataSoil> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataSoil, req.getParameterMap());
Page<SurvHisdataSoil> page = new Page<SurvHisdataSoil>(pageNo, pageSize); Page<SurvHisdataSoil> page = new Page<SurvHisdataSoil>(pageNo, pageSize);
//查询站点设备 //查询站点设备
List<String> deviceList = new ArrayList<>(); List<String> deviceList = new ArrayList<>();
@ -64,7 +67,8 @@ public class SurvHisdataSoilController extends JeecgController<SurvHisdataSoil,
// return Result.OK(emptyPage); // return Result.OK(emptyPage);
// } // }
// } // }
IPage<SurvHisdataSoil> pageList = survHisdataSoilService.pages(page, survHisdataSoil,deviceList); // IPage<SurvHisdataSoil> pageList = survHisdataSoilService.pages(page, survHisdataSoil,deviceList);
IPage<SurvHisdataSoil> pageList = survHisdataSoilService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }