更改区域场站等功能

web/consumer-hb/src/main/java/com/gyee/consumer/controller/RegionPG/RegionPGController.java

@@ -21,13 +21,11 @@ public class RegionPGController {
     @ResponseBody
     @ApiOperation(value = "区域查询", notes = "区域查询")
     @ApiImplicitParams({
-
-            @ApiImplicitParam(name = "id", value = "区域编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "companyid", value = "公司编号", required = false, dataType = "string", paramType = "query")})
 
-    public AjaxResult findList(@RequestParam("id") String id, @RequestParam("companyid") String companyid)  {
+    public AjaxResult findList( @RequestParam("companyid") String companyid)  {
 
-        AjaxResult ajax=regionPGService.RegionPGlist(id, companyid);
+        AjaxResult ajax=regionPGService.RegionPGlist(companyid);
 
         return ajax;
     }

web/consumer-hb/src/main/java/com/gyee/consumer/controller/WindpowerstationPG/WindpowerstationPGController.java

@@ -17,14 +17,13 @@ public class WindpowerstationPGController {
     private WindpowerstationPGService windpowerstationPGService;
     @GetMapping(value = "/list")
     @ResponseBody
-    @ApiOperation(value = "区域查询", notes = "区域查询")
+    @ApiOperation(value = "场站查询", notes = "场站查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "区域编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "companyid", value = "公司编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "regionid", value = "公司编号", required = false, dataType = "string", paramType = "query")})
-    public AjaxResult findList(@RequestParam("id") String id,String companyid, String regionid)  {
+    public AjaxResult findList(@RequestParam("companyid") String companyid, @RequestParam("regionid") String regionid)  {
 
-        AjaxResult ajax=windpowerstationPGService.stationlsPG(id,companyid,regionid);
+        AjaxResult ajax=windpowerstationPGService.stationlsPG(companyid,regionid);
 
         return ajax;
     }

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/RegionPG/RegionPGServiceFallbackFactory.java

@@ -10,7 +10,7 @@ public class RegionPGServiceFallbackFactory  implements FallbackFactory<RegionPG
     public RegionPGService create(Throwable throwable) {
         return new RegionPGService() {
             @Override
-            public AjaxResult RegionPGlist(String id, String companyid) {
+            public AjaxResult RegionPGlist(String companyid) {
                 return  AjaxResult.error(throwable.getMessage());
             }
         };

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/WindpowerstationPG/WindpowerstationPGServiceFallbackFactory.java

@@ -9,7 +9,7 @@ public class WindpowerstationPGServiceFallbackFactory implements FallbackFactory
     public WindpowerstationPGService create(Throwable throwable) {
         return new WindpowerstationPGService() {
             @Override
-            public AjaxResult stationlsPG(String id, String companyid, String regionid) {
+            public AjaxResult stationlsPG(String companyid, String regionid) {
                 return  AjaxResult.error(throwable.getMessage());
             }
         };

web/consumer-hb/src/main/java/com/gyee/consumer/service/RegionPG/RegionPGService.java

@@ -12,6 +12,6 @@ import org.springframework.web.bind.annotation.RequestParam;
         configuration = FeignConfiguration.class)
 public interface RegionPGService {
     @GetMapping("/Region/list")
-    public AjaxResult RegionPGlist(@RequestParam("id") String id, @RequestParam("companyid") String companyid) ;
+    public AjaxResult RegionPGlist(@RequestParam("companyid") String companyid) ;
 
 }

web/consumer-hb/src/main/java/com/gyee/consumer/service/WindpowerstationPG/WindpowerstationPGService.java

@@ -12,5 +12,5 @@ import org.springframework.web.bind.annotation.RequestParam;
         configuration = FeignConfiguration.class)
 public interface WindpowerstationPGService {
     @GetMapping("/windpowerstation/list")
-    public AjaxResult stationlsPG(@RequestParam("id") String id, @RequestParam("companyid") String companyid, @RequestParam("regionid") String regionid) ;
+    public AjaxResult stationlsPG( @RequestParam("companyid") String companyid, @RequestParam("regionid") String regionid) ;
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/Region/RegionPGController.java

@@ -22,17 +22,16 @@ public class RegionPGController {
     /**
      * 查询
      *
-     * @param id
+     * @param
      * @return
      */
     @GetMapping(value = "/list")
     @ResponseBody
     @ApiOperation(value = "区域查询", notes = "区域查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "区域编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "companyid", value = "公司编号", required = false, dataType = "string", paramType = "query")})
-    public R findList(String id ,String companyid) {
-        List<RegionPG> list = regionPGService.RegionPGlist(id,companyid);
+    public R findList(String companyid) {
+        List<RegionPG> list = regionPGService.RegionPGlist(companyid);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/WindpowerstationPG/WindpowerstationPGController.java

@@ -25,7 +25,7 @@ public class WindpowerstationPGController {
     /**
      * 查询
      *
-     * @param id
+     * @param
      * @return
      */
     @GetMapping(value = "/list")

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/RegionPGService.java

@@ -80,7 +80,7 @@ public class RegionPGService implements BaseService<RegionPG, RegionPGExample> {
     }
 
     @DataSource(value = DataSourceType.SLAVE)
-    public List<RegionPG> RegionPGlist(String id ,String companyid) {
+    public List<RegionPG> RegionPGlist(String companyid) {
 
         List<RegionPG> list=new ArrayList<>();
 
@@ -88,10 +88,7 @@ public class RegionPGService implements BaseService<RegionPG, RegionPGExample> {
         example.setOrderByClause(" id asc");
 
         RegionPGExample.Criteria cr =example.createCriteria();
-        cr.andIdEqualTo(id);
-
-        RegionPGExample.Criteria criteria =example.createCriteria();
-        criteria.andCompanyidEqualTo(companyid);
+        cr.andCompanyidEqualTo(companyid);
         list= regionPGMapper.selectByExample(example);
         return list;
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/WindpowerstationPGService.java

@@ -134,8 +134,7 @@ public class WindpowerstationPGService implements BaseService<WindpowerstationPG
 
         WindpowerstationPGExample.Criteria criteria =example.createCriteria();
         criteria.andCompanyidEqualTo(companyid);
-        WindpowerstationPGExample.Criteria cr =example.createCriteria();
-        cr.andRegionidEqualTo(regionid);
+        criteria.andRegionidEqualTo(regionid);
         list= windpowerstationPGMapper.selectByExample(example);
         return list;
     }