合并代码
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
package com.njcn.harmonic.pojo.param;
|
||||
|
||||
import com.njcn.common.pojo.dto.SimpleDTO;
|
||||
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
|
||||
import com.njcn.harmonic.constant.HarmonicValidMessage;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/10/13 9:46【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(value="com-njcn-harmonic-pojo-po-PollutionSubstationQuryParam",description = "污染指标查询参数")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class PollutionSubstationQuryParam extends DeviceInfoParam {
|
||||
|
||||
@ApiModelProperty("污区图统计类型,根据Pollution_Statis查询码表接口获取所有类型选择一个即可")
|
||||
@NotNull(message = HarmonicValidMessage.DATA_NOT_BLANK)
|
||||
private SimpleDTO pollutionStatis;
|
||||
|
||||
@ApiModelProperty("时间 格式:(yyyy-MM)")
|
||||
@NotNull(message = HarmonicValidMessage.DATA_NOT_BLANK)
|
||||
private String localDate;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/10/10 19:59【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
/**
|
||||
* 谐波畸变率排名
|
||||
*/
|
||||
@ApiModel(value="com-njcn-harmonic-pojo-po-RMpVThd")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "r_mp_v_thd")
|
||||
public class RMpVThd implements Serializable {
|
||||
/**
|
||||
* 监测点ID
|
||||
*/
|
||||
@TableField(value = "measurement_point_id")
|
||||
@ApiModelProperty(value="监测点ID")
|
||||
private String measurementPointId;
|
||||
|
||||
/**
|
||||
* 排名类型,字典表(1年 2季度 3月份 4周 5日)
|
||||
*/
|
||||
@TableField(value = "data_type")
|
||||
@ApiModelProperty(value="排名类型,字典表(1年 2季度 3月份 4周 5日)")
|
||||
private String dataType;
|
||||
|
||||
/**
|
||||
* 时间
|
||||
*/
|
||||
@TableField(value = "data_date")
|
||||
@ApiModelProperty(value="时间")
|
||||
private Date dataDate;
|
||||
|
||||
/**
|
||||
* 谐波畸变率
|
||||
*/
|
||||
@TableField(value = "v_thd")
|
||||
@ApiModelProperty(value="谐波畸变率")
|
||||
private Double vThd;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* (RStatHarmonicOrgD)实体类
|
||||
*
|
||||
* @author qijian
|
||||
* @since 2022-10-09 11:00:09
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_harmonic_org_d")
|
||||
public class RStatHarmonicOrgD implements Serializable {
|
||||
private static final long serialVersionUID = -42929641369158167L;
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private String orgNo;
|
||||
/**
|
||||
* 生成数据的时间,每日统计一次
|
||||
*/
|
||||
private Date dataDate;
|
||||
/**
|
||||
* 稳态指标类型Id,字典表ID
|
||||
*/
|
||||
private String harmonicType;
|
||||
/**
|
||||
* 超标监测点数(监测点指标统计明细日表 统计)
|
||||
*/
|
||||
private Integer overLimitMeasurementAverage;
|
||||
/**
|
||||
* 超标监测点数(监测点指标统计明细日表 统计)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAverage;
|
||||
/**
|
||||
* 数据类型,字典表(01:主网测点 02:配网测点)
|
||||
*/
|
||||
private String dataType;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* (RStatHarmonicOrgM)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-10-09 11:38:21
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_harmonic_org_m")
|
||||
public class RStatHarmonicOrgM implements Serializable {
|
||||
private static final long serialVersionUID = -57834557125584612L;
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private String orgNo;
|
||||
/**
|
||||
* 生成数据的时间,每月统计一次
|
||||
*/
|
||||
private Date dataDate;
|
||||
/**
|
||||
* 稳态指标类型Id,字典表ID
|
||||
*/
|
||||
private String harmonicType;
|
||||
/**
|
||||
* 日均超标监测点数(根据 日表的超标监测点数 取平均值)
|
||||
*/
|
||||
private Integer overLimitMeasurementAverage;
|
||||
/**
|
||||
* 累计超标监测点数(监测点指标统计明细日表 统计)
|
||||
*/
|
||||
private Integer overLimitMeasurementAccrued;
|
||||
/**
|
||||
* 累计超标天数(根据 日表的超标监测点数 求和)
|
||||
*/
|
||||
private Integer overDay;
|
||||
/**
|
||||
* 日均超标监测点数占比(根据 日表的超标监测点数占比 取平均值)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAverage;
|
||||
/**
|
||||
* 累计超标监测点数占比(此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAccrued;
|
||||
/**
|
||||
* 数据类型,字典表(01:主网测点 02:配网测点)
|
||||
*/
|
||||
private String dataType;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* (RStatHarmonicOrgQ)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-10-09 11:38:30
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_harmonic_org_q")
|
||||
public class RStatHarmonicOrgQ implements Serializable {
|
||||
private static final long serialVersionUID = -43036071975463523L;
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private String orgNo;
|
||||
/**
|
||||
* 生成数据的时间,每季度统计一次
|
||||
*/
|
||||
private Date dataDate;
|
||||
/**
|
||||
* 稳态指标类型Id,字典表ID
|
||||
*/
|
||||
private String harmonicType;
|
||||
/**
|
||||
* 日均超标监测点数(根据 日表的超标监测点数 取平均值)
|
||||
*/
|
||||
private Integer overLimitMeasurementAverage;
|
||||
/**
|
||||
* 累计超标监测点数(监测点指标统计明细日表 统计)
|
||||
*/
|
||||
private Integer overLimitMeasurementAccrued;
|
||||
/**
|
||||
* 平均超标天数(月表的累计超标天数之和/月表的累计超标监测点数之和)
|
||||
*/
|
||||
private Float averageOverDay;
|
||||
/**
|
||||
* 日均超标监测点数占比(根据 日表的超标监测点数占比 取平均值)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAverage;
|
||||
/**
|
||||
* 累计超标监测点数占比(此表的累计超标监测点数/区域统计表中的区域分类统计季表中的累计有效接入监测点数)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAccrued;
|
||||
/**
|
||||
* 数据类型,字典表(01:主网测点 02:配网测点)
|
||||
*/
|
||||
private String dataType;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* (RStatHarmonicOrgY)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2022-10-09 11:38:46
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_harmonic_org_y")
|
||||
public class RStatHarmonicOrgY implements Serializable {
|
||||
private static final long serialVersionUID = 562563173347880887L;
|
||||
/**
|
||||
* 单位ID
|
||||
*/
|
||||
private String orgNo;
|
||||
/**
|
||||
* 生成数据的时间,每季度统计一次
|
||||
*/
|
||||
private Date dataDate;
|
||||
/**
|
||||
* 稳态指标类型Id,字典表ID
|
||||
*/
|
||||
private String harmonicType;
|
||||
/**
|
||||
* 日均超标监测点数(根据 日表的超标监测点数 取平均值)
|
||||
*/
|
||||
private Integer overLimitMeasurementAverage;
|
||||
/**
|
||||
* 累计超标监测点数(监测点指标统计明细日表 统计)
|
||||
*/
|
||||
private Integer overLimitMeasurementAccrued;
|
||||
/**
|
||||
* 平均超标天数(月表的累计超标天数之和/月表的累计超标监测点数之和)
|
||||
*/
|
||||
private Float averageOverDay;
|
||||
/**
|
||||
* 日均超标监测点数占比(根据 日表的超标监测点数占比 取平均值)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAverage;
|
||||
/**
|
||||
* 累计超标监测点数占比(此表的累计超标监测点数/区域统计表中的区域分类统计季表中的累计有效接入监测点数)
|
||||
*/
|
||||
private Float overLimitMeasurementRatioAccrued;
|
||||
/**
|
||||
* 数据类型,字典表(01:主网测点 02:配网测点)
|
||||
*/
|
||||
private String dataType;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.njcn.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/10/13 13:58【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* 变电站污区图统计月表
|
||||
*/
|
||||
@ApiModel(value = "com-njcn-harmonic-pojo-po-RStatPollutionSubstationM")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "r_stat_pollution_substation_m")
|
||||
public class RStatPollutionSubstationM implements Serializable {
|
||||
/**
|
||||
* 变电站id
|
||||
*/
|
||||
@TableField(value = "substation_id")
|
||||
@ApiModelProperty(value = "变电站id")
|
||||
private String substationId;
|
||||
|
||||
/**
|
||||
* 时间
|
||||
*/
|
||||
@TableField(value = "data_date")
|
||||
@ApiModelProperty(value = "时间")
|
||||
private Date dataDate;
|
||||
|
||||
/**
|
||||
* 污区图统计类型
|
||||
*/
|
||||
@TableField(value = "pollution_type")
|
||||
@ApiModelProperty(value = "污区图统计类型")
|
||||
private String pollutionType;
|
||||
|
||||
/**
|
||||
* 统计值
|
||||
*/
|
||||
@TableField(value = "value")
|
||||
@ApiModelProperty(value = "统计值")
|
||||
private Double value;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@@ -27,7 +27,7 @@ public class HistoryHarmOverLimitVO implements Serializable {
|
||||
@ApiModelProperty("指标名称")
|
||||
private String targetName;
|
||||
|
||||
@ApiModelProperty("指标类型")
|
||||
@ApiModelProperty("指标类型:12-电压偏差;13-三相电压不平衡度;15-电压总谐波畸变率;22-负序电流;30-频率;40-谐波电压含有率;43-谐波电流幅值;46-间谐波电压含有率;61-长时闪变")
|
||||
private String targetCode;
|
||||
|
||||
@ApiModelProperty("统计方式")
|
||||
@@ -43,22 +43,22 @@ public class HistoryHarmOverLimitVO implements Serializable {
|
||||
private String scale;
|
||||
|
||||
@ApiModelProperty("时间")
|
||||
private String time;
|
||||
private String timeId;
|
||||
|
||||
@ApiModelProperty("单位")
|
||||
private String unit;
|
||||
|
||||
@ApiModelProperty("最大值")
|
||||
private Float maxValue;
|
||||
private Float maxData;
|
||||
|
||||
@ApiModelProperty("最小值")
|
||||
private Float minValue;
|
||||
private Float minData;
|
||||
|
||||
@ApiModelProperty("平均值")
|
||||
private Float avgValue;
|
||||
private Float avgData;
|
||||
|
||||
@ApiModelProperty("95概率值")
|
||||
private Float cp95Value;
|
||||
private Float cp95Data;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/10/13 9:46【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(value="com-njcn-harmonic-pojo-vo-PollutionSubstationVO",description = "污染指标查询参数")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class PollutionSubstationVO {
|
||||
|
||||
|
||||
@ApiModelProperty("变电站id")
|
||||
private String substationId;
|
||||
|
||||
@ApiModelProperty("变电站名称")
|
||||
private String substationName;
|
||||
|
||||
@ApiModelProperty("变电站经度")
|
||||
private BigDecimal longitude;
|
||||
|
||||
@ApiModelProperty("变电站纬度")
|
||||
private BigDecimal latitude;
|
||||
|
||||
@ApiModelProperty("污区图统计类型")
|
||||
private String pollutionStatis;
|
||||
|
||||
@ApiModelProperty("污染指标值")
|
||||
private Double pollutionData = -1.0;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/10/10 20:24【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(value="com-njcn-harmonic-pojo-vo-RMpVThdVO")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class RMpVThdVO {
|
||||
|
||||
|
||||
@ApiModelProperty(value="监测点ID")
|
||||
private String measurementPointId;
|
||||
|
||||
@ApiModelProperty(value="监测点名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 排名类型,字典表(0日,1月,2季,3年)
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value="排名类型,字典表(1年 2季度 3月份 4周 5日)")
|
||||
private String dataType;
|
||||
|
||||
/**
|
||||
* 时间
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value="时间")
|
||||
private Date dataDate;
|
||||
|
||||
/**
|
||||
* 谐波畸变率
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value="谐波畸变率")
|
||||
private Double vThd;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.njcn.harmonic.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author qijian
|
||||
* @version 1.0.0
|
||||
* @createTime 2022/10/9 - 11:09
|
||||
*/
|
||||
@Data
|
||||
public class StatHarmonicOrgVO {
|
||||
|
||||
@ApiModelProperty(name = "id", value = "id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(name = "name", value = "单位名")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty(name = "ratio", value = "监测点占比")
|
||||
private Float ratio;
|
||||
|
||||
@ApiModelProperty(name = "count", value = "监测点数")
|
||||
private Integer count;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user