Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 f04bb37f47ff1eb51e5e8c42d73514c1e9c33710

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

@@ -5,8 +5,13 @@
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
@@ -64,13 +69,21 @@
        return AjaxResult.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
                .eq(TChargingPile::getSiteId,siteId)));
    }
	
   /**
     * 管理后台-通过站点id获取充电桩列表 不分页
     */
    @ApiOperation(value = "管理后台-通过站点id获取充电桩列表 不分页")
    @PostMapping(value = "/getChargingPileBySiteId")
    public R<List<TChargingPile>> getChargingPileBySiteId(@RequestParam("siteId") Integer siteId) {
        return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
                .eq(TChargingPile::getSiteId,siteId)));
    }
   
   
   @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);
   }
@@ -104,13 +117,13 @@
   
   
   @ResponseBody
   @DeleteMapping("/delChargingPile/{id}")
   @DeleteMapping("/delChargingPile")
   @Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
   @ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"})
   @ApiImplicitParams({
         @ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true)
   })
   public AjaxResult delChargingPile(@PathVariable Integer[] id){
   public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
      return chargingPileService.delChargingPile(id);
   }
   
@@ -125,7 +138,29 @@
   }
   
   
   @ResponseBody
   @GetMapping("/chargeMonitoring/{siteId}")
   @ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
   public AjaxResult<ChargeMonitoring> chargeMonitoring(@PathVariable Integer siteId){
      ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
      return AjaxResult.success(chargeMonitoring);
   }
	
   @ResponseBody
   @GetMapping("/getChargingGunCountMonitoring/{siteId}")
   @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
   public AjaxResult<ChargingGunCountMonitoring> getChargingGunCountMonitoring(@PathVariable Integer siteId){
      ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
      return AjaxResult.success(chargingGunCountMonitoring);
   }
   
   
   @ResponseBody
   @GetMapping("/getChargingGunMonitoring")
   @ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
   public AjaxResult<PageInfo<ChargingGunMonitoring>> getChargingGunMonitoring(GetChargingGunMonitoring query){
      PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
      return AjaxResult.success(chargingGunMonitoring);
   }
}