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

9
detection/src/main/java/com/njcn/gather/source/pojo/constant/PqSourceValidMessage.java
View File

@@ -1,9 +0,0 @@
package com.njcn.gather.source.pojo.constant;
/**
* @author caozehui
* @data 2025-03-07
*/
public interface PqSourceValidMessage {
String ID_NOT_BLANK = "检测源id不能为空";
}

26
detection/src/main/java/com/njcn/gather/source/pojo/param/PqSourceParam.java
View File

@@ -1,7 +1,7 @@
package com.njcn.gather.source.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.gather.device.pojo.constant.DevValidMessage;
import com.njcn.gather.pojo.constant.DetectionValidMessage;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,24 +28,24 @@ public class PqSourceParam {
/**
* 检测模式，字典表
*/
@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;
/**
* 检测源类型，字典表
*/
@ApiModelProperty(value = "检测源类型", required = true)
@NotBlank(message = DevValidMessage.PQ_SOURCE_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PQ_SOURCE_TYPE_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.PQ_SOURCE_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PQ_SOURCE_TYPE_FORMAT_ERROR)
private String type;
/**
* 设备类型，字典表
*/
@ApiModelProperty(value = "设备类型", required = true)
@NotBlank(message = DevValidMessage.DEV_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_TYPE_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.DEV_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_TYPE_FORMAT_ERROR)
private String devType;
@ApiModelProperty("源参数")
@@ -58,16 +58,16 @@ public class PqSourceParam {
private String name;
@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;
@ApiModelProperty(value = "检测源类型")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PQ_SOURCE_TYPE_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PQ_SOURCE_TYPE_FORMAT_ERROR)
private String type;
@ApiModelProperty(value = "设备类型")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.DEV_TYPE_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_TYPE_FORMAT_ERROR)
private String devType;
}
@@ -75,8 +75,8 @@ public class PqSourceParam {
@EqualsAndHashCode(callSuper = true)
public static class UpdateParam extends PqSourceParam {
@ApiModelProperty(value = "检测源ID", required = true)
@NotBlank(message = DevValidMessage.ID_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ID_FORMAT_ERROR)
@NotBlank(message = DetectionValidMessage.ID_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.ID_FORMAT_ERROR)
private String id;
}
}