diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 375aa177..dba23188 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -582,7 +582,7 @@ public class DeviceController extends ControllerBase { if (Objects.isNull(dto.getId())) { sb.append("id不能为空;"); }else { - device = dbDevices.stream().filter(d -> d.getId().equals(dto.getId())).findFirst().orElse(null); + device = dbDevices.stream().filter(d -> d.getId().toString().equals(dto.getId())).findFirst().orElse(null); if (Objects.isNull(device)) { sb.append("设备不存在;"); device = new Device(); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceUpdateImportDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceUpdateImportDTO.java index 0ba3b821..c76bab7c 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceUpdateImportDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceUpdateImportDTO.java @@ -14,5 +14,5 @@ public class DeviceUpdateImportDTO extends DeviceAddImportDTO{ * id */ @ExcelColumn("id*") - private Integer id; + private String id; } diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java index 17952cb2..4aabec6c 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java @@ -596,7 +596,7 @@ public class DeviceController extends ControllerBase { if (Objects.isNull(dto.getId())) { sb.append("id不能为空;"); } else { - device = dbDevices.stream().filter(d -> d.getId().equals(dto.getId())).findFirst().orElse(null); + device = dbDevices.stream().filter(d -> d.getId().toString().equals(dto.getId())).findFirst().orElse(null); if (Objects.isNull(device)) { sb.append("设备不存在;"); device = new GongfuDevice(); diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/dto/DeviceUpdateImportDTO.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/dto/DeviceUpdateImportDTO.java index 1b96834f..41c20586 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/dto/DeviceUpdateImportDTO.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/dto/DeviceUpdateImportDTO.java @@ -14,5 +14,5 @@ public class DeviceUpdateImportDTO extends DeviceAddImportDTO { * id */ @ExcelColumn("id*") - private Long id; + private String id; }