Merge remote-tracking branch 'origin/master'

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationpointnewController.java

@@ -41,10 +41,10 @@ public class WindpowerstationpointnewController {
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "model", required = false) String model,
                       @RequestParam(value = "uniformcode", required = false) String uniformcode,
-                      @RequestParam(value = "stationid", required = false) String stationid,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Windpowerstationpointnew> list = windpowerstationpointnewService.list(id, code, name,model, uniformcode, stationid,pageNum, pageSize);
+        IPage<Windpowerstationpointnew> list = windpowerstationpointnewService.list(id, code, name,model, uniformcode, windpowerstationid,pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindturbinetestingpointnewController.java

@@ -41,10 +41,10 @@ public class WindturbinetestingpointnewController {
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "model", required = false) String model,
                       @RequestParam(value = "uniformcode", required = false) String uniformcode,
-                      @RequestParam(value = "stationid", required = false) String stationid,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Windturbinetestingpointnew> list = windturbinetestingpointnewService.list(id, code, name,model, uniformcode, stationid,pageNum, pageSize);
+        IPage<Windturbinetestingpointnew> list = windturbinetestingpointnewService.list(id, code, name,model, uniformcode, windpowerstationid,pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindpowerstationpointnewService.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IWindpowerstationpointnewService extends IService<Windpowerstationpointnew> {
 
 
-    IPage<Windpowerstationpointnew> list(String id, String code, String name, String model,String uniformcode,String stationid, String pageNum, String pageSize);
+    IPage<Windpowerstationpointnew> list(String id, String code, String name, String model,String uniformcode,String windpowerstationid, String pageNum, String pageSize);
 
     Windpowerstationpointnew getOne(String id);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindturbinetestingpointnewService.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IWindturbinetestingpointnewService extends IService<Windturbinetestingpointnew> {
 
-    IPage<Windturbinetestingpointnew> list(String id, String code, String name, String model, String uniformcode, String stationid, String pageNum, String pageSize);
+    IPage<Windturbinetestingpointnew> list(String id, String code, String name, String model, String uniformcode, String windpowerstationid, String pageNum, String pageSize);
 
     Windturbinetestingpointnew getOne(String id);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 public class WindpowerstationpointnewServiceImpl extends ServiceImpl<WindpowerstationpointnewMapper, Windpowerstationpointnew> implements IWindpowerstationpointnewService {
 
     @Override
-    public IPage<Windpowerstationpointnew> list(String id, String code, String name, String model, String uniformcode, String stationid, String pageNum, String pageSize) {
+    public IPage<Windpowerstationpointnew> list(String id, String code, String name, String model, String uniformcode, String windpowerstationid, String pageNum, String pageSize) {
         QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
@@ -45,8 +45,8 @@ public class WindpowerstationpointnewServiceImpl extends ServiceImpl<Windpowerst
             qw.eq("uniformcode",uniformcode);
         }
 
-        if (StringUtils.isNotEmpty(stationid)){
-            qw.eq("stationid",stationid);
+        if (StringUtils.isNotEmpty(windpowerstationid)){
+            qw.like("windpowerstationid",windpowerstationid);
         }
 
         Page<Windpowerstationpointnew> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<WindturbinetestingpointnewMapper, Windturbinetestingpointnew> implements IWindturbinetestingpointnewService {
 
     @Override
-    public IPage<Windturbinetestingpointnew> list(String id, String code, String name, String model, String uniformcode, String stationid, String pageNum, String pageSize) {
+    public IPage<Windturbinetestingpointnew> list(String id, String code, String name, String model, String uniformcode, String windpowerstationid, String pageNum, String pageSize) {
         QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
@@ -45,8 +45,8 @@ public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<Windturbi
             qw.eq("uniformcode",uniformcode);
         }
 
-        if (StringUtils.isNotEmpty(stationid)){
-            qw.eq("stationid",stationid);
+        if (StringUtils.isNotEmpty(windpowerstationid)){
+            qw.like("windpowerstationid",windpowerstationid);
         }
 
         Page<Windturbinetestingpointnew> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));