|
@@ -29,19 +29,21 @@ public class IndicatorsController {
|
|
/**
|
|
/**
|
|
* 查询
|
|
* 查询
|
|
* @param id
|
|
* @param id
|
|
- * @param name
|
|
|
|
|
|
+ * @param stationid
|
|
|
|
+ * @param stationname
|
|
|
|
+ * @param kay
|
|
* @param pageNum
|
|
* @param pageNum
|
|
* @param pageSize
|
|
* @param pageSize
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/List")
|
|
@GetMapping(value = "/List")
|
|
public R findList(@RequestParam(value = "id",required = false) String id,
|
|
public R findList(@RequestParam(value = "id",required = false) String id,
|
|
- @RequestParam(value = "name",required = false) String name,
|
|
|
|
- @RequestParam(value = "code",required = false) String code,
|
|
|
|
- @RequestParam(value = "windpowerstationid",required = false) String windpowerstationid,
|
|
|
|
|
|
+ @RequestParam(value = "stationid",required = false) String stationid,
|
|
|
|
+ @RequestParam(value = "stationname",required = false) String stationname,
|
|
|
|
+ @RequestParam(value = "kay",required = false) String kay,
|
|
@RequestParam(value = "pageNum",required = true) String pageNum,
|
|
@RequestParam(value = "pageNum",required = true) String pageNum,
|
|
@RequestParam(value = "pageSize",required = true) String pageSize){
|
|
@RequestParam(value = "pageSize",required = true) String pageSize){
|
|
- IPage<Indicators> list = iIndicatorsService.getList(id,name,code,windpowerstationid,pageNum,pageSize);
|
|
|
|
|
|
+ IPage<Indicators> list = iIndicatorsService.getList( id, stationid, stationname, kay, pageNum, pageSize) ;
|
|
if (null != list){
|
|
if (null != list){
|
|
return R.ok().data(list);
|
|
return R.ok().data(list);
|
|
}else {
|
|
}else {
|