ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-03-26 08:52:14 +08:00
parent 22028fe7eb
commit 4ef5c982de
15 changed files with 54 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
detection/src/main/java/com/njcn/gather/script/pojo/constant/PqScriptValidMessage.java
View File

@@ -8,4 +8,10 @@ public interface PqScriptValidMessage {
String INDEX_NOT_NULL = "index不能为空";
String VALUE_TYPE_NOT_BLANK = "脚本值类型不能为空";
String NAME_FORMAT_ERROR = "脚本名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号，长度为1-50个字符";
String SCRIPT_VOLT_FORMAT_ERROR = "检测脚本额定电压格式错误，请检查ratedVolt参数";
String SCRIPT_CURR_FORMAT_ERROR = "检测脚本额定电流格式错误，请检查ratedCurr参数";
}

11
detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
View File

@@ -2,6 +2,7 @@ package com.njcn.gather.script.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.gather.device.pojo.constant.DevValidMessage;
import com.njcn.gather.script.pojo.constant.PqScriptValidMessage;
import com.njcn.gather.system.pojo.constant.SystemValidMessage;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
import com.njcn.web.pojo.param.BaseParam;
@@ -20,6 +21,7 @@ public class PqScriptParam {
@ApiModelProperty("名称")
@NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.SCRIPT_NAME_REGEX, message = PqScriptValidMessage.NAME_FORMAT_ERROR)
private String name;
@ApiModelProperty("类型")
@@ -44,7 +46,6 @@ public class PqScriptParam {
@ApiModelProperty("参照标准名称")
@NotBlank(message = DevValidMessage.STANDARD_NAME_NOT_BLANK)
//@Pattern(regexp = PatternRegex.ERR_SYS_NAME, message = DevValidMessage.STANDARD_NAME_FORMAT_ERROR)
private String standardName;
@@ -59,8 +60,8 @@ public class PqScriptParam {
*/
@ApiModelProperty("额定电压")
@NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DevValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@Max(value = 380, message = DevValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@Min(value = 0, message = PqScriptValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@Max(value = 380, message = PqScriptValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
private Double ratedVolt;
/**
@@ -68,8 +69,8 @@ public class PqScriptParam {
*/
@ApiModelProperty("额定电流")
@NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DevValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@Max(value = 20, message = DevValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@Min(value = 0, message = PqScriptValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@Max(value = 20, message = PqScriptValidMessage.SCRIPT_CURR_FORMAT_ERROR)
private Double ratedCurr;