diff --git a/src/main/java/com/isu/gaswellwatch/exception/GlobalExceptionHandler.java b/src/main/java/com/isu/gaswellwatch/exception/GlobalExceptionHandler.java index 87de741..99886a2 100644 --- a/src/main/java/com/isu/gaswellwatch/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/isu/gaswellwatch/exception/GlobalExceptionHandler.java @@ -124,4 +124,5 @@ public class GlobalExceptionHandler { log.error("请求接口地址:{},触发异常类:{}, 异常消息:{}", request.getRequestURI(), e.getClass(), rawMsg); return Response.failed(translationMsg); } + } diff --git a/src/main/java/com/isu/gaswellwatch/vo/command/knpcv1/mode/TimePressureMode.java b/src/main/java/com/isu/gaswellwatch/vo/command/knpcv1/mode/TimePressureMode.java index 59b58c8..3271f6c 100644 --- a/src/main/java/com/isu/gaswellwatch/vo/command/knpcv1/mode/TimePressureMode.java +++ b/src/main/java/com/isu/gaswellwatch/vo/command/knpcv1/mode/TimePressureMode.java @@ -53,7 +53,7 @@ public class TimePressureMode extends ChangeRunMode implements Timing { */ @Builder.Default @NotBlank(message = "开井时长不能为空") - private String tpOpenTiming = "00:00:00"; + private String tpOpenTime = "00:00:00"; /** * 时压模式关井源 */ @@ -76,7 +76,7 @@ public class TimePressureMode extends ChangeRunMode implements Timing { */ @Builder.Default @NotBlank(message = "关井时长不能为空") - private String tpCloseTiming = "00:00:00"; + private String tpCloseTime = "00:00:00"; /** * 时压模式压力稳定时长:秒,[0-120] */ @@ -91,8 +91,8 @@ public class TimePressureMode extends ChangeRunMode implements Timing { @Override public boolean validate() { return super.validate() - && StringUtils.isNotBlank(this.tpOpenTiming) - && StringUtils.isNotBlank(this.tpCloseTiming) + && StringUtils.isNotBlank(this.tpOpenTime) + && StringUtils.isNotBlank(this.tpCloseTime) && this.tpInitStatus >= 0 && this.tpInitStatus <= 1 && this.tpOpenSource >= 0 && this.tpOpenSource <= 4 && this.tpOpenTrigger >= 0 && this.tpOpenTrigger <= 1 @@ -114,21 +114,21 @@ public class TimePressureMode extends ChangeRunMode implements Timing { command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenSource), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenTrigger), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenPressure), 4, "0")); - command.append(this.toHexString(this.tpOpenTiming)); + command.append(this.toHexString(this.tpOpenTime)); command.append(StringUtils.leftPad(Integer.toHexString(this.tpCloseSource), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpCloseTrigger), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpClosePressure), 4, "0")); - command.append(this.toHexString(this.tpCloseTiming)); + command.append(this.toHexString(this.tpCloseTime)); command.append(StringUtils.leftPad(Integer.toHexString(this.tpStabilityTime), 4, "0")); return List.of(ModbusCommandDto.builder().command(command.toString()).length(16).build()); } - public void setTpOpenTiming(String tpOpenTiming) { - this.tpOpenTiming = this.timingValidate(tpOpenTiming, "tpOpenTiming"); + public void setTpOpenTime(String tpOpenTime) { + this.tpOpenTime = this.timingValidate(tpOpenTime, "tpOpenTiming"); } - public void setTpCloseTiming(String tpCloseTiming) { - this.tpCloseTiming = this.timingValidate(tpCloseTiming, "tpCloseTiming"); + public void setTpCloseTime(String tpCloseTime) { + this.tpCloseTime = this.timingValidate(tpCloseTime, "tpCloseTiming"); } }