From e0207d7029b4e90ea1e4efeab5c3c5591f0e59c3 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 29 八月 2024 16:28:10 +0800 Subject: [PATCH] 申诉 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java index be3a1ba..08e5674 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java @@ -5,14 +5,17 @@ import com.ruoyi.chargingPile.api.dto.TParkingLotDTO; import com.ruoyi.chargingPile.api.model.TCarport; import com.ruoyi.chargingPile.api.model.TParkingLot; +import com.ruoyi.chargingPile.api.model.TParkingRecord; import com.ruoyi.chargingPile.api.model.TVehicleRamp; import com.ruoyi.chargingPile.api.query.TParkingLotQuery; import com.ruoyi.chargingPile.api.vo.TParkingLotVO; import com.ruoyi.chargingPile.service.TCarportService; import com.ruoyi.chargingPile.service.TParkingLotService; +import com.ruoyi.chargingPile.service.TParkingRecordService; import com.ruoyi.chargingPile.service.TVehicleRampService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.domain.BaseDelete; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; @@ -22,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; /** @@ -40,6 +45,9 @@ private final TParkingLotService parkingLotService; private final TVehicleRampService vehicleRampService; private final TCarportService carportService; + + @Resource + private TParkingRecordService parkingRecordService; @Autowired public TParkingLotController(TParkingLotService parkingLotService, TVehicleRampService vehicleRampService, TCarportService carportService) { @@ -62,9 +70,8 @@ */ @ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表") @PostMapping(value = "/list") - public AjaxResult<List<TParkingLot>> list(@RequestBody TParkingLotQuery query) { - return AjaxResult.ok(parkingLotService.list(Wrappers.lambdaQuery(TParkingLot.class) - .eq(TParkingLot::getName,query.getName()))); + public AjaxResult<List<TParkingLotVO>> list(@RequestBody TParkingLotQuery query) { + return AjaxResult.ok(parkingLotService.getList(query.getName())); } /** @@ -92,7 +99,7 @@ */ @ApiOperation(tags = {"后台-停车场"},value = "查看停车场详情") @GetMapping(value = "/getDetailById") - public AjaxResult<TParkingLot> getDetailById(@RequestParam Integer id) { + public AjaxResult<TParkingLot> getDetailById(@RequestParam("id") Integer id) { return AjaxResult.ok(parkingLotService.getById(id)); } @@ -102,7 +109,7 @@ @Log(title = "删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-停车场"},value = "删除停车场") @DeleteMapping(value = "/deleteById") - public AjaxResult<Boolean> deleteById(@RequestParam Integer id) { + public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) { // 刪除车道信息 vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class) .eq(TVehicleRamp::getParkingLotId, id)); @@ -118,23 +125,29 @@ @Log(title = "批量删除停车场", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场") @DeleteMapping(value = "/deleteByIds") - public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) { + public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) { + String[] split = ids.split(","); // 刪除车道信息 vehicleRampService.remove(Wrappers.lambdaQuery(TVehicleRamp.class) - .in(TVehicleRamp::getParkingLotId, ids)); + .in(TVehicleRamp::getParkingLotId, Arrays.asList(split))); // 删除车库信息 carportService.remove(Wrappers.lambdaQuery(TCarport.class) - .in(TCarport::getParkingLotId, ids)); - return AjaxResult.ok(parkingLotService.removeByIds(ids)); + .in(TCarport::getParkingLotId, Arrays.asList(split))); + return AjaxResult.ok(parkingLotService.removeByIds(Arrays.asList(split))); } /** * 通过站点id查询停车场信息 */ - @GetMapping(value = "/getLotBySiteId") + @PostMapping(value = "/getLotBySiteId") public R<TParkingLot> getLotBySiteId(@RequestParam("siteId") Integer siteId){ return R.ok(parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class) .eq(TParkingLot::getSiteId, siteId))); } + + @PostMapping(value = "/getRecordById") + public R<TParkingRecord> getRecordById(@RequestParam("id") Long id){ + return R.ok(parkingRecordService.getById(id)); + } } -- Gitblit v1.7.1