project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复问题

This commit is contained in:
qinjie 2024-11-28 16:20:57 +08:00
parent f272b48edc
commit c056b6792e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/isu/gaswellwatch/exception/GlobalExceptionHandler.java
View File

@ -124,4 +124,5 @@ public class GlobalExceptionHandler {
log.error("请求接口地址:{},触发异常类:{}, 异常消息:{}", request.getRequestURI(), e.getClass(), rawMsg); log.error("请求接口地址:{},触发异常类:{}, 异常消息:{}", request.getRequestURI(), e.getClass(), rawMsg);
return Response.failed(translationMsg); return Response.failed(translationMsg);
} }
} }

20
src/main/java/com/isu/gaswellwatch/vo/command/knpcv1/mode/TimePressureMode.java
View File

@ -53,7 +53,7 @@ public class TimePressureMode extends ChangeRunMode implements Timing {
*/ */
@Builder.Default @Builder.Default
@NotBlank(message = "开井时长不能为空") @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 @Builder.Default
@NotBlank(message = "关井时长不能为空") @NotBlank(message = "关井时长不能为空")
private String tpCloseTiming = "00:00:00"; private String tpCloseTime = "00:00:00";
/** /**
* 时压模式压力稳定时长：秒，[0-120] * 时压模式压力稳定时长：秒，[0-120]
*/ */
@ -91,8 +91,8 @@ public class TimePressureMode extends ChangeRunMode implements Timing {
@Override @Override
public boolean validate() { public boolean validate() {
return super.validate() return super.validate()
&& StringUtils.isNotBlank(this.tpOpenTiming) && StringUtils.isNotBlank(this.tpOpenTime)
&& StringUtils.isNotBlank(this.tpCloseTiming) && StringUtils.isNotBlank(this.tpCloseTime)
&& this.tpInitStatus >= 0 && this.tpInitStatus <= 1 && this.tpInitStatus >= 0 && this.tpInitStatus <= 1
&& this.tpOpenSource >= 0 && this.tpOpenSource <= 4 && this.tpOpenSource >= 0 && this.tpOpenSource <= 4
&& this.tpOpenTrigger >= 0 && this.tpOpenTrigger <= 1 && 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.tpOpenSource), 4, "0"));
command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenTrigger), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenTrigger), 4, "0"));
command.append(StringUtils.leftPad(Integer.toHexString(this.tpOpenPressure), 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.tpCloseSource), 4, "0"));
command.append(StringUtils.leftPad(Integer.toHexString(this.tpCloseTrigger), 4, "0")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpCloseTrigger), 4, "0"));
command.append(StringUtils.leftPad(Integer.toHexString(this.tpClosePressure), 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")); command.append(StringUtils.leftPad(Integer.toHexString(this.tpStabilityTime), 4, "0"));
return List.of(ModbusCommandDto.builder().command(command.toString()).length(16).build()); return List.of(ModbusCommandDto.builder().command(command.toString()).length(16).build());
} }
public void setTpOpenTiming(String tpOpenTiming) { public void setTpOpenTime(String tpOpenTime) {
this.tpOpenTiming = this.timingValidate(tpOpenTiming, "tpOpenTiming"); this.tpOpenTime = this.timingValidate(tpOpenTime, "tpOpenTiming");
} }
public void setTpCloseTiming(String tpCloseTiming) { public void setTpCloseTime(String tpCloseTime) {
this.tpCloseTiming = this.timingValidate(tpCloseTiming, "tpCloseTiming"); this.tpCloseTime = this.timingValidate(tpCloseTime, "tpCloseTiming");
} }
} }