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

1.解决分类指标，变电站电压等级图表的,排序问题。

Browse Source 
2.添加台账审核属性
This commit is contained in:
wurui
2023-02-23 11:31:55 +08:00
parent ceb1ac327c
commit d84466b380
14 changed files with 186 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,4 +36,33 @@ public class MonitorAuditParam {
@ApiModelProperty("页面尺寸")
private Integer pageSize=10;
@Data
public static class AuditParam {
private static final long serialVersionUID = 1L;
/**
* 审核id
*/
private String id;
/**
* 提交人员
*/
private String submitName;
/**
* 审核人员
*/
private String auditName;
/**
* 审核内容
*/
private String auditContent;
/**
* 数据类型,字典表（01：主网测点 02：配网测点）
*/
private String dataType;
}
}

37
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java Normal file
View File

@@ -0,0 +1,37 @@
package com.njcn.device.pms.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <功能描述>
*
* @author wr
* @createTime: 2023-02-22
*/
@Data
public class TransformerParam {
/**
* 变压器id
*/
@ApiModelProperty(value = "变压器id")
private String id;
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
private String name;
/**
* 变压器类型
*/
@ApiModelProperty(value = "变压器类型")
private String type;
/**
* 数据状态：0-删除；1-正常；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-正常；")
private Boolean status;
}

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

@@ -1,9 +1,13 @@
package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -25,31 +29,49 @@ public class MonitorAudit extends BaseEntity {
/**
* 审核id
*/
@ApiModelProperty(value = "审核id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/**
* 监测点名称
*/
@ApiModelProperty(value = "监测点名称")
private String monitorName;
/**
* 监测点类别
*/
@ApiModelProperty(value = "监测点类别")
private String monitorSort;
/**
* 提交人员
*/
@ApiModelProperty(value = "提交人员")
private String submitName;
/**
* 审核人员
*/
@ApiModelProperty(value = "审核人员")
private String auditName;
/**
* 审核内容
*/
@ApiModelProperty(value = "审核内容")
private String auditContent;
/**
* 数据类型,字典表（01：主网测点 02：配网测点）
*/
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType;
/**
* 数据状态：0-删除；1-待审核；2-已审核；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-待审核；2-已审核；")
private Boolean status;
/**

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

@@ -1,9 +1,12 @@
package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -25,21 +28,26 @@ public class Transformer extends BaseEntity {
/**
* 变压器id
*/
@ApiModelProperty(value = "变压器id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
private String name;
/**
* 变压器类型
*/
@ApiModelProperty(value = "变压器类型")
private String type;
/**
* 数据状态：0-删除；1-正常；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-正常；")
private Boolean status;
/**