From a96c5eddcd63fa6f09e4cdce9e28c7b846068f0c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 18 九月 2024 16:45:51 +0800 Subject: [PATCH] 9.18 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java index a93b658..787cdbb 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.query.TChargingGunQuery; import com.ruoyi.chargingPile.api.vo.TChargingGunVO; @@ -51,23 +52,38 @@ public class TChargingPileController { private final TChargingPileService chargingPileService; + private final TChargingGunService chargingGunService; + @Autowired - public TChargingPileController(TChargingPileService chargingPileService) { + public TChargingPileController(TChargingPileService chargingPileService, TChargingGunService chargingGunService) { this.chargingPileService = chargingPileService; + this.chargingGunService = chargingGunService; } /** * 查询充电桩列表 */ - @ApiOperation(tags = {"小程序-充电桩"},value = "查询充电桩列表") - @PostMapping(value = "/list") + @ApiOperation(tags = {"小程序-充电桩"},value = "通过站点id查询充电桩列表") + @GetMapping(value = "/list") @ApiImplicitParams({ @ApiImplicitParam(name = "siteId", value = "站点id") }) public AjaxResult<List<TChargingPile>> list(@RequestParam("siteId") Integer siteId) { return AjaxResult.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class) .eq(TChargingPile::getSiteId,siteId))); + } + /** + * 查询充电桩列表 + */ + @ApiOperation(tags = {"通过充电桩id 查询充电枪列表"},value = "通过充电桩id 查询充电枪列表") + @PostMapping(value = "/pileList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pileId", value = "充电桩id") + }) + public AjaxResult<List<TChargingGun>> pileList(@RequestParam("pileId") Integer pileId) { + return AjaxResult.ok(chargingGunService.list(Wrappers.lambdaQuery(TChargingGun.class) + .eq(TChargingGun::getChargingPileId,pileId))); } /** * 管理后台-通过站点id获取充电桩列表 不分页 @@ -78,18 +94,23 @@ return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class) .eq(TChargingPile::getSiteId,siteId))); } - + + @PostMapping(value = "/getChargingPileBySiteIds") + public R<List<TChargingPile>> getChargingPileBySiteIds(@RequestParam("siteIds") List<Integer> siteIds) { + return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class) + .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds))); + } @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); } @ResponseBody - @Log(title = "添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) + @Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) @PostMapping("/addChargingPile") @ApiOperation(value = "添加充电桩数据", tags = {"管理后台-充电桩信息"}) public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){ @@ -107,7 +128,7 @@ @ResponseBody - @Log(title = "编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) + @Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) @PostMapping("/editChargingPile") @ApiOperation(value = "编辑充电桩数据", tags = {"管理后台-充电桩信息"}) public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){ @@ -118,7 +139,7 @@ @ResponseBody @DeleteMapping("/delChargingPile") - @Log(title = "删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) + @Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) @ApiOperation(value = "删除充电桩", tags = {"管理后台-充电桩信息"}) @ApiImplicitParams({ @ApiImplicitParam(value = "充电桩id", name = "id", dataTypeClass = Integer.class, required = true) @@ -129,7 +150,7 @@ @ResponseBody - @Log(title = "批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) + @Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) @PostMapping("/batchSetAccountingStrategy") @ApiOperation(value = "批量设置计费策略", tags = {"管理后台-充电桩信息"}) public AjaxResult batchSetAccountingStrategy(@RequestBody BatchSetAccountingStrategy setAccountingStrategy){ @@ -145,7 +166,8 @@ ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId); return AjaxResult.success(chargeMonitoring); } - + + @ResponseBody @GetMapping("/getChargingGunCountMonitoring/{siteId}") @ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"}) @@ -162,5 +184,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); + } } -- Gitblit v1.7.1