|
@@ -1,6 +1,7 @@
|
|
package com.gyee.backconfig.controller;
|
|
package com.gyee.backconfig.controller;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.gyee.backconfig.config.R;
|
|
import com.gyee.backconfig.config.R;
|
|
import com.gyee.backconfig.model.auto.Windpowerstation;
|
|
import com.gyee.backconfig.model.auto.Windpowerstation;
|
|
@@ -8,6 +9,7 @@ import com.gyee.backconfig.service.BackConfigService;
|
|
import com.gyee.backconfig.service.auto.IWindpowerstationService;
|
|
import com.gyee.backconfig.service.auto.IWindpowerstationService;
|
|
import com.gyee.backconfig.vo.Windpowerstationvo;
|
|
import com.gyee.backconfig.vo.Windpowerstationvo;
|
|
import com.gyee.common.model.StringUtils;
|
|
import com.gyee.common.model.StringUtils;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -26,6 +28,8 @@ public class WindpowerstationController {
|
|
@Resource
|
|
@Resource
|
|
private BackConfigService backConfigService;
|
|
private BackConfigService backConfigService;
|
|
|
|
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
private IWindpowerstationService windpowerstationService;
|
|
private IWindpowerstationService windpowerstationService;
|
|
|
|
|
|
@GetMapping("/listByPage")
|
|
@GetMapping("/listByPage")
|
|
@@ -130,9 +134,9 @@ public class WindpowerstationController {
|
|
@RequestParam(value = "companyid",required = false) String companyid,
|
|
@RequestParam(value = "companyid",required = false) String companyid,
|
|
@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){
|
|
- List<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
|
|
|
|
|
|
+ IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
|
|
if (null != list){
|
|
if (null != list){
|
|
- return R.ok(list.size()).data(list);
|
|
|
|
|
|
+ return R.ok().data(list);
|
|
}else {
|
|
}else {
|
|
return R.error().data("查询失败!");
|
|
return R.error().data("查询失败!");
|
|
}
|
|
}
|