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-28 15:06:57 +08:00
parent 48408859b1
commit 71ba7fa139
31 changed files with 296 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +0,0 @@
package com.njcn.gather.script.pojo.constant;
/**
* @author caozehui
* @data 2025-03-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参数";
}

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

@@ -1,8 +1,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.pojo.constant.DetectionValidMessage;
import com.njcn.gather.system.pojo.constant.SystemValidMessage;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
import com.njcn.web.pojo.param.BaseParam;
@@ -20,22 +19,22 @@ import javax.validation.constraints.*;
public class PqScriptParam {
@ApiModelProperty("名称")
@NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.SCRIPT_NAME_REGEX, message = PqScriptValidMessage.NAME_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.SCRIPT_NAME_REGEX, message = DetectionValidMessage.SCRIPT_NAME_FORMAT_ERROR)
private String name;
@ApiModelProperty("类型")
@NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
@Max(value = 1, message = DevValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
@NotNull(message = DetectionValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DetectionValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
@Max(value = 1, message = DetectionValidMessage.SCRIPT_TYPE_FORMAT_ERROR)
private Integer type;
/**
* 检测脚本模式，字典表（数字、模拟、比对）
*/
@ApiModelProperty("模式")
@NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
private String pattern;
/**
@@ -45,13 +44,13 @@ public class PqScriptParam {
private String valueType;
@ApiModelProperty("参照标准名称")
@NotBlank(message = DevValidMessage.STANDARD_NAME_NOT_BLANK)
@NotBlank(message = DetectionValidMessage.STANDARD_NAME_NOT_BLANK)
private String standardName;
@ApiModelProperty("标准推行时间")
@NotBlank(message = DevValidMessage.STANDARD_TIME_NOT_BLANK)
@DateTimeStrValid(format = "yyyy", message = DevValidMessage.STANDARD_TIME_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.STANDARD_TIME_NOT_BLANK)
@DateTimeStrValid(format = "yyyy", message = DetectionValidMessage.STANDARD_TIME_FORMAT_ERROR)
private String standardTime;
@@ -59,18 +58,18 @@ public class PqScriptParam {
* 额定电压
*/
@ApiModelProperty("额定电压")
@NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = PqScriptValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@Max(value = 380, message = PqScriptValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@NotNull(message = DetectionValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DetectionValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
@Max(value = 380, message = DetectionValidMessage.SCRIPT_VOLT_FORMAT_ERROR)
private Double ratedVolt;
/**
* 额定电流
*/
@ApiModelProperty("额定电流")
@NotNull(message = DevValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = PqScriptValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@Max(value = 20, message = PqScriptValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@NotNull(message = DetectionValidMessage.SCRIPT_TYPE_NOT_BLANK)
@Min(value = 0, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
@Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
private Double ratedCurr;
@@ -87,8 +86,8 @@ public class PqScriptParam {
private String valueType;
@ApiModelProperty("模式")
@NotBlank(message = DevValidMessage.PATTERN_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PATTERN_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.PATTERN_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PATTERN_FORMAT_ERROR)
private String pattern;
}
@@ -96,7 +95,7 @@ public class PqScriptParam {
@EqualsAndHashCode(callSuper = true)
public static class UpdateParam extends PqScriptParam {
@ApiModelProperty("检测脚本ID")
@NotBlank(message = DevValidMessage.ID_NOT_BLANK)
@NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.ID_FORMAT_ERROR)
private String id;
}

6
detection/src/main/java/com/njcn/gather/script/pojo/param/ScriptParam.java
View File

@@ -1,10 +1,10 @@
package com.njcn.gather.script.pojo.param;
import com.njcn.gather.device.pojo.constant.DevValidMessage;
import com.njcn.gather.pojo.constant.DetectionValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.NotBlank;
/**
* @author caozehui
@@ -14,7 +14,7 @@ import javax.validation.constraints.*;
public class ScriptParam {
@ApiModelProperty("检测脚本id")
@NotBlank(message = DevValidMessage.ID_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.ID_FORMAT_ERROR)
private String scriptId;
@ApiModelProperty("检测脚本类型")