合并代码
This commit is contained in:
@@ -38,6 +38,11 @@
|
||||
<artifactId>common-poi</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.njcn</groupId>
|
||||
<artifactId>user-api</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.njcn</groupId>
|
||||
<artifactId>pms-device-api</artifactId>
|
||||
|
||||
@@ -39,4 +39,11 @@ public class PowerQualityParam extends StatisticsBizBaseParam {
|
||||
@ApiModelProperty(value = "监测点类别",required = true)
|
||||
private List<String> monitorSort;;
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class PowerQualityInfoParam extends PowerQualityParam{
|
||||
|
||||
@ApiModelProperty(value = "监测点标签",required = true)
|
||||
private String monitorTag;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,52 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import java.time.LocalDate;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 电气化铁路_详细信息表(专项分析)
|
||||
* </p>
|
||||
*
|
||||
* @author wr
|
||||
* @since 2022-12-09
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@TableName("r_mp_railway_traction_detail")
|
||||
@ApiModel(value="RMpRailwayTractionDetail对象", description="电气化铁路_详细信息表(专项分析)")
|
||||
public class RMpRailwayTractionDetail implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "牵引站id")
|
||||
@TableId(value = "traction_station_id", type = IdType.ASSIGN_ID)
|
||||
private String tractionStationId;
|
||||
|
||||
@ApiModelProperty(value = "统计时间")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@ApiModelProperty(value = "有功功率")
|
||||
private Float activePowerTimes;
|
||||
|
||||
@ApiModelProperty(value = "谐波电压")
|
||||
private Integer vTimes;
|
||||
|
||||
@ApiModelProperty(value = "谐波电流")
|
||||
private Integer iTimes;
|
||||
|
||||
@ApiModelProperty(value = "电压不平衡")
|
||||
private Integer unbalanceTimes;
|
||||
|
||||
@ApiModelProperty(value = "负序电流")
|
||||
private Integer iNegTimes;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import java.time.LocalDate;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.io.Serializable;
|
||||
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
@@ -24,176 +24,343 @@ import lombok.EqualsAndHashCode;
|
||||
@ApiModel(value="RMpSurplusHarmonicDetailD对象", description="")
|
||||
public class RMpSurplusHarmonicDetailD implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "监测点ID")
|
||||
@TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
|
||||
/**
|
||||
* 监测点ID
|
||||
*/
|
||||
@MppMultiId(value = "measurement_point_id")
|
||||
private String measurementPointId;
|
||||
|
||||
@ApiModelProperty(value = "生成数据的时间,每月统计一次")
|
||||
/**
|
||||
* 生成数据的时间,每月统计一次
|
||||
*/
|
||||
@MppMultiId(value = "data_date")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@ApiModelProperty(value = "闪变发生次数")
|
||||
/**
|
||||
* 闪变发生次数
|
||||
*/
|
||||
@TableField(value = "flicker_times")
|
||||
private Integer flickerTimes;
|
||||
|
||||
@ApiModelProperty(value = "闪变是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 闪变是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_flicker")
|
||||
private Integer isFlicker;
|
||||
|
||||
@ApiModelProperty(value = "间谐波电压超标次数")
|
||||
/**
|
||||
* 间谐波电压超标次数
|
||||
*/
|
||||
@TableField(value = "inuharm_times")
|
||||
private Integer inuharmTimes;
|
||||
|
||||
@ApiModelProperty(value = "间谐波电压是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 间谐波电压是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm")
|
||||
private Integer isInuharm;
|
||||
|
||||
@ApiModelProperty(value = "0.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 0.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_1")
|
||||
private Integer isInuharm1;
|
||||
|
||||
@ApiModelProperty(value = "1.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 1.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_2")
|
||||
private Integer isInuharm2;
|
||||
|
||||
@ApiModelProperty(value = "2.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 2.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_3")
|
||||
private Integer isInuharm3;
|
||||
|
||||
@ApiModelProperty(value = "3.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 3.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_4")
|
||||
private Integer isInuharm4;
|
||||
|
||||
@ApiModelProperty(value = "4.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 4.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_5")
|
||||
private Integer isInuharm5;
|
||||
|
||||
@ApiModelProperty(value = "5.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 5.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_6")
|
||||
private Integer isInuharm6;
|
||||
|
||||
@ApiModelProperty(value = "6.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 6.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_7")
|
||||
private Integer isInuharm7;
|
||||
|
||||
@ApiModelProperty(value = "7.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 7.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_8")
|
||||
private Integer isInuharm8;
|
||||
|
||||
@ApiModelProperty(value = "8.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 8.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_9")
|
||||
private Integer isInuharm9;
|
||||
|
||||
@ApiModelProperty(value = "9.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 9.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_10")
|
||||
private Integer isInuharm10;
|
||||
|
||||
@ApiModelProperty(value = "10.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 10.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_11")
|
||||
private Integer isInuharm11;
|
||||
|
||||
@ApiModelProperty(value = "11.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 11.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_12")
|
||||
private Integer isInuharm12;
|
||||
|
||||
@ApiModelProperty(value = "12.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 12.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_13")
|
||||
private Integer isInuharm13;
|
||||
|
||||
@ApiModelProperty(value = "13.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 13.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_14")
|
||||
private Integer isInuharm14;
|
||||
|
||||
@ApiModelProperty(value = "14.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 14.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_15")
|
||||
private Integer isInuharm15;
|
||||
|
||||
@ApiModelProperty(value = "15.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 15.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_16")
|
||||
private Integer isInuharm16;
|
||||
|
||||
@ApiModelProperty(value = "16.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 16.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_17")
|
||||
private Integer isInuharm17;
|
||||
|
||||
@ApiModelProperty(value = "17.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 17.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_18")
|
||||
private Integer isInuharm18;
|
||||
|
||||
@ApiModelProperty(value = "18.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 18.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_19")
|
||||
private Integer isInuharm19;
|
||||
|
||||
@ApiModelProperty(value = "19.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 19.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_20")
|
||||
private Integer isInuharm20;
|
||||
|
||||
@ApiModelProperty(value = "20.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 20.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_21")
|
||||
private Integer isInuharm21;
|
||||
|
||||
@ApiModelProperty(value = "21.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 21.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_22")
|
||||
private Integer isInuharm22;
|
||||
|
||||
@ApiModelProperty(value = "22.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 22.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_23")
|
||||
private Integer isInuharm23;
|
||||
|
||||
@ApiModelProperty(value = "23.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 23.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_24")
|
||||
private Integer isInuharm24;
|
||||
|
||||
@ApiModelProperty(value = "24.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 24.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_25")
|
||||
private Integer isInuharm25;
|
||||
|
||||
@ApiModelProperty(value = "25.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 25.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_26")
|
||||
private Integer isInuharm26;
|
||||
|
||||
@ApiModelProperty(value = "26.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 26.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_27")
|
||||
private Integer isInuharm27;
|
||||
|
||||
@ApiModelProperty(value = "27.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 27.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_28")
|
||||
private Integer isInuharm28;
|
||||
|
||||
@ApiModelProperty(value = "28.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 28.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_29")
|
||||
private Integer isInuharm29;
|
||||
|
||||
@ApiModelProperty(value = "29.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 29.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_30")
|
||||
private Integer isInuharm30;
|
||||
|
||||
@ApiModelProperty(value = "30.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 30.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_31")
|
||||
private Integer isInuharm31;
|
||||
|
||||
@ApiModelProperty(value = "31.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 31.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_32")
|
||||
private Integer isInuharm32;
|
||||
|
||||
@ApiModelProperty(value = "32.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 32.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_33")
|
||||
private Integer isInuharm33;
|
||||
|
||||
@ApiModelProperty(value = "33.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 33.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_34")
|
||||
private Integer isInuharm34;
|
||||
|
||||
@ApiModelProperty(value = "34.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 34.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_35")
|
||||
private Integer isInuharm35;
|
||||
|
||||
@ApiModelProperty(value = "35.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 35.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_36")
|
||||
private Integer isInuharm36;
|
||||
|
||||
@ApiModelProperty(value = "36.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 36.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_37")
|
||||
private Integer isInuharm37;
|
||||
|
||||
@ApiModelProperty(value = "37.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 37.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_38")
|
||||
private Integer isInuharm38;
|
||||
|
||||
@ApiModelProperty(value = "38.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 38.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_39")
|
||||
private Integer isInuharm39;
|
||||
|
||||
@ApiModelProperty(value = "39.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 39.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_40")
|
||||
private Integer isInuharm40;
|
||||
|
||||
@ApiModelProperty(value = "40.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 40.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_41")
|
||||
private Integer isInuharm41;
|
||||
|
||||
@ApiModelProperty(value = "41.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 41.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_42")
|
||||
private Integer isInuharm42;
|
||||
|
||||
@ApiModelProperty(value = "42.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 42.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_43")
|
||||
private Integer isInuharm43;
|
||||
|
||||
@ApiModelProperty(value = "43.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 43.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_44")
|
||||
private Integer isInuharm44;
|
||||
|
||||
@ApiModelProperty(value = "44.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 44.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_45")
|
||||
private Integer isInuharm45;
|
||||
|
||||
@ApiModelProperty(value = "45.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 45.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_46")
|
||||
private Integer isInuharm46;
|
||||
|
||||
@ApiModelProperty(value = "46.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 46.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_47")
|
||||
private Integer isInuharm47;
|
||||
|
||||
@ApiModelProperty(value = "47.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 47.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_48")
|
||||
private Integer isInuharm48;
|
||||
|
||||
@ApiModelProperty(value = "48.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 48.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_49")
|
||||
private Integer isInuharm49;
|
||||
|
||||
@ApiModelProperty(value = "49.5次谐波电流含有率是否超标(0:否 1:是)")
|
||||
/**
|
||||
* 49.5次谐波电流含有率是否超标(0:否 1:是)
|
||||
*/
|
||||
@TableField(value = "is_inuharm_50")
|
||||
private Integer isInuharm50;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,9 @@ public class RMpWpPowerDetailM implements Serializable {
|
||||
@ApiModelProperty(value = "统计时间")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@ApiModelProperty(value = "监测点标签")
|
||||
private String monitorTag;
|
||||
|
||||
@ApiModelProperty(value = "负载率(平均值)")
|
||||
private Float loadRateAvg;
|
||||
|
||||
@@ -96,6 +99,17 @@ public class RMpWpPowerDetailM implements Serializable {
|
||||
@ApiModelProperty(value = "B相有功功率平均值")
|
||||
private Float bpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率95值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率99值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率平均值")
|
||||
private Float cpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "A相基波电压")
|
||||
private Float apFundamentalVoltage;
|
||||
|
||||
|
||||
@@ -31,6 +31,10 @@ public class RMpWpPowerDetailQ implements Serializable {
|
||||
@TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
|
||||
private String measurementPointId;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "监测点标签")
|
||||
private String monitorTag;
|
||||
|
||||
@ApiModelProperty(value = "统计时间")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@@ -96,6 +100,17 @@ public class RMpWpPowerDetailQ implements Serializable {
|
||||
@ApiModelProperty(value = "B相有功功率平均值")
|
||||
private Float bpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率95值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率99值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率平均值")
|
||||
private Float cpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "A相基波电压")
|
||||
private Float apFundamentalVoltage;
|
||||
|
||||
|
||||
@@ -34,6 +34,9 @@ public class RMpWpPowerDetailY implements Serializable {
|
||||
@ApiModelProperty(value = "统计时间")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@ApiModelProperty(value = "监测点标签")
|
||||
private String monitorTag;
|
||||
|
||||
@ApiModelProperty(value = "负载率(平均值)")
|
||||
private Float loadRateAvg;
|
||||
|
||||
@@ -96,6 +99,17 @@ public class RMpWpPowerDetailY implements Serializable {
|
||||
@ApiModelProperty(value = "B相有功功率平均值")
|
||||
private Float bpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率95值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率99值")
|
||||
@TableField(value = "cp_active_power_99")
|
||||
private Float cpActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率平均值")
|
||||
private Float cpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "A相基波电压")
|
||||
private Float apFundamentalVoltage;
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <功能描述>
|
||||
*
|
||||
* @author wr
|
||||
* @createTime: 2022-12-13
|
||||
*/
|
||||
@Data
|
||||
public class DeptLevelVO implements Serializable {
|
||||
|
||||
private String id;
|
||||
private String pid;
|
||||
private String pids;
|
||||
private String name;
|
||||
private String code;
|
||||
private Integer specialType;
|
||||
private String area;
|
||||
private String remark;
|
||||
private Integer sort;
|
||||
private Integer type;
|
||||
|
||||
//子孙部门
|
||||
List<DeptLevelVO> deptList;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 电气化铁路_详细信息表(专项分析)
|
||||
* </p>
|
||||
*
|
||||
* @author wr
|
||||
* @since 2022-12-09
|
||||
*/
|
||||
@Data
|
||||
@ApiModel("电气化铁路实体类")
|
||||
public class RMpRailwayTractionDetailVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "牵引站id")
|
||||
private String tractionStationId;
|
||||
|
||||
@ApiModelProperty(value = "牵引站名称")
|
||||
private String tractionStationName;
|
||||
|
||||
@ApiModelProperty(value = "公司名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "电铁路线")
|
||||
private String railwayLineName;
|
||||
|
||||
@ApiModelProperty(value = "铁路类型")
|
||||
private Integer railwayType;
|
||||
|
||||
@ApiModelProperty(value = "电压等级")
|
||||
private String voltageLevel;
|
||||
|
||||
@ApiModelProperty(value = "牵引站变电容量")
|
||||
private Double ratedCapacity;
|
||||
|
||||
@ApiModelProperty(value = "统计时间")
|
||||
private LocalDate dataDate;
|
||||
|
||||
@ApiModelProperty(value = "有功功率")
|
||||
private Float activePowerTimes;
|
||||
|
||||
@ApiModelProperty(value = "谐波电压")
|
||||
private Float vTimes;
|
||||
|
||||
@ApiModelProperty(value = "谐波电流")
|
||||
private Float iTimes;
|
||||
|
||||
@ApiModelProperty(value = "电压不平衡")
|
||||
private Float unbalanceTimes;
|
||||
|
||||
@ApiModelProperty(value = "负序电流")
|
||||
private Float iNegTimes;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 专项分析-风电场-详细数据表
|
||||
*
|
||||
* @author wr
|
||||
* @date 2022-11-30
|
||||
*
|
||||
*/
|
||||
@Data
|
||||
public class RMpWpPowerDetailVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "部门名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "监测点id")
|
||||
private String measurementPointId;
|
||||
|
||||
@ApiModelProperty(value = "监测点名称")
|
||||
private String measurementPointName;
|
||||
|
||||
@ApiModelProperty(value = "负载率(平均值)")
|
||||
private Float loadRateAvg;
|
||||
|
||||
@ApiModelProperty(value = "负载率(95%值)")
|
||||
private Float loadRate95;
|
||||
|
||||
@ApiModelProperty(value = "负载率(99%值)")
|
||||
private Float loadRate99;
|
||||
|
||||
@ApiModelProperty(value = "谐波电压超标情况(0:否 1:是)")
|
||||
private Integer isV;
|
||||
|
||||
@ApiModelProperty(value = "谐波电流超标情况(0:否 1:是)")
|
||||
private Integer isI;
|
||||
|
||||
@ApiModelProperty(value = "电压不平衡度超标情况(0:否 1:是)")
|
||||
private Integer isUnbalance;
|
||||
|
||||
@ApiModelProperty(value = "负序电流超标情况(0:否 1:是)")
|
||||
private Integer isINeg;
|
||||
|
||||
@ApiModelProperty(value = "谐波电压超标次数")
|
||||
private Integer vTimes;
|
||||
|
||||
@ApiModelProperty(value = "谐波电流超标次数")
|
||||
private Integer iTimes;
|
||||
|
||||
@ApiModelProperty(value = "总有功功率99值")
|
||||
private Float totalActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "总有功功率95值")
|
||||
private Float totalActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "总有功功率平均值")
|
||||
private Float totalActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "A相有功功率95值")
|
||||
private Float apActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "A相有功功率99值")
|
||||
private Float apActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "A相有功功率平均值")
|
||||
private Float apActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "B相有功功率95值")
|
||||
private Float bpActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "B相有功功率99值")
|
||||
private Float bpActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "B相有功功率平均值")
|
||||
private Float bpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率95值")
|
||||
private Float cpActivePower95;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率99值")
|
||||
private Float cpActivePower99;
|
||||
|
||||
@ApiModelProperty(value = "C相有功功率平均值")
|
||||
private Float cpActivePowerAvg;
|
||||
|
||||
@ApiModelProperty(value = "A相基波电压")
|
||||
private Float apFundamentalVoltage;
|
||||
|
||||
@ApiModelProperty(value = "B相基波电压")
|
||||
private Float bpFundamentalVoltage;
|
||||
|
||||
@ApiModelProperty(value = "C相基波电压")
|
||||
private Float cpFundamentalVoltage;
|
||||
|
||||
@ApiModelProperty(value = "负序电压不平衡度")
|
||||
private Float negativeSequenceVoltageUnbalance;
|
||||
|
||||
@ApiModelProperty(value = "电网暂降次数")
|
||||
private Integer gridDipNum;
|
||||
|
||||
@ApiModelProperty(value = "脱网事件次数")
|
||||
private Integer offlineNum;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author rui.wu
|
||||
* @since 2022-10-09
|
||||
*/
|
||||
@Data
|
||||
public class RStatHarmonicVO {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "单位id")
|
||||
private String orgNo;
|
||||
|
||||
@ApiModelProperty(value = "稳态指标")
|
||||
private String harmonicType;
|
||||
|
||||
@ApiModelProperty(value = "日均超标监测点数")
|
||||
private Integer overLimitMeasurementAverage;
|
||||
|
||||
@ApiModelProperty(value = "累计超标监测点数")
|
||||
private Integer overLimitMeasurementAccrued;
|
||||
|
||||
@ApiModelProperty(value = "累计超标天数")
|
||||
private Integer overDay;
|
||||
|
||||
@ApiModelProperty(value = "日均超标监测点数占比")
|
||||
private Float overLimitMeasurementRatioAverage;
|
||||
|
||||
@ApiModelProperty(value = "累计超标监测点数占比")
|
||||
private Float overLimitMeasurementRatioAccrued;
|
||||
|
||||
@ApiModelProperty(value = "平均超标天数")
|
||||
private Float averageOverDay;
|
||||
}
|
||||
@@ -27,4 +27,6 @@ public class ReportTemplateVO extends BaseEntity {
|
||||
|
||||
private String deptName;
|
||||
|
||||
private String reportForm;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
package com.njcn.harmonic.utils;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.njcn.harmonic.pojo.vo.DeptLevelVO;
|
||||
import com.njcn.user.pojo.dto.DeptDTO;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <功能描述>
|
||||
*
|
||||
* @author wr
|
||||
* @createTime: 2022-12-14
|
||||
*/
|
||||
public class DeptUtil {
|
||||
|
||||
/***
|
||||
* 获取层级部门信息(展示下级部门)
|
||||
* @param deptDTOList
|
||||
* @param deptId
|
||||
* @return
|
||||
*/
|
||||
public static List<DeptDTO> getDeptSubsetVOList(List<DeptDTO> deptDTOList, String deptId){
|
||||
//获取子部门
|
||||
List<DeptDTO> directDeptInfos = deptDTOList.stream()
|
||||
.filter(deptDTO -> deptDTO.getPid().equals(deptId))
|
||||
.collect(Collectors.toList());
|
||||
if (CollectionUtil.isEmpty(directDeptInfos)) {
|
||||
//没有直接子部门,获取当前部门所有信息
|
||||
List<DeptDTO> dept = deptDTOList.stream()
|
||||
.filter(deptDTO -> deptDTO.getId().equals(deptId))
|
||||
.collect(Collectors.toList());
|
||||
return dept;
|
||||
}
|
||||
return directDeptInfos;
|
||||
}
|
||||
|
||||
|
||||
/***
|
||||
* 获取层级部门信息(展示下级部门,但是数据是包含下部门的所有部门)
|
||||
* @param deptDTOList
|
||||
* @param deptId
|
||||
* @return
|
||||
*/
|
||||
public static List<DeptLevelVO> getDeptLevelVOList(List<DeptDTO> deptDTOList, String deptId){
|
||||
//获取子部门
|
||||
List<DeptDTO> directDeptInfos = deptDTOList.stream()
|
||||
.filter(deptDTO -> deptDTO.getPid().equals(deptId))
|
||||
.collect(Collectors.toList());
|
||||
List<DeptLevelVO> deptLevelVOS = new ArrayList<>();
|
||||
if (CollectionUtil.isEmpty(directDeptInfos)) {
|
||||
//没有直接子部门,获取当前部门所有信息
|
||||
List<DeptDTO> dept = deptDTOList.stream()
|
||||
.filter(deptDTO -> deptDTO.getId().equals(deptId))
|
||||
.collect(Collectors.toList());
|
||||
deptLevelVOS = BeanUtil.copyToList(dept, DeptLevelVO.class);
|
||||
}else{
|
||||
DeptLevelVO deptLevelVO;
|
||||
for (DeptDTO deptDTO : directDeptInfos) {
|
||||
//添加当前部门,添加当前部门下的子部门
|
||||
deptLevelVO = BeanUtil.copyProperties(deptDTO, DeptLevelVO.class);
|
||||
deptLevelVOS.add(deptLevelVO);
|
||||
|
||||
//筛选上级部门pids包含该id的所有部门
|
||||
List<DeptDTO> descendantDeptDTO = deptDTOList.stream()
|
||||
.filter(d -> d.getPids().contains(deptDTO.getId()))
|
||||
.collect(Collectors.toList());
|
||||
//获取当前部门
|
||||
List<DeptDTO> dept = deptDTOList.stream()
|
||||
.filter(dto -> dto.getId().equals(deptDTO.getId()))
|
||||
.collect(Collectors.toList());
|
||||
descendantDeptDTO.addAll(dept);
|
||||
List<DeptLevelVO> seedList = BeanUtil.copyToList(descendantDeptDTO, DeptLevelVO.class);
|
||||
deptLevelVO.setDeptList(seedList);
|
||||
}
|
||||
}
|
||||
return deptLevelVOS;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user