feat: 设备流转，返回给前端的消息体修改

src/main/java/vion/controller/DeviceController.java

@@ -42,13 +42,13 @@ public class DeviceController {
 
 
     @PostMapping("/record")
     @PostMapping("/record")
     @SaCheckPermission(value = "device:record", orRole = "admin")
     @SaCheckPermission(value = "device:record", orRole = "admin")
-    public String circulate(@RequestBody List<DeviceDTO> dtoList) {
+    public Object circulate(@RequestBody List<DeviceDTO> dtoList) {
         return deviceService.recordDevice(dtoList);
         return deviceService.recordDevice(dtoList);
     }
     }
 
 
     @PostMapping("/circulate")
     @PostMapping("/circulate")
     @SaCheckPermission(value = "device:circulate", orRole = "admin")
     @SaCheckPermission(value = "device:circulate", orRole = "admin")
-    public String circulateBatch(@RequestBody List<DeviceDTO> dtoList) {
+    public Object circulateBatch(@RequestBody List<DeviceDTO> dtoList) {
         return deviceService.circulateBatch(dtoList);
         return deviceService.circulateBatch(dtoList);
     }
     }
 
 

src/main/java/vion/service/IDeviceService.java

@@ -20,7 +20,7 @@ public interface IDeviceService extends MPJBaseService<Device> {
 
 
     String update(List<DeviceDTO> dtoList);
     String update(List<DeviceDTO> dtoList);
 
 
-    String recordDevice(List<DeviceDTO> dtoList);
+    Object recordDevice(List<DeviceDTO> dtoList);
 
 
-    String circulateBatch(List<DeviceDTO> dtoList);
+    Object circulateBatch(List<DeviceDTO> dtoList);
 }
 }

src/main/java/vion/service/impl/IDeviceServiceImpl.java

@@ -16,6 +16,7 @@ import vion.model.Device;
 import vion.model.DeviceLog;
 import vion.model.DeviceLog;
 import vion.service.IDeviceLogService;
 import vion.service.IDeviceLogService;
 import vion.service.IDeviceService;
 import vion.service.IDeviceService;
+import vion.utils.ResultUtil;
 import vion.vo.DeviceVO;
 import vion.vo.DeviceVO;
 
 
 import java.util.List;
 import java.util.List;
@@ -76,13 +77,13 @@ public class IDeviceServiceImpl extends MPJBaseServiceImpl<DeviceMapper, Device>
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public String recordDevice(List<DeviceDTO> dtoList) {
+    public Object recordDevice(List<DeviceDTO> dtoList) {
         if (CollUtil.isEmpty(dtoList)) {
         if (CollUtil.isEmpty(dtoList)) {
-            return "设备为空";
+            return ResultUtil.error("设备为空");
         }
         }
         var statusSet = dtoList.stream().map(DeviceDTO::getStatus).collect(Collectors.toSet());
         var statusSet = dtoList.stream().map(DeviceDTO::getStatus).collect(Collectors.toSet());
         if (statusSet.size() > 1 || !statusSet.contains(1)) {
         if (statusSet.size() > 1 || !statusSet.contains(1)) {
-            return "该操作仅支持设备入库";
+            return ResultUtil.error("该操作仅支持设备入库");
         }
         }
         var userId = dtoList.getFirst().getUserId();
         var userId = dtoList.getFirst().getUserId();
 
 
@@ -91,9 +92,10 @@ public class IDeviceServiceImpl extends MPJBaseServiceImpl<DeviceMapper, Device>
                 .in(Device::getSerialNum, dtoList.stream().map(DeviceDTO::getSerialNum).toList())
                 .in(Device::getSerialNum, dtoList.stream().map(DeviceDTO::getSerialNum).toList())
                 .list();
                 .list();
         if (CollUtil.isNotEmpty(existDevice)) {
         if (CollUtil.isNotEmpty(existDevice)) {
-            return existDevice.stream()
+            var deviceStr = existDevice.stream()
                     .map(Device::getSerialNum)
                     .map(Device::getSerialNum)
                     .collect(Collectors.joining(",", "设备序列号已存在：", ""));
                     .collect(Collectors.joining(",", "设备序列号已存在：", ""));
+            return ResultUtil.error(deviceStr);
         }
         }
 
 
         var deviceList = converter.convert(dtoList, Device.class);
         var deviceList = converter.convert(dtoList, Device.class);
@@ -114,13 +116,13 @@ public class IDeviceServiceImpl extends MPJBaseServiceImpl<DeviceMapper, Device>
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public String circulateBatch(List<DeviceDTO> dtoList) {
+    public Object circulateBatch(List<DeviceDTO> dtoList) {
         if (CollUtil.isEmpty(dtoList)) {
         if (CollUtil.isEmpty(dtoList)) {
-            return "设备为空";
+            return ResultUtil.error("设备为空");
         }
         }
         var statusSet = dtoList.stream().map(DeviceDTO::getStatus).collect(Collectors.toSet());
         var statusSet = dtoList.stream().map(DeviceDTO::getStatus).collect(Collectors.toSet());
         if (statusSet.size() > 1) {
         if (statusSet.size() > 1) {
-            return "该操作不允许对设备进行不同处理";
+            return ResultUtil.error("该操作不允许对设备进行不同处理");
         }
         }
 
 
         var userId = dtoList.getFirst().getUserId();
         var userId = dtoList.getFirst().getUserId();