Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

方案数据除统计接口第一阶段提交

Browse Source
This commit is contained in:
guofeihu
2024-06-13 20:30:18 +08:00
parent 74ebff1592
commit bee3171860
11 changed files with 517 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/WlRecordPageParam.java Normal file
View File

@@ -0,0 +1,31 @@
package com.njcn.csdevice.param;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@NoArgsConstructor
public class WlRecordPageParam extends BaseParam {
/**
* 测试项ID
*/
@ApiModelProperty(value="测试项ID")
private String id;
/**
* 测试项ID
*/
@ApiModelProperty(value="是否匹配测试项ID")
private Integer isTrueFlag;
/**
* 关键字多个匹配
*/
@ApiModelProperty(value="关键字多个匹配")
private String searchText;
}

79
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java
View File

@@ -3,9 +3,6 @@ package com.njcn.csdevice.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -18,8 +15,7 @@ import java.util.List;
@Data
public class WlRecordParam {
@ApiModelProperty("方案、测试项名称")
@NotBlank(message = "名称不可为空")
@ApiModelProperty("方案名称")
private String itemName;
@ApiModelProperty("描述")
@@ -29,72 +25,55 @@ public class WlRecordParam {
@EqualsAndHashCode(callSuper = true)
public static class Record extends WlRecordParam {
@ApiModelProperty("工程名称")
private String gcName;
@ApiModelProperty("测试项名称")
private String itemName;
@ApiModelProperty("测试项监测位置")
private String location;
@ApiModelProperty("统计间隔")
@NotNull(message = "统计间隔不可为空")
private Integer statisticalInterval;
@ApiModelProperty("电压等级")
@NotNull(message = "电压等级不可为空")
private String voltageLevel;
@ApiModelProperty("电压接线方式(星型、角型、V型)")
@NotNull(message = "电压接线方式不可为空")
private String volConType;
@ApiModelProperty("电流接线方式(正常、合成IB、合成IC)")
@NotNull(message = "电流接线方式不可为空")
private String curConSel;
@ApiModelProperty("基准短路容量（MVA）")
@NotNull(message = "基准短路容量不可为空")
private Float capacitySscb;
@ApiModelProperty("最小短路容量（MVA）")
@NotNull(message = "最小短路容量不可为空")
private Float capacitySscmin;
@ApiModelProperty("供电设备容量（MVA）")
@NotNull(message = "供电设备容量不可为空")
private Float capacitySt;
@ApiModelProperty("用户协议容量（MVA）")
@NotNull(message = "用户协议容量不可为空")
private Float capacitySi;
@ApiModelProperty("PT变比")
@NotNull(message = "PT变比不可为空")
private Integer pt;
@ApiModelProperty("CT变比")
@NotNull(message = "CT变比不可为空")
private Integer ct;
@ApiModelProperty("测试项监测位置")
@NotNull(message = "测试项监测位置不可为空")
private String location;
@ApiModelProperty("电压等级")
private String voltageLevel;
@ApiModelProperty("数据类型(0：方案 1：测试项)")
@NotNull(message = "数据类型不可为空")
private Integer type;
@ApiModelProperty("基准短路容量（MVA）")
private Float capacitySscb;
@ApiModelProperty("状态（0：删除 1：正常）")
@NotNull(message = "状态不可为空")
private Integer state;
@ApiModelProperty("最小短路容量（MVA）")
private Float capacitySscmin;
@ApiModelProperty("测试项集合ID")
@ApiModelProperty("供电设备容量（MVA）")
private Float capacitySt;
@ApiModelProperty("用户协议容量（MVA）")
private Float capacitySi;
@ApiModelProperty("电压接线方式(星型、角型、V型)")
private String volConType;
@ApiModelProperty("基础数据集合ID")
private List<String> list;
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class UpdateRecord extends Record {
@ApiModelProperty("id")
@NotNull(message = "id")
private String id;
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class AddRecord extends WlRecordParam {
@ApiModelProperty("records")
private List<Record> records;
}
}

26
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java
View File

@@ -1,5 +1,6 @@
package com.njcn.csdevice.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Getter;
@@ -118,7 +119,8 @@ public class WlRecord extends BaseEntity {
private String location;
/**
* 数据类型(0：方案 1：测试项)
* 数据类型(0：方案 1：测试项)‘
* 0 测试项 1基础数据
*/
private Integer type;
@@ -130,27 +132,7 @@ public class WlRecord extends BaseEntity {
/**
* 描述
*/
@TableField(value = "`describe`")
private String describe;
/**
* 创建用户
*/
private String createBy;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}

41
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordPageVo.java Normal file
View File

@@ -0,0 +1,41 @@
package com.njcn.csdevice.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 类的介绍： 测试项详情表
*
* @author xuyang
* @version 1.0.0
* @createTime 2024/4/1 20:10
*/
@Data
public class RecordPageVo {
@ApiModelProperty("基础数据id")
private String id;
@ApiModelProperty("设备名称")
private String devName;
@ApiModelProperty("设备MAC")
private String devMac;
@ApiModelProperty("网络设备ID")
private String devNdId;
@ApiModelProperty("监测点名称(线路号)")
private String lineName;
@ApiModelProperty("数据起始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty("数据结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
}

22
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordTreeVo.java
View File

@@ -3,8 +3,6 @@ package com.njcn.csdevice.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -18,35 +16,23 @@ import java.util.List;
public class RecordTreeVo {
@ApiModelProperty("方案id")
private String schemeId;
private String id;
@ApiModelProperty("方案名称")
private String name;
@ApiModelProperty("下层数据")
@ApiModelProperty("测试项数据")
private List<Children> children;
@Data
@EqualsAndHashCode(callSuper = true)
public static class Children extends RecordTreeVo {
@ApiModelProperty("id")
private String id;
@ApiModelProperty("名称")
private String recordName;
@ApiModelProperty("设备MAC")
private String devMac;
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("测试项开始时间")
private LocalDateTime startTime;
private String startTime;
@ApiModelProperty("测试项结束时间")
private LocalDateTime endTime;
private String endTime;
}
}

22
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java
View File

@@ -1,8 +1,8 @@
package com.njcn.csdevice.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
@@ -19,29 +19,19 @@ public class RecordVo {
private String id;
@ApiModelProperty("测试项名称")
private String recordName;
@ApiModelProperty("设备名称")
private String devName;
@ApiModelProperty("设备MAC")
private String devMac;
@ApiModelProperty("监测点名称")
private String lineName;
private String itemName;
@ApiModelProperty("数据起始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty("数据结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty("测试位置")
private String location;
@ApiModelProperty("数据类型")
private Integer type;
@ApiModelProperty("统计间隔")
private Integer statisticalInterval;
@@ -51,7 +41,7 @@ public class RecordVo {
@ApiModelProperty("CT变比")
private Integer ct;
@ApiModelProperty("CT变比")
@ApiModelProperty("电压等级")
private String voltageLevel;
@ApiModelProperty("基准短路容量")
@@ -69,6 +59,4 @@ public class RecordVo {
@ApiModelProperty("电压接线方式")
private String volConType;
@ApiModelProperty("电流接线方式")
private String curConSel;
}