Prechádzať zdrojové kódy

【CHG】修改删除接口入参取值方式

ZhaoMn 3 rokov pred
rodič
commit
fb0bcc5883
23 zmenil súbory, kde vykonal 647 pridanie a 530 odobranie
  1. 2 1
      railway-business/src/main/java/com/railway/business/app/controller/AppFeedbackController.java
  2. 2 1
      railway-business/src/main/java/com/railway/business/app/controller/AppTaskController.java
  3. 1 1
      railway-business/src/main/java/com/railway/business/app/controller/AppUpgradeController.java
  4. 1 2
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseLineController.java
  5. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventBirdController.java
  6. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventFloodController.java
  7. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventForeignController.java
  8. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventIceController.java
  9. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventRustController.java
  10. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventThawController.java
  11. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventThunderController.java
  12. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventTreeController.java
  13. 55 46
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventWindController.java
  14. 2 2
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseStationController.java
  15. 11 5
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseSubstationController.java
  16. 13 6
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusBlqController.java
  17. 20 12
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusDmcgyqController.java
  18. 2 2
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusFdfxjyqController.java
  19. 13 6
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusJcxcController.java
  20. 14 7
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusSdtzController.java
  21. 2 2
      railway-business/src/main/java/com/railway/business/baseinfo/controller/BusWjcxcController.java
  22. 67 67
      railway-business/src/main/java/com/railway/business/catenary/controller/BusJlgzController.java
  23. 2 2
      railway-business/src/main/java/com/railway/business/safetool/controller/SecScheduledController.java

+ 2 - 1
railway-business/src/main/java/com/railway/business/app/controller/AppFeedbackController.java

@@ -12,6 +12,7 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +43,7 @@ public class AppFeedbackController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(appFeedbackService.delete(ids));
   }
 

+ 2 - 1
railway-business/src/main/java/com/railway/business/app/controller/AppTaskController.java

@@ -12,6 +12,7 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +43,7 @@ public class AppTaskController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(appTaskService.delete(ids));
   }
 

+ 1 - 1
railway-business/src/main/java/com/railway/business/app/controller/AppUpgradeController.java

@@ -44,7 +44,7 @@ public class AppUpgradeController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/batch/{ids}")
-  public AjaxResult delete(@RequestParam Long[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") Long[] ids) {
     return toAjax(appUpgradeService.delete(ids));
   }
 

+ 1 - 2
railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseLineController.java

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -46,7 +45,7 @@ public class BaseLineController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{lineIds}")
-  public AjaxResult delete(@RequestParam Long[] lineIds) {
+  public AjaxResult delete(@PathVariable Long[] lineIds) {
     return toAjax(busLineService.delete(lineIds));
   }
 

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventBirdController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventBird;
 import com.railway.business.baseinfo.service.IBasePreventBirdService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/bird", tags = "基础数据 - 九防台账-防鸟 ")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/bird")
 public class BasePreventBirdController extends BaseController {
-    @Autowired
-    private IBasePreventBirdService basePreventBirdService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventBird basePreventBird) {
-        return toAjax(basePreventBirdService.create(basePreventBird));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventBirdService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventBird basePreventBird) {
-        return toAjax(basePreventBirdService.update(basePreventBird));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventBird info = basePreventBirdService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventBird basePreventBird) {
-        startPage();
-        List<BasePreventBird> list = basePreventBirdService.getList(basePreventBird);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventBirdService basePreventBirdService;
+
+  public BasePreventBirdController(IBasePreventBirdService basePreventBirdService) {
+    this.basePreventBirdService = basePreventBirdService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventBird basePreventBird) {
+    return toAjax(basePreventBirdService.create(basePreventBird));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventBirdService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventBird basePreventBird) {
+    return toAjax(basePreventBirdService.update(basePreventBird));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventBird info = basePreventBirdService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventBird basePreventBird) {
+    startPage();
+    List<BasePreventBird> list = basePreventBirdService.getList(basePreventBird);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventFloodController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventFlood;
 import com.railway.business.baseinfo.service.IBasePreventFloodService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/flood", tags = "基础数据 - 九防台账-防洪")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/flood")
 public class BasePreventFloodController extends BaseController {
-    @Autowired
-    private IBasePreventFloodService basePreventFloodService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventFlood basePreventFlood) {
-        return toAjax(basePreventFloodService.create(basePreventFlood));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventFloodService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventFlood basePreventFlood) {
-        return toAjax(basePreventFloodService.update(basePreventFlood));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventFlood info = basePreventFloodService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventFlood basePreventFlood) {
-        startPage();
-        List<BasePreventFlood> list = basePreventFloodService.getList(basePreventFlood);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventFloodService basePreventFloodService;
+
+  public BasePreventFloodController(IBasePreventFloodService basePreventFloodService) {
+    this.basePreventFloodService = basePreventFloodService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventFlood basePreventFlood) {
+    return toAjax(basePreventFloodService.create(basePreventFlood));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventFloodService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventFlood basePreventFlood) {
+    return toAjax(basePreventFloodService.update(basePreventFlood));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventFlood info = basePreventFloodService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventFlood basePreventFlood) {
+    startPage();
+    List<BasePreventFlood> list = basePreventFloodService.getList(basePreventFlood);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventForeignController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventForeign;
 import com.railway.business.baseinfo.service.IBasePreventForeignService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/foreign", tags = "基础数据 - 九防台账-防异物")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/foreign")
 public class BasePreventForeignController extends BaseController {
-    @Autowired
-    private IBasePreventForeignService basePreventForeignService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventForeign basePreventForeign) {
-        return toAjax(basePreventForeignService.create(basePreventForeign));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventForeignService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventForeign basePreventForeign) {
-        return toAjax(basePreventForeignService.update(basePreventForeign));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventForeign info = basePreventForeignService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventForeign basePreventForeign) {
-        startPage();
-        List<BasePreventForeign> list = basePreventForeignService.getList(basePreventForeign);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventForeignService basePreventForeignService;
+
+  public BasePreventForeignController(IBasePreventForeignService basePreventForeignService) {
+    this.basePreventForeignService = basePreventForeignService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventForeign basePreventForeign) {
+    return toAjax(basePreventForeignService.create(basePreventForeign));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventForeignService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventForeign basePreventForeign) {
+    return toAjax(basePreventForeignService.update(basePreventForeign));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventForeign info = basePreventForeignService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventForeign basePreventForeign) {
+    startPage();
+    List<BasePreventForeign> list = basePreventForeignService.getList(basePreventForeign);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventIceController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventIce;
 import com.railway.business.baseinfo.service.IBasePreventIceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/ice", tags = "基础数据 - 九防台账-防冰")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/ice")
 public class BasePreventIceController extends BaseController {
-    @Autowired
-    private IBasePreventIceService basePreventIceService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventIce basePreventIce) {
-        return toAjax(basePreventIceService.create(basePreventIce));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventIceService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventIce basePreventIce) {
-        return toAjax(basePreventIceService.update(basePreventIce));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventIce info = basePreventIceService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventIce basePreventIce) {
-        startPage();
-        List<BasePreventIce> list = basePreventIceService.getList(basePreventIce);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventIceService basePreventIceService;
+
+  public BasePreventIceController(IBasePreventIceService basePreventIceService) {
+    this.basePreventIceService = basePreventIceService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventIce basePreventIce) {
+    return toAjax(basePreventIceService.create(basePreventIce));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventIceService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventIce basePreventIce) {
+    return toAjax(basePreventIceService.update(basePreventIce));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventIce info = basePreventIceService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventIce basePreventIce) {
+    startPage();
+    List<BasePreventIce> list = basePreventIceService.getList(basePreventIce);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventRustController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventRust;
 import com.railway.business.baseinfo.service.IBasePreventRustService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/rust", tags = "基础数据 - 九防台账-防锈蚀")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/rust")
 public class BasePreventRustController extends BaseController {
-    @Autowired
-    private IBasePreventRustService basePreventRustService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventRust basePreventRust) {
-        return toAjax(basePreventRustService.create(basePreventRust));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventRustService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventRust basePreventRust) {
-        return toAjax(basePreventRustService.update(basePreventRust));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventRust info = basePreventRustService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventRust basePreventRust) {
-        startPage();
-        List<BasePreventRust> list = basePreventRustService.getList(basePreventRust);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventRustService basePreventRustService;
+
+  public BasePreventRustController(IBasePreventRustService basePreventRustService) {
+    this.basePreventRustService = basePreventRustService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventRust basePreventRust) {
+    return toAjax(basePreventRustService.create(basePreventRust));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventRustService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventRust basePreventRust) {
+    return toAjax(basePreventRustService.update(basePreventRust));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventRust info = basePreventRustService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventRust basePreventRust) {
+    startPage();
+    List<BasePreventRust> list = basePreventRustService.getList(basePreventRust);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventThawController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventThaw;
 import com.railway.business.baseinfo.service.IBasePreventThawService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/thaw", tags = "基础数据 - 九防台账-防春融")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/thaw")
 public class BasePreventThawController extends BaseController {
-    @Autowired
-    private IBasePreventThawService basePreventThawService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventThaw basePreventThaw) {
-        return toAjax(basePreventThawService.create(basePreventThaw));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventThawService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventThaw basePreventThaw) {
-        return toAjax(basePreventThawService.update(basePreventThaw));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventThaw info = basePreventThawService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventThaw basePreventThaw) {
-        startPage();
-        List<BasePreventThaw> list = basePreventThawService.getList(basePreventThaw);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventThawService basePreventThawService;
+
+  public BasePreventThawController(IBasePreventThawService basePreventThawService) {
+    this.basePreventThawService = basePreventThawService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventThaw basePreventThaw) {
+    return toAjax(basePreventThawService.create(basePreventThaw));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventThawService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventThaw basePreventThaw) {
+    return toAjax(basePreventThawService.update(basePreventThaw));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventThaw info = basePreventThawService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventThaw basePreventThaw) {
+    startPage();
+    List<BasePreventThaw> list = basePreventThawService.getList(basePreventThaw);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventThunderController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventThunder;
 import com.railway.business.baseinfo.service.IBasePreventThunderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/thunder", tags = "基础数据 - 九防台账-防雷")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/thunder")
 public class BasePreventThunderController extends BaseController {
-    @Autowired
-    private IBasePreventThunderService basePreventThunderService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventThunder basePreventThunder) {
-        return toAjax(basePreventThunderService.create(basePreventThunder));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventThunderService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventThunder basePreventThunder) {
-        return toAjax(basePreventThunderService.update(basePreventThunder));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventThunder info = basePreventThunderService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventThunder basePreventThunder) {
-        startPage();
-        List<BasePreventThunder> list = basePreventThunderService.getList(basePreventThunder);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventThunderService basePreventThunderService;
+
+  public BasePreventThunderController(IBasePreventThunderService basePreventThunderService) {
+    this.basePreventThunderService = basePreventThunderService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventThunder basePreventThunder) {
+    return toAjax(basePreventThunderService.create(basePreventThunder));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventThunderService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventThunder basePreventThunder) {
+    return toAjax(basePreventThunderService.update(basePreventThunder));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventThunder info = basePreventThunderService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventThunder basePreventThunder) {
+    startPage();
+    List<BasePreventThunder> list = basePreventThunderService.getList(basePreventThunder);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventTreeController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventTree;
 import com.railway.business.baseinfo.service.IBasePreventTreeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/tree", tags = "基础数据 - 九防台账-防树")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/tree")
 public class BasePreventTreeController extends BaseController {
-    @Autowired
-    private IBasePreventTreeService basePreventTreeService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventTree basePreventTree) {
-        return toAjax(basePreventTreeService.create(basePreventTree));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventTreeService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventTree basePreventTree) {
-        return toAjax(basePreventTreeService.update(basePreventTree));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventTree info = basePreventTreeService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventTree basePreventTree) {
-        startPage();
-        List<BasePreventTree> list = basePreventTreeService.getList(basePreventTree);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventTreeService basePreventTreeService;
+
+  public BasePreventTreeController(IBasePreventTreeService basePreventTreeService) {
+    this.basePreventTreeService = basePreventTreeService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventTree basePreventTree) {
+    return toAjax(basePreventTreeService.create(basePreventTree));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventTreeService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventTree basePreventTree) {
+    return toAjax(basePreventTreeService.update(basePreventTree));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventTree info = basePreventTreeService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventTree basePreventTree) {
+    startPage();
+    List<BasePreventTree> list = basePreventTreeService.getList(basePreventTree);
+    return getDataTable(list);
+  }
 
 }

+ 55 - 46
railway-business/src/main/java/com/railway/business/baseinfo/controller/BasePreventWindController.java

@@ -2,62 +2,71 @@ package com.railway.business.baseinfo.controller;
 
 import com.railway.business.baseinfo.domain.BasePreventWind;
 import com.railway.business.baseinfo.service.IBasePreventWindService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
-
 import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/baseinfo/base/prevent/wind", tags = "基础数据 - 九防台账-防风")
 @RestController
 @Validated
 @RequestMapping(value = "business/baseinfo/base/prevent/wind")
 public class BasePreventWindController extends BaseController {
-    @Autowired
-    private IBasePreventWindService basePreventWindService;
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BasePreventWind basePreventWind) {
-        return toAjax(basePreventWindService.create(basePreventWind));
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
-        return toAjax(basePreventWindService.delete(ids));
-    }
-
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BasePreventWind basePreventWind) {
-        return toAjax(basePreventWindService.update(basePreventWind));
-    }
-
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
-        BasePreventWind info = basePreventWindService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
-
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BasePreventWind basePreventWind) {
-        startPage();
-        List<BasePreventWind> list = basePreventWindService.getList(basePreventWind);
-        return getDataTable(list);
-    }
+
+  private final IBasePreventWindService basePreventWindService;
+
+  public BasePreventWindController(IBasePreventWindService basePreventWindService) {
+    this.basePreventWindService = basePreventWindService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BasePreventWind basePreventWind) {
+    return toAjax(basePreventWindService.create(basePreventWind));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(basePreventWindService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BasePreventWind basePreventWind) {
+    return toAjax(basePreventWindService.update(basePreventWind));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    BasePreventWind info = basePreventWindService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BasePreventWind basePreventWind) {
+    startPage();
+    List<BasePreventWind> list = basePreventWindService.getList(basePreventWind);
+    return getDataTable(list);
+  }
 
 }

+ 2 - 2
railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseStationController.java

@@ -14,11 +14,11 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -44,7 +44,7 @@ public class BaseStationController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{stationIds}")
-  public AjaxResult delete(@RequestParam Long[] stationIds) {
+  public AjaxResult delete(@PathVariable Long[] stationIds) {
     return toAjax(busStationService.delete(stationIds));
   }
 

+ 11 - 5
railway-business/src/main/java/com/railway/business/baseinfo/controller/BaseSubstationController.java

@@ -8,11 +8,17 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author zhaomn
@@ -37,7 +43,7 @@ public class BaseSubstationController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{substationIds}")
-  public AjaxResult delete(@RequestParam String[] substationIds) {
+  public AjaxResult delete(@PathVariable String[] substationIds) {
     return toAjax(busSubstationService.delete(substationIds));
   }
 

+ 13 - 6
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusBlqController.java

@@ -4,15 +4,22 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.domain.BusBlq;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.baseinfo.service.IBusBlqService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wuhonghao
@@ -42,7 +49,7 @@ public class BusBlqController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busBlqService.delete(ids));
   }
 

+ 20 - 12
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusDmcgyqController.java

@@ -4,16 +4,23 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.domain.BusDmcgyq;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.baseinfo.service.IBusDmcgyqService;
-import com.railway.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import com.railway.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author zhangcaifeng
@@ -44,7 +51,7 @@ public class BusDmcgyqController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busDmcgyqService.delete(ids));
   }
 
@@ -78,15 +85,16 @@ public class BusDmcgyqController extends BaseController {
   @GetMapping(value = "combinedPillarArea")
   public AjaxResult combinedPillarArea(BusDmcgyq busDmcgyq) {
     List<BusDmcgyq> list = busDmcgyqService.getList(busDmcgyq);
-    String combinedPillarArea = "";
+    StringBuilder combinedPillarArea = new StringBuilder();
     for(BusDmcgyq data : list) {
-      combinedPillarArea += data.getPillarArea() + ",";
+      combinedPillarArea.append(data.getPillarArea()).append(",");
     }
-    if(StringUtils.isNotBlank(combinedPillarArea)) {
-      combinedPillarArea = combinedPillarArea.substring(0, combinedPillarArea.lastIndexOf(","));
+    if(StringUtils.isNotBlank(combinedPillarArea.toString())) {
+      combinedPillarArea = new StringBuilder(
+          combinedPillarArea.substring(0, combinedPillarArea.lastIndexOf(",")));
     }
     AjaxResult ajax = AjaxResult.success();
-    ajax.put("combinedPillarArea", combinedPillarArea);
+    ajax.put("combinedPillarArea", combinedPillarArea.toString());
     return ajax;
   }
 

+ 2 - 2
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusFdfxjyqController.java

@@ -14,11 +14,11 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -50,7 +50,7 @@ public class BusFdfxjyqController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busFdfxjyqService.delete(ids));
   }
 

+ 13 - 6
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusJcxcController.java

@@ -4,15 +4,22 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.domain.BusJcxc;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.baseinfo.service.IBusJcxcService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author zhangcaifeng
@@ -46,7 +53,7 @@ public class BusJcxcController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busJcxcService.delete(ids));
   }
 

+ 14 - 7
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusSdtzController.java

@@ -7,16 +7,23 @@ import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.baseinfo.service.IBusSdtzService;
 import com.railway.business.baseinfo.service.IBusZzdzxxService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wuhonghao
@@ -49,7 +56,7 @@ public class BusSdtzController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busSdtzService.delete(ids));
   }
 
@@ -95,7 +102,7 @@ public class BusSdtzController extends BaseController {
         return getDataTable(new ArrayList<>());
       }
     }
-    if(busSmartQueryVo.getPillarArea()==null||busSmartQueryVo.getPillarArea().equals("")){
+    if(busSmartQueryVo.getPillarArea()==null|| "".equals(busSmartQueryVo.getPillarArea())){
       busSmartQueryVo.setPillarArea("500");
     }
     startPage();

+ 2 - 2
railway-business/src/main/java/com/railway/business/baseinfo/controller/BusWjcxcController.java

@@ -14,11 +14,11 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -53,7 +53,7 @@ public class BusWjcxcController extends BaseController {
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(busJcxcService.delete(ids));
   }
 

+ 67 - 67
railway-business/src/main/java/com/railway/business/catenary/controller/BusJlgzController.java

@@ -12,6 +12,8 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.util.List;
-
 /**
  * @author fenghao
  */
@@ -34,79 +33,80 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/jlgz")
 public class BusJlgzController extends BaseController {
 
-    private final IBusJlgzService budJlgzService;
+  private final IBusJlgzService budJlgzService;
 
-    public BusJlgzController(IBusJlgzService budJlgzService) {
-        this.budJlgzService = budJlgzService;
-    }
+  public BusJlgzController(IBusJlgzService budJlgzService) {
+    this.budJlgzService = budJlgzService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusJlgz busJlgz) {
-        return toAjax(budJlgzService.create(busJlgz));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusJlgz busJlgz) {
+    return toAjax(budJlgzService.create(busJlgz));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable(value = "ids") Long[] ids) {
-        return toAjax(budJlgzService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") Long[] ids) {
+    return toAjax(budJlgzService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusJlgz busJlgz) {
-        return toAjax(budJlgzService.update(busJlgz));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusJlgz busJlgz) {
+    return toAjax(budJlgzService.update(busJlgz));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(@PathVariable(value = "id") Long id) {
-        BusJlgz info = budJlgzService.getInfo(id, null);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(@PathVariable(value = "id") Long id) {
+    BusJlgz info = budJlgzService.getInfo(id, null);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}/{lineId}"})
-    public AjaxResult getInfoByLine(@PathVariable(value = "id") Long id, @PathVariable(value = "lineId") Long lineId) {
-        BusJlgz info = budJlgzService.getInfo(id, lineId);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}/{lineId}"})
+  public AjaxResult getInfoByLine(@PathVariable(value = "id") Long id,
+      @PathVariable(value = "lineId") Long lineId) {
+    BusJlgz info = budJlgzService.getInfo(id, lineId);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusJlgz busJlgz) {
-        startPage();
-        List<BusJlgz> list = budJlgzService.getList(busJlgz);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusJlgz busJlgz) {
+    startPage();
+    List<BusJlgz> list = budJlgzService.getList(busJlgz);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "通过支柱信息获取历史故障统计", notes = "通过支柱信息获取历史故障统计", response = AjaxResult.class)
-    @GetMapping("/getListByZz")
-    public AjaxResult getListByZz(BusSmartQueryVo busSmartQueryVo) {
-        List<BusJlgzListByZzVo> list = budJlgzService.getListByZz(busSmartQueryVo);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",list);
-        return ajax;
-    }
+  @ApiOperation(value = "通过支柱信息获取历史故障统计", notes = "通过支柱信息获取历史故障统计", response = AjaxResult.class)
+  @GetMapping("/getListByZz")
+  public AjaxResult getListByZz(BusSmartQueryVo busSmartQueryVo) {
+    List<BusJlgzListByZzVo> list = budJlgzService.getListByZz(busSmartQueryVo);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", list);
+    return ajax;
+  }
 
-    @ApiOperation(value = "获取记录故障线别")
-    @GetMapping("/getJlgzLine")
-    public TableDataInfo getJlgzLine() {
-        startPage();
-        List<JlgzLineVo> list = budJlgzService.getJlgzLine();
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "获取记录故障线别")
+  @GetMapping("/getJlgzLine")
+  public TableDataInfo getJlgzLine() {
+    startPage();
+    List<JlgzLineVo> list = budJlgzService.getJlgzLine();
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "获取记录故障所别")
-    @GetMapping("/getJlgzSubstation")
-    public TableDataInfo getJlgzSubstation(BaseSubstation baseSubstation) {
-        startPage();
-        List<JlgzSubstationVo> list = budJlgzService.getJlgzSubstation(baseSubstation.getLineId());
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "获取记录故障所别")
+  @GetMapping("/getJlgzSubstation")
+  public TableDataInfo getJlgzSubstation(BaseSubstation baseSubstation) {
+    startPage();
+    List<JlgzSubstationVo> list = budJlgzService.getJlgzSubstation(baseSubstation.getLineId());
+    return getDataTable(list);
+  }
 
 }

+ 2 - 2
railway-business/src/main/java/com/railway/business/safetool/controller/SecScheduledController.java

@@ -17,11 +17,11 @@ import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -52,7 +52,7 @@ public class SecScheduledController extends BaseController {
 
   @ApiOperation(value = "删除计划")
   @DeleteMapping("/{ids}")
-  public AjaxResult delete(@RequestParam String[] ids) {
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
     return toAjax(secScheduledService.delete(ids));
   }