Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
xy
2024-08-08 18:41:34 +08:00
parent 0233c3e04f
commit 329143772b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java
View File

@@ -68,6 +68,7 @@ public enum AccessResponseEnum {
PROCESS_SAME_ERROR("A0311","当前调试已完成,请勿重复调试"), PROCESS_SAME_ERROR("A0311","当前调试已完成,请勿重复调试"),
PROCESS_MISSING_ERROR("A0311","调试流程缺失,请核查功能调试、出厂调试"), PROCESS_MISSING_ERROR("A0311","调试流程缺失,请核查功能调试、出厂调试"),
PROCESS_ERROR("A0311","调试流程异常,请先进行功能调试、出厂调试!"),
; ;
private final String code; private final String code;

10
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
View File

@@ -145,14 +145,10 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
throw new BusinessException(AccessResponseEnum.MISSING_CLIENT); throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
} }
//4.判断当前流程是否是合法的 //4.判断当前流程是否是合法的
if (csEquipmentDeliveryVO.getProcess() > type){ if (!Objects.equals(csEquipmentDeliveryVO.getProcess() + 1, type)){
logDto.setResult(0); logDto.setResult(0);
logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage()); logDto.setFailReason(AccessResponseEnum.PROCESS_ERROR.getMessage());
throw new BusinessException(AccessResponseEnum.PROCESS_SAME_ERROR); throw new BusinessException(AccessResponseEnum.PROCESS_ERROR);
} else if (csEquipmentDeliveryVO.getProcess() < type){
logDto.setResult(0);
logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage());
throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR);
} }
//5.询问设备支持的主题信息 //5.询问设备支持的主题信息
//将支持的主题入库 //将支持的主题入库