From 329143772b9680a87a183e210bd7781f94f86f40 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 8 Aug 2024 18:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/access/enums/AccessResponseEnum.java | 1 + .../njcn/access/service/impl/CsDeviceServiceImpl.java | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java b/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java index d96bfeb..208a9ba 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java @@ -68,6 +68,7 @@ public enum AccessResponseEnum { PROCESS_SAME_ERROR("A0311","当前调试已完成,请勿重复调试"), PROCESS_MISSING_ERROR("A0311","调试流程缺失,请核查功能调试、出厂调试"), + PROCESS_ERROR("A0311","调试流程异常,请先进行功能调试、出厂调试!"), ; private final String code; diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index bbe3b58..0f02c83 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -145,14 +145,10 @@ public class CsDeviceServiceImpl implements ICsDeviceService { throw new BusinessException(AccessResponseEnum.MISSING_CLIENT); } //4.判断当前流程是否是合法的 - if (csEquipmentDeliveryVO.getProcess() > type){ + if (!Objects.equals(csEquipmentDeliveryVO.getProcess() + 1, type)){ logDto.setResult(0); - logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage()); - throw new BusinessException(AccessResponseEnum.PROCESS_SAME_ERROR); - } else if (csEquipmentDeliveryVO.getProcess() < type){ - logDto.setResult(0); - logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage()); - throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR); + logDto.setFailReason(AccessResponseEnum.PROCESS_ERROR.getMessage()); + throw new BusinessException(AccessResponseEnum.PROCESS_ERROR); } //5.询问设备支持的主题信息 //将支持的主题入库