Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wurui
2023-02-23 11:32:15 +08:00
parent d84466b380 5489fde766
commit 065454db0c
5 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
View File

@@ -24,7 +24,7 @@ public enum PmsDeviceResponseEnum {
NO_LINE_SORT("A00366","未查询到字典监测点类别"),
GENERATRIXWIRE_NAME_REPEAT("A00368","同一母线下存在相同名称线路"),
GENERATRIXWIRE_NAME_REPEAT("A00368","同一电站下存在相同名称线路"),
GENERATRIX_NAME_REPEAT("A00369","同一电站下存在相同名称母线"),
POWERGENERATIONUSER_SAME("A00370","发电用户名称或编号重复"),
POWERCLINET_SAME("A00371","用电用户名称或编号重复"),
@@ -50,9 +50,11 @@ public enum PmsDeviceResponseEnum {
MODEL_NAME_REPEAT("A00350","名称不可重复"),
TERMINAL_ID_REPEAT("A00351","终端索引已存在")
TERMINAL_ID_REPEAT("A00351","终端索引已存在"),
MONITOR_BIND_FIND("A00352","主网监测点存在绑定该装置关系,请先解除绑定关系"),
DIS_MONITOR_BIND_FIND("A00353","配网监测点存在绑定该装置关系,请先解除绑定关系"),
TERMINAL_BIND_FIND("A00354","装置管理存在绑定该电站关系,请先解除绑定关系"),
WIRE_BIND_FIND("A00355","线路台账存在绑定该电站关系,请先解除绑定关系"),
;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
View File

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
public class PmsTerminalParam {
@ApiModelProperty(name = "id",value = "终端编号")
@NotNull(message = "终端编号不能为空")
//@NotNull(message = "终端编号不能为空")
private String id;
@ApiModelProperty(name = "name", value = "终端名称")