From ed0cc26eeecf7bb3032c05cc4e8153e23bcd653e Mon Sep 17 00:00:00 2001 From: BenjaminNH <1249376374@qq.com> Date: Tue, 1 Jul 2025 16:08:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=BB=E8=BE=91=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E8=8E=B7=E5=8F=96=E5=9B=A2=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipreservebackend/controller/DeviceController.java | 7 ++++--- .../github/benjamin/equipreservebackend/entity/Device.java | 3 +++ .../equipreservebackend/service/DeviceService.java | 3 +-- .../service/impl/DeviceServiceImpl.java | 7 +++++-- src/main/resources/application-template.yaml | 4 ++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java index c9c2950..82dbed3 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java @@ -43,9 +43,10 @@ public class DeviceController { } @PreAuthorize("hasRole('DEVICE_ADMIN')") - @PostMapping - public ResponseResult addDevice(@RequestBody Device device) { - deviceService.addDevice(device); + @PostMapping("/{userId}") + public ResponseResult addDevice(@PathVariable("userId") Long userId, + @RequestBody Device device) { + deviceService.addDevice(userId, device); return ResponseResult.success(device); } diff --git a/src/main/java/github/benjamin/equipreservebackend/entity/Device.java b/src/main/java/github/benjamin/equipreservebackend/entity/Device.java index 0578eb9..2c5b7cc 100644 --- a/src/main/java/github/benjamin/equipreservebackend/entity/Device.java +++ b/src/main/java/github/benjamin/equipreservebackend/entity/Device.java @@ -1,6 +1,8 @@ package github.benjamin.equipreservebackend.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.time.LocalDateTime; @@ -9,6 +11,7 @@ import java.time.LocalDateTime; @TableName("devices") public class Device { + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String name; private String usageRequirement; diff --git a/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java b/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java index 81d7348..2e3aef1 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/DeviceService.java @@ -1,6 +1,5 @@ package github.benjamin.equipreservebackend.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import github.benjamin.equipreservebackend.entity.Device; import github.benjamin.equipreservebackend.vo.DeviceAdminVO; @@ -12,7 +11,7 @@ import java.io.IOException; public interface DeviceService { Page getUserDevices(Page pageRequest, String name); - void addDevice(Device device); + void addDevice(Long userId, Device device); void deleteDevice(Long id); diff --git a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java index 67f899c..2746230 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java @@ -69,7 +69,10 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public void addDevice(Device device) { + public void addDevice(Long userId, Device device) { + User user = userMapper.selectById(userId); + device.setDeviceAdminId(userId); + device.setTeamId(user.getTeamId()); deviceMapper.insert(device); } @@ -100,7 +103,7 @@ public class DeviceServiceImpl implements DeviceService { @Override public String saveImage(Long id, MultipartFile image) throws IOException { - Device device = deviceMapper.selectOne(new LambdaQueryWrapper().eq(Device::getId, id)); + Device device = deviceMapper.selectById(id); String basePath = System.getProperty("user.dir"); if (StringUtils.hasText(device.getImagePath())) { Path fullPath = Paths.get(basePath, device.getImagePath()).normalize(); diff --git a/src/main/resources/application-template.yaml b/src/main/resources/application-template.yaml index f3040f8..16429ca 100644 --- a/src/main/resources/application-template.yaml +++ b/src/main/resources/application-template.yaml @@ -6,6 +6,10 @@ spring: username: your-username password: your-password url: jdbc:mysql://127.0.0.1:3306/equip_reserve?serverTimeZone=UTC + servlet: + multipart: + max-file-size: 15MB + max-request-size: 25MB server: port: 8080 jwt: