Merge remote-tracking branch 'origin/master'

xuhy

2024-08-22 5e1cf8e0e94b42a94c3a3d3ccda5147fe6ce94f0

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -83,7 +83,7 @@
   @ResponseBody
   @GetMapping("/pageChargingPileList")
   @ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
   public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(@RequestBody PageChargingPileList page){
   public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(PageChargingPileList page){
      PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
      return AjaxResult.success(list);
   }
@@ -162,5 +162,18 @@
      PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
      return AjaxResult.success(chargingGunMonitoring);
   }
	
	
   /**
    * 根据id获取充电桩信息
    * @param id
    * @return
    */
   @ResponseBody
   @PostMapping("/getChargingPileById/{id}")
   public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
      TChargingPile chargingPile = chargingPileService.getById(id);
      return R.ok(chargingPile);
   }
}