Benjamin/equip-reserve-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Benjamin:main
Branches Tags
Benjamin:main
Benjamin:dev
Benjamin:v1.0.1
Benjamin:v1.0.0
..
compare: Benjamin:v1.0.0
Branches Tags
Benjamin:dev
Benjamin:main
Benjamin:v1.0.1
Benjamin:v1.0.0

No commits in common. "main" and "v1.0.0" have entirely different histories.
main ... v1.0.0

3 changed files with 5 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>github.benjamin</groupId> <groupId>github.benjamin</groupId>
<artifactId>equip-reserve-backend</artifactId> <artifactId>equip-reserve-backend</artifactId>
<version>1.0.1</version> <version>1.0.0</version>
<name>equip-reserve-backend</name> <name>equip-reserve-backend</name>
<description>equip-reserve-backend</description> <description>equip-reserve-backend</description>
<url/> <url/>

8
src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java
View File

@ -53,10 +53,10 @@ public class DeviceController {
@PreAuthorize("hasRole('DEVICE_ADMIN')") @PreAuthorize("hasRole('DEVICE_ADMIN')")
@PostMapping("/{userId}") @PostMapping("/{userId}")
public ResponseResult<DeviceAdminVO> addDevice(@PathVariable("userId") Long userId, public ResponseResult<Device> addDevice(@PathVariable("userId") Long userId,
@RequestBody Device device) { @RequestBody Device device) {
deviceService.addDevice(userId, device); deviceService.addDevice(userId, device);
return ResponseResult.success(new DeviceAdminVO(device)); return ResponseResult.success(device);
} }
@PreAuthorize("hasRole('DEVICE_ADMIN')") @PreAuthorize("hasRole('DEVICE_ADMIN')")
@ -68,11 +68,11 @@ public class DeviceController {
@PreAuthorize("hasRole('DEVICE_ADMIN')") @PreAuthorize("hasRole('DEVICE_ADMIN')")
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseResult<DeviceAdminVO> updateDevice(@PathVariable("id") Long id, public ResponseResult<?> updateDevice(@PathVariable("id") Long id,
@RequestBody Device device) { @RequestBody Device device) {
device.setId(id); device.setId(id);
Device updatedDevice = deviceService.updateDevice(device); Device updatedDevice = deviceService.updateDevice(device);
return ResponseResult.success(new DeviceAdminVO(updatedDevice)); return ResponseResult.success(updatedDevice);
} }
@PreAuthorize("hasRole('DEVICE_ADMIN')") @PreAuthorize("hasRole('DEVICE_ADMIN')")

8
src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java
View File

@ -80,14 +80,6 @@ public class DeviceServiceImpl implements DeviceService {
@Override @Override
public void deleteDevice(Long id) { public void deleteDevice(Long id) {
Device device = deviceMapper.selectById(id);
if (StringUtils.hasText(device.getImagePath())) {
Path fullPath = Paths.get(System.getProperty("user.dir"), device.getImagePath()).normalize();
File file = fullPath.toFile();
if (file.exists() && file.isFile()) {
file.delete();
}
}
deviceMapper.delete(new LambdaQueryWrapper<Device>() deviceMapper.delete(new LambdaQueryWrapper<Device>()
.eq(Device::getId, id)); .eq(Device::getId, id));
} }