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

代码合并终端模块

Browse Source
This commit is contained in:
雨木c
2023-01-17 13:47:32 +08:00
parent 9b9ab96582
commit 0949b1ee34
33 changed files with 361 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
* @date 2022/10/18
*/
@FeignClient(value = ServerInfo.DEVICE,
path = "/pmsGeneratrix",
path = "/pmsGeneratrixWire",
fallbackFactory = PmsGeneratrixClientFallbackFactory.class)
public interface PmsGeneratrixClient {

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

@@ -17,7 +17,7 @@ public enum PmsDeviceResponseEnum {
DEVICE_COMMON_ERROR("A00349","终端模块异常"),
ORG_ITEM_EMPTY("A00360","未查询到指定组织机构"),
Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"),
VOLTAGE_EMPTY("A00362","未查询到指定母线"),
VOLTAGE_EMPTY("A00362","未查询到指定线路"),
LINE_EMPTY("A00363","未查询到指定线路"),
NO_USER_TYPE("A00364","未查询字典用户类型"),
NO_STATION("A00365","未查询指定电站信息"),

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

@@ -15,16 +15,26 @@ import javax.validation.constraints.NotBlank;
public class GeneratrixWireParam {
@ApiModelProperty(value = "线路id",required = true)
@NotBlank(message = "线路id不可为空")
private String wireId;
private String id;
@ApiModelProperty(value = "线路名称",required = true)
@NotBlank(message = "线路名称不可为空")
private String wireName;
private String name;
@ApiModelProperty(value = "母线id",required = true)
@NotBlank(message = "母线id不可为空")
private String generatrixId;
@ApiModelProperty(value = "电站编号",required = true)
@NotBlank(message = "电站编号不可为空")
private String stationId;
@ApiModelProperty(value = "电站名称",required = true)
@NotBlank(message = "电站名称不可为空")
private String stationName;
@ApiModelProperty(value = "母线名称",required = true)
private String generatrixName;
@ApiModelProperty(value = "电压等级(字典)",required = true)
@NotBlank(message = "电压等级不可为空")
private String scale;

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

@@ -72,18 +72,18 @@ public class MonitorParam {
private String powerrName;
/**
* 母线编号(外键)
* 线路编号
*/
@ApiModelProperty(value = "母线编号(外键)")
@NotBlank(message = "母线编号不能为空")
private String generatrixId;
@ApiModelProperty(value = "线路编号(外键)")
@NotBlank(message = "线路编号不能为空")
private String lineId;
/**
* 母线名称
* 线路名称
*/
@ApiModelProperty(value = "母线名称")
@NotBlank(message = "母线名称不能为空")
private String generatrixName;
@ApiModelProperty(value = "线路名称")
@NotBlank(message = "线路名称不能为空")
private String lineName;
/**
* 电压等级(字典)

16
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
View File

@@ -19,12 +19,22 @@ public class GeneratrixWire extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId
private String wireId;
private String id;
private String wireName;
private String name;
private String generatrixId;
private String scale;
private String stationId;
/**
* 电站名称
*/
private String stationName;
/**
* 母线名称
*/
private String generatrixName;
private Integer status;

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

@@ -63,7 +63,7 @@ public class Monitor extends BaseEntity {
/**
* 母线名称
*/
private String generatrixName;
private String generatrixWireName;
/**
* 母线ID(外键)