From 3da5a3beed53070e6c43ded2f2036169c5aacfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 29 Apr 2025 17:03:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=B7=A5=E5=8D=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改设备添加逻辑，判断设备编号是否存在时增加设备状态和数据有效性判断- 优化工单处理中审计状态判断逻辑，提高代码可读性和安全性 --- .../mobilebroken/admin/controller/DeviceController.java | 7 +++++-- .../mobilebroken/admin/controller/TicketController.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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 9612f780..b5948abe 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 @@ -167,8 +167,11 @@ public class DeviceController extends ControllerBase { @MethodInfoMark(value = "新增", menuName = "设备管理") @ApiMark(moduleName = "设备管理", apiName = "新增") public ApiResult add(@Valid @RequestBody DeviceDTO deviceDTO) { - Device one = deviceService.lambdaQuery().eq(Device::getDeviceNo, deviceDTO.getDeviceNo()).one(); - VUtils.trueThrow(Objects.nonNull(one)).throwMessage(STATE.ParamErr,deviceDTO.getDeviceNo()+"设备编号已存在"); + VUtils.trueThrow(deviceService.lambdaQuery() + .eq(Device::getDeviceNo, deviceDTO.getDeviceNo()) + .eq(Device::getDeviceState,deviceDTO.getDeviceState()) + .eq(Device::getDataValidState,true) + .exists()).throwMessage(STATE.ParamErr,deviceDTO.getDeviceNo()+"设备编号已存在"); adminDeviceService.add(deviceDTO); return ApiResult.success(true); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 6e77c0aa..a56ba1cf 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -782,7 +782,7 @@ public class TicketController extends ControllerBase { Ticket ticket = ticketSolutionService.saveSolutionMeasures(request); List audits = ticketSolutionAuditService.getByTicket(request.getTicketId()); audits.forEach(audit -> { - if (audit.getState() == 0) { + if (Objects.equals(audit.getState(),0)) { adminMessageService.add( new AdminMessage() .setNo(ticket.getNo())