- Timestamp:
- 12/24/21 23:31:23 (3 years ago)
- Branches:
- master
- Children:
- 9dd526f
- Parents:
- 8588fcb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingSpaceController.java
r8588fcb r9ff45d6 33 33 } 34 34 35 @PostMapping({"/parkingSpace"}) 36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace) { 37 <<<<<<< HEAD 38 System.out.println("???????"); 39 ======= 40 //System.out.println("???????"); 41 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 42 return this.parkingSpaceService.addParkingSpace(parkingSpace); 35 @PostMapping({"/parkingSpace/add/{parkingZoneId}"}) 36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace,@PathVariable int parkingZoneId) { 37 return this.parkingSpaceService.addParkingSpace(parkingSpace,parkingZoneId); 43 38 } 44 39 45 40 @PutMapping({"/parkingSpace/{parkingSpaceId}"}) 46 41 public void updateParkingSpace(@PathVariable int parkingSpaceId, @RequestBody ParkingSpace parkingSpace) { 47 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), 48 parkingSpace.isHandicaped(), parkingSpace.getLat(), parkingSpace.getLng()); 42 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), parkingSpace.getLat(), parkingSpace.getLng()); 49 43 } 50 44
Note:
See TracChangeset
for help on using the changeset viewer.