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

pms台账bug提交,台账日志操作

Browse Source
This commit is contained in:
雨木c
2023-02-24 15:54:49 +08:00
parent 17b075f548
commit 5915ed87ac
28 changed files with 836 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/annotation/TerminalOperationLogDesc.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.device.pms.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* pqs
*
* @author cdf
* @date 2023/2/23
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface TerminalOperationLogDesc {
String value();
/**
* 操作模块 0.电站 1.装置 2.线路 3.台区 4.发电用户 5.用电用户 6.主网监测点 7.配网监测点
*/
int module();
/**
* 操作事件
*/
String events() default "";
}

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

@@ -32,7 +32,7 @@ public enum PmsDeviceResponseEnum {
GENWIRE_SAME("A00373","母线编号重复"),
POWER_CODE_SAME("A00374","台区名称或编号重复"),
POWER_CLIENT_DIS_EMPTY("A00375","发电用电用户参数不可为空"),
DIS_ADD_REPEAT("A00376","当前配网中存在该监测点"),
DIS_ADD_REPEAT("A00376","当前配网中存在相同编号该监测点"),
STATION_REPEAT("A00377","已存在相同电站"),
DEPT_STATION_REPEAT("A00378","单位下存在同名电站"),
DEPT_MONITOR_REPEAT("A00379","单位下存在同名监测点"),

29
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsDistributionMonitorDTO.java Normal file
View File

@@ -0,0 +1,29 @@
package com.njcn.device.pms.pojo.dto;
import lombok.Data;
/**
* pqs
*
* @author cdf
* @date 2023/2/24
*/
@Data
public class PmsDistributionMonitorDTO {
private String id;
private String name;
private String orgName;
private String powerStationName;
private String platformName;
private String lineName;
private Integer monitorSort;
}

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

@@ -38,6 +38,8 @@ public class DistributionMonitorParam {
@ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")
private Integer smallType;
private Integer ifPowerUser;
@ApiModelProperty(value = "终端id")
private String terminalId;

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

@@ -86,14 +86,14 @@ public class PowerClientParam {
* 合同容量
*/
@ApiModelProperty(value = "合同容量",required = true)
@NotBlank(message = "合同容量不可为空")
@NotNull(message = "合同容量不可为空")
private Float contractCapacity;
/**
* 运行容量
*/
@ApiModelProperty(value = "运行容量",required = true)
@NotBlank(message = "运行容量不可为空")
@NotNull(message = "运行容量不可为空")
private Float operatingCapacity;
/**
@@ -157,14 +157,14 @@ public class PowerClientParam {
* 是否影响电能质量：0-否；1：是；
*/
@ApiModelProperty(value = "是否影响电能质量：0-否；1：是；",required = true)
@NotBlank(message = "是否影响电能质量不可为空")
@NotNull(message = "是否影响电能质量不可为空")
private Integer ifPowerQuality;
/**
* 是否重要客户：0-否；1：是；
*/
@ApiModelProperty(value = "是否重要客户：0-否；1：是；",required = true)
@NotBlank(message = "是否重要客户不可为空")
@NotNull(message = "是否重要客户不可为空")
private Integer ifKeyCustomers;
/**

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

@@ -1,5 +1,6 @@
package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +10,7 @@ import java.time.LocalDate;
/**
* pms-device
*
* 发电用户
* @author cdf
* @date 2022/10/27
*/
@@ -93,7 +94,7 @@ public class PowerGenerationUserParam {
* 总装机容量
*/
@ApiModelProperty(value = "总装机容量",required = true)
@NotBlank(message = "总装机容量不可为空")
@NotNull(message = "总装机容量不可为空")
private Float sourceCapacity;
/**
@@ -101,7 +102,8 @@ public class PowerGenerationUserParam {
*/
@ApiModelProperty(value = "并网日期",required = true)
@NotBlank(message = "并网日期不可为空")
private LocalDate connectionDate;
@DateTimeStrValid(format = "yyyy-MM-dd",message = "并网日期格式有误")
private String connectionDate;
/**
* 能源消纳方式(字典)

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

@@ -22,4 +22,7 @@ public class TerminalQueryParam extends BaseParam {
@ApiModelProperty(value = "装置类别(字典)")
private String deviceCategory;
@ApiModelProperty(value = "监测点标签(字典)")
private String monitorTag;
}

66
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalLog.java Normal file
View File

@@ -0,0 +1,66 @@
package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
/**
* <p>
*
* </p>
*
* @author hongawen
* @since 2023-02-23
*/
@Data
@TableName("pms_terminal_log")
public class TerminalLog extends BaseEntity implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
private String id;
/**
* 0.电站 1.装置 2.台区 3.线路 4.监测点
*/
private Integer type;
/**
* 0.非监测点 1.主网监测点 2.配网监测点
*/
private Integer monitorType;
/**
* 操作对象索引（外键）
*/
private String objId;
/**
* 操作描述
*/
private String operatorDescribe;
/**
* 操作结果 0.失败 1.成功
*/
private Integer results;
/**
* 0.删除 1.正常
*/
private Integer status;
@TableField(exist = false)
private Boolean operationStatus;
}