海南版本提交
This commit is contained in:
@@ -33,6 +33,11 @@ public enum AdvanceResponseEnum {
|
||||
EVENT_EMPTY("A0102","没有查询到未分析事件"),
|
||||
USER_NAME_EXIST("A0103","用户名已存在"),
|
||||
DATA_NOT_FOUND("A0104","数据缺失,请根据模版上传近两周数据"),
|
||||
DATA_UNDERRUN("A0104","数据量不足,请根据模版上传充足近两周数据"),
|
||||
DOCUMENT_FORMAT_ERROR("A0105","数据缺失,导入失败!请检查导入文档的格式是否正确"),
|
||||
USER_LOST("A0106","干扰源用户缺失")
|
||||
|
||||
|
||||
;
|
||||
|
||||
private final String code;
|
||||
|
||||
@@ -77,7 +77,62 @@ public enum CarryingCapacityEnum {
|
||||
I_INV_32("I_INV_32","0.026","32次典型谐波电流含有率"),
|
||||
I_INV_33("I_INV_33","0.033","33次典型谐波电流含有率"),
|
||||
I_INV_34("I_INV_34","0.018","34次典型谐波电流含有率"),
|
||||
I_INV_35("I_INV_35","0.072","35次典型谐波电流含有率");
|
||||
I_INV_35("I_INV_35","0.072","35次典型谐波电流含有率"),
|
||||
|
||||
//电弧炉谐波电流含有率
|
||||
EAF_I_2("EAF_I_2","0.6112","2次电弧炉谐波电流含有率"),
|
||||
EAF_I_3("EAF_I_3","0.68935","3次电弧炉谐波电流含有率"),
|
||||
EAF_I_4("EAF_I_4","0.9906","4次电弧炉谐波电流含有率"),
|
||||
EAF_I_5("EAF_I_5","6.9575","5次电弧炉谐波电流含有率"),
|
||||
EAF_I_6("EAF_I_6","0.5750","6次电弧炉谐波电流含有率"),
|
||||
EAF_I_7("EAF_I_7","3.2731","7次电弧炉谐波电流含有率"),
|
||||
EAF_I_8("EAF_I_8","0.4782","8次电弧炉谐波电流含有率"),
|
||||
EAF_I_9("EAF_I_9","0.5197","9次电弧炉谐波电流含有率"),
|
||||
EAF_I_10("EAF_I_10","0.6003","10次电弧炉谐波电流含有率"),
|
||||
EAF_I_11("EAF_I_11","4.5631","11次电弧炉谐波电流含有率"),
|
||||
EAF_I_12("EAF_I_12","0.5242","12次电弧炉谐波电流含有率"),
|
||||
EAF_I_13("EAF_I_13","2.9196","13次电弧炉谐波电流含有率"),
|
||||
EAF_I_14("EAF_I_14","0.5720","14次电弧炉谐波电流含有率"),
|
||||
EAF_I_15("EAF_I_15","0.5956","15次电弧炉谐波电流含有率"),
|
||||
EAF_I_16("EAF_I_16","0.8234","16次电弧炉谐波电流含有率"),
|
||||
EAF_I_17("EAF_I_17","5.4185","17次电弧炉谐波电流含有率"),
|
||||
EAF_I_18("EAF_I_18","0.8848","18次电弧炉谐波电流含有率"),
|
||||
EAF_I_19("EAF_I_19","2.3503","19次电弧炉谐波电流含有率"),
|
||||
EAF_I_20("EAF_I_20","0.6789","20次电弧炉谐波电流含有率"),
|
||||
|
||||
//充电桩谐波电流含有率
|
||||
CP_I_2("CP_I_2","5.00","2次电弧炉谐波电流含有率"),
|
||||
CP_I_3("CP_I_3","7.00","3次电弧炉谐波电流含有率"),
|
||||
CP_I_4("CP_I_4","4.00","4次电弧炉谐波电流含有率"),
|
||||
CP_I_5("CP_I_5","5.00","5次电弧炉谐波电流含有率"),
|
||||
CP_I_6("CP_I_6","4.00","6次电弧炉谐波电流含有率"),
|
||||
CP_I_7("CP_I_7","2.00","7次电弧炉谐波电流含有率"),
|
||||
CP_I_8("CP_I_8","2.00","8次电弧炉谐波电流含有率"),
|
||||
CP_I_9("CP_I_9","1.00","9次电弧炉谐波电流含有率"),
|
||||
CP_I_10("CP_I_10","1.50","10次电弧炉谐波电流含有率"),
|
||||
CP_I_11("CP_I_11","1.50","11次电弧炉谐波电流含有率"),
|
||||
CP_I_12("CP_I_12","0.50","12次电弧炉谐波电流含有率"),
|
||||
CP_I_13("CP_I_13","0.50","13次电弧炉谐波电流含有率"),
|
||||
CP_I_14("CP_I_14","0.00","14次电弧炉谐波电流含有率"),
|
||||
CP_I_15("CP_I_15","0.00","15次电弧炉谐波电流含有率"),
|
||||
CP_I_16("CP_I_16","0.00","16次电弧炉谐波电流含有率"),
|
||||
CP_I_17("CP_I_17","0.00","17次电弧炉谐波电流含有率"),
|
||||
CP_I_18("CP_I_18","0.00","18次电弧炉谐波电流含有率"),
|
||||
CP_I_19("CP_I_19","0.00","19次电弧炉谐波电流含有率"),
|
||||
CP_I_20("CP_I_20","0.00","20次电弧炉谐波电流含有率"),
|
||||
|
||||
//电气化铁路典型
|
||||
ER_I_3("ER_I_3","20.11","3次电弧炉谐波电流含有率"),
|
||||
ER_I_5("ER_I_5","10.69","5次电弧炉谐波电流含有率"),
|
||||
ER_I_7("ER_I_7","6.47","7次电弧炉谐波电流含有率"),
|
||||
ER_I_9("ER_I_9","3.76","9次电弧炉谐波电流含有率"),
|
||||
ER_I_11("ER_I_11","2.32","11次电弧炉谐波电流含有率"),
|
||||
ER_I_13("ER_I_13","1.55","13次电弧炉谐波电流含有率"),
|
||||
ER_I_15("ER_I_15","1.17","15次电弧炉谐波电流含有率"),
|
||||
ER_I_17("ER_I_17","0.95","17次电弧炉谐波电流含有率"),
|
||||
ER_I_19("ER_I_19","0.80","19次电弧炉谐波电流含有率"),
|
||||
|
||||
;
|
||||
/**
|
||||
* 字段code
|
||||
*/
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.excel;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.njcn.influx.utils.InstantDateSerializer;
|
||||
import com.njcn.influx.pojo.po.DataI;
|
||||
import lombok.Data;
|
||||
import org.influxdb.annotation.Column;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 类的介绍:
|
||||
@@ -18,8 +22,6 @@ import java.time.Instant;
|
||||
@Data
|
||||
public class CarryCapcityDataIEexcel {
|
||||
|
||||
@Column(name = "time")
|
||||
@JsonSerialize(using = InstantDateSerializer.class)
|
||||
@Excel(name = "时间",width = 30)
|
||||
private Instant time;
|
||||
|
||||
@@ -27,108 +29,396 @@ public class CarryCapcityDataIEexcel {
|
||||
@Excel(name = "监测点id",width = 30)
|
||||
private String lineId;
|
||||
|
||||
@Column(name = "phasic_type")
|
||||
@Excel(name = "项别",width = 30)
|
||||
private String phaseType;
|
||||
|
||||
@Column(name = "value_type")
|
||||
@Excel(name = "数据类型",width = 30)
|
||||
@Excel(name = "数据类型(CP95)",width = 30)
|
||||
private String valueType;
|
||||
|
||||
|
||||
@Column(name = "i_2")
|
||||
@Excel(name = "2次谐波幅值)",width = 30)
|
||||
private Double i2;
|
||||
@Excel(name = "A项2次谐波幅值",width = 15)
|
||||
private Double i2_a;
|
||||
|
||||
@Column(name = "i_3")
|
||||
@Excel(name = "3次谐波幅值)",width = 30)
|
||||
private Double i3;
|
||||
@Excel(name = "A项3次谐波幅值",width = 15)
|
||||
private Double i3_a;
|
||||
|
||||
@Column(name = "i_4")
|
||||
@Excel(name = "4次谐波幅值)",width = 30)
|
||||
private Double i4;
|
||||
@Excel(name = "A项4次谐波幅值",width = 15)
|
||||
private Double i4_a;
|
||||
|
||||
@Column(name = "i_5")
|
||||
@Excel(name = "5次谐波幅值)",width = 30)
|
||||
private Double i5;
|
||||
@Excel(name = "A项5次谐波幅值",width = 15)
|
||||
private Double i5_a;
|
||||
|
||||
@Column(name = "i_6")
|
||||
@Excel(name = "6次谐波幅值)",width = 30)
|
||||
private Double i6;
|
||||
@Excel(name = "A项6次谐波幅值",width = 15)
|
||||
private Double i6_a;
|
||||
|
||||
@Column(name = "i_7")
|
||||
@Excel(name = "7次谐波幅值)",width = 30)
|
||||
private Double i7;
|
||||
@Excel(name = "A项7次谐波幅值",width = 15)
|
||||
private Double i7_a;
|
||||
|
||||
@Column(name = "i_8")
|
||||
@Excel(name = "8次谐波幅值)",width = 30)
|
||||
private Double i8;
|
||||
@Excel(name = "A项8次谐波幅值",width = 15)
|
||||
private Double i8_a;
|
||||
|
||||
@Column(name = "i_9")
|
||||
@Excel(name = "9次谐波幅值)",width = 30)
|
||||
private Double i9;
|
||||
@Excel(name = "A项9次谐波幅值",width = 15)
|
||||
private Double i9_a;
|
||||
|
||||
@Column(name = "i_10")
|
||||
@Excel(name = "10次谐波幅值)",width = 30)
|
||||
private Double i10;
|
||||
@Excel(name = "A项10次谐波幅值",width = 15)
|
||||
private Double i10_a;
|
||||
|
||||
@Column(name = "i_11")
|
||||
@Excel(name = "11次谐波幅值)",width = 30)
|
||||
private Double i11;
|
||||
@Excel(name = "A项11次谐波幅值",width = 15)
|
||||
private Double i11_a;
|
||||
|
||||
@Column(name = "i_12")
|
||||
@Excel(name = "12次谐波幅值)",width = 30)
|
||||
private Double i12;
|
||||
@Excel(name = "A项12次谐波幅值",width = 15)
|
||||
private Double i12_a;
|
||||
|
||||
@Column(name = "i_13")
|
||||
@Excel(name = "13次谐波幅值)",width = 30)
|
||||
private Double i13;
|
||||
@Excel(name = "A项13次谐波幅值",width = 15)
|
||||
private Double i13_a;
|
||||
|
||||
@Column(name = "i_14")
|
||||
@Excel(name = "14次谐波幅值)",width = 30)
|
||||
private Double i14;
|
||||
@Excel(name = "A项14次谐波幅值",width = 15)
|
||||
private Double i14_a;
|
||||
|
||||
@Column(name = "i_15")
|
||||
@Excel(name = "15次谐波幅值)",width = 30)
|
||||
private Double i15;
|
||||
@Excel(name = "A项15次谐波幅值",width = 15)
|
||||
private Double i15_a;
|
||||
|
||||
@Column(name = "i_16")
|
||||
@Excel(name = "16次谐波幅值)",width = 30)
|
||||
private Double i16;
|
||||
@Excel(name = "A项16次谐波幅值",width = 15)
|
||||
private Double i16_a;
|
||||
|
||||
@Column(name = "i_17")
|
||||
@Excel(name = "17次谐波幅值)",width = 30)
|
||||
private Double i17;
|
||||
@Excel(name = "A项17次谐波幅值",width = 15)
|
||||
private Double i17_a;
|
||||
|
||||
@Column(name = "i_18")
|
||||
@Excel(name = "18次谐波幅值)",width = 30)
|
||||
private Double i18;
|
||||
@Excel(name = "A项18次谐波幅值",width = 15)
|
||||
private Double i18_a;
|
||||
|
||||
@Column(name = "i_19")
|
||||
@Excel(name = "19次谐波幅值)",width = 30)
|
||||
private Double i19;
|
||||
@Excel(name = "A项19次谐波幅值",width = 15)
|
||||
private Double i19_a;
|
||||
|
||||
@Column(name = "i_20")
|
||||
@Excel(name = "20次谐波幅值)",width = 30)
|
||||
private Double i20;
|
||||
@Excel(name = "A项20次谐波幅值",width = 15)
|
||||
private Double i20_a;
|
||||
|
||||
@Column(name = "i_21")
|
||||
@Excel(name = "21次谐波幅值)",width = 30)
|
||||
private Double i21;
|
||||
@Excel(name = "A项21次谐波幅值",width = 15)
|
||||
private Double i21_a;
|
||||
|
||||
@Column(name = "i_22")
|
||||
@Excel(name = "22次谐波幅值)",width = 30)
|
||||
private Double i22;
|
||||
@Excel(name = "A项22次谐波幅值",width = 15)
|
||||
private Double i22_a;
|
||||
|
||||
@Column(name = "i_23")
|
||||
@Excel(name = "23次谐波幅值)",width = 30)
|
||||
private Double i23;
|
||||
@Excel(name = "A项23次谐波幅值",width = 15)
|
||||
private Double i23_a;
|
||||
|
||||
@Column(name = "i_24")
|
||||
@Excel(name = "24次谐波幅值)",width = 30)
|
||||
private Double i24;
|
||||
@Excel(name = "A项24次谐波幅值",width = 15)
|
||||
private Double i24_a;
|
||||
@Column(name = "i_25")
|
||||
@Excel(name = "25次谐波幅值)",width = 30)
|
||||
private Double i25;
|
||||
@Excel(name = "A项25次谐波幅值",width = 15)
|
||||
private Double i25_a;
|
||||
|
||||
@Column(name = "i_2")
|
||||
@Excel(name = "B项2次谐波幅值",width = 15)
|
||||
private Double i2_b;
|
||||
|
||||
@Column(name = "i_3")
|
||||
@Excel(name = "B项3次谐波幅值",width = 15)
|
||||
private Double i3_b;
|
||||
|
||||
@Column(name = "i_4")
|
||||
@Excel(name = "B项4次谐波幅值",width = 15)
|
||||
private Double i4_b;
|
||||
|
||||
@Column(name = "i_5")
|
||||
@Excel(name = "B项5次谐波幅值",width = 15)
|
||||
private Double i5_b;
|
||||
|
||||
@Column(name = "i_6")
|
||||
@Excel(name = "B项6次谐波幅值",width = 15)
|
||||
private Double i6_b;
|
||||
|
||||
@Column(name = "i_7")
|
||||
@Excel(name = "B项7次谐波幅值",width = 15)
|
||||
private Double i7_b;
|
||||
|
||||
@Column(name = "i_8")
|
||||
@Excel(name = "B项8次谐波幅值",width = 15)
|
||||
private Double i8_b;
|
||||
|
||||
@Column(name = "i_9")
|
||||
@Excel(name = "B项9次谐波幅值",width = 15)
|
||||
private Double i9_b;
|
||||
|
||||
@Column(name = "i_10")
|
||||
@Excel(name = "B项10次谐波幅值",width = 15)
|
||||
private Double i10_b;
|
||||
|
||||
@Column(name = "i_11")
|
||||
@Excel(name = "B项11次谐波幅值",width = 15)
|
||||
private Double i11_b;
|
||||
|
||||
@Column(name = "i_12")
|
||||
@Excel(name = "B项12次谐波幅值",width = 15)
|
||||
private Double i12_b;
|
||||
|
||||
@Column(name = "i_13")
|
||||
@Excel(name = "B项13次谐波幅值",width = 15)
|
||||
private Double i13_b;
|
||||
|
||||
@Column(name = "i_14")
|
||||
@Excel(name = "B项14次谐波幅值",width = 15)
|
||||
private Double i14_b;
|
||||
|
||||
@Column(name = "i_15")
|
||||
@Excel(name = "B项15次谐波幅值",width = 15)
|
||||
private Double i15_b;
|
||||
|
||||
@Column(name = "i_16")
|
||||
@Excel(name = "B项16次谐波幅值",width = 15)
|
||||
private Double i16_b;
|
||||
|
||||
@Column(name = "i_17")
|
||||
@Excel(name = "B项17次谐波幅值",width = 15)
|
||||
private Double i17_b;
|
||||
|
||||
@Column(name = "i_18")
|
||||
@Excel(name = "B项18次谐波幅值",width = 15)
|
||||
private Double i18_b;
|
||||
|
||||
@Column(name = "i_19")
|
||||
@Excel(name = "B项19次谐波幅值",width = 15)
|
||||
private Double i19_b;
|
||||
|
||||
@Column(name = "i_20")
|
||||
@Excel(name = "B项20次谐波幅值",width = 15)
|
||||
private Double i20_b;
|
||||
|
||||
@Column(name = "i_21")
|
||||
@Excel(name = "B项21次谐波幅值",width = 15)
|
||||
private Double i21_b;
|
||||
|
||||
@Column(name = "i_22")
|
||||
@Excel(name = "B项22次谐波幅值",width = 15)
|
||||
private Double i22_b;
|
||||
|
||||
@Column(name = "i_23")
|
||||
@Excel(name = "B项23次谐波幅值",width = 15)
|
||||
private Double i23_b;
|
||||
|
||||
@Column(name = "i_24")
|
||||
@Excel(name = "B项24次谐波幅值",width = 15)
|
||||
private Double i24_b;
|
||||
@Column(name = "i_25")
|
||||
@Excel(name = "B项25次谐波幅值",width = 15)
|
||||
private Double i25_b;
|
||||
|
||||
|
||||
|
||||
@Column(name = "i_2")
|
||||
@Excel(name = "C项2次谐波幅值",width = 15)
|
||||
private Double i2_c;
|
||||
|
||||
@Column(name = "i_3")
|
||||
@Excel(name = "C项3次谐波幅值",width = 15)
|
||||
private Double i3_c;
|
||||
|
||||
@Column(name = "i_4")
|
||||
@Excel(name = "C项4次谐波幅值",width = 15)
|
||||
private Double i4_c;
|
||||
|
||||
@Column(name = "i_5")
|
||||
@Excel(name = "C项5次谐波幅值",width = 15)
|
||||
private Double i5_c;
|
||||
|
||||
@Column(name = "i_6")
|
||||
@Excel(name = "C项6次谐波幅值",width = 15)
|
||||
private Double i6_c;
|
||||
|
||||
@Column(name = "i_7")
|
||||
@Excel(name = "C项7次谐波幅值",width = 15)
|
||||
private Double i7_c;
|
||||
|
||||
@Column(name = "i_8")
|
||||
@Excel(name = "C项8次谐波幅值",width = 15)
|
||||
private Double i8_c;
|
||||
|
||||
@Column(name = "i_9")
|
||||
@Excel(name = "C项9次谐波幅值",width = 15)
|
||||
private Double i9_c;
|
||||
|
||||
@Column(name = "i_10")
|
||||
@Excel(name = "C项10次谐波幅值",width = 15)
|
||||
private Double i10_c;
|
||||
|
||||
@Column(name = "i_11")
|
||||
@Excel(name = "C项11次谐波幅值",width = 15)
|
||||
private Double i11_c;
|
||||
|
||||
@Column(name = "i_12")
|
||||
@Excel(name = "C项12次谐波幅值",width = 15)
|
||||
private Double i12_c;
|
||||
|
||||
@Column(name = "i_13")
|
||||
@Excel(name = "C项13次谐波幅值",width = 15)
|
||||
private Double i13_c;
|
||||
|
||||
@Column(name = "i_14")
|
||||
@Excel(name = "C项14次谐波幅值",width = 15)
|
||||
private Double i14_c;
|
||||
|
||||
@Column(name = "i_15")
|
||||
@Excel(name = "C项15次谐波幅值",width = 15)
|
||||
private Double i15_c;
|
||||
|
||||
@Column(name = "i_16")
|
||||
@Excel(name = "C项16次谐波幅值",width = 15)
|
||||
private Double i16_c;
|
||||
|
||||
@Column(name = "i_17")
|
||||
@Excel(name = "C项17次谐波幅值",width = 15)
|
||||
private Double i17_c;
|
||||
|
||||
@Column(name = "i_18")
|
||||
@Excel(name = "C项18次谐波幅值",width = 15)
|
||||
private Double i18_c;
|
||||
|
||||
@Column(name = "i_19")
|
||||
@Excel(name = "C项19次谐波幅值",width = 15)
|
||||
private Double i19_c;
|
||||
|
||||
@Column(name = "i_20")
|
||||
@Excel(name = "C项20次谐波幅值",width = 15)
|
||||
private Double i20_c;
|
||||
|
||||
@Column(name = "i_21")
|
||||
@Excel(name = "C项21次谐波幅值",width = 15)
|
||||
private Double i21_c;
|
||||
|
||||
@Column(name = "i_22")
|
||||
@Excel(name = "C项22次谐波幅值",width = 15)
|
||||
private Double i22_c;
|
||||
|
||||
@Column(name = "i_23")
|
||||
@Excel(name = "C项23次谐波幅值",width = 15)
|
||||
private Double i23_c;
|
||||
|
||||
@Column(name = "i_24")
|
||||
@Excel(name = "C项24次谐波幅值",width = 15)
|
||||
private Double i24_c;
|
||||
@Column(name = "i_25")
|
||||
@Excel(name = "C项25次谐波幅值",width = 15)
|
||||
private Double i25_c;
|
||||
|
||||
//excel对象转DataI
|
||||
public static List<DataI> excelToPO(CarryCapcityDataIEexcel carryCapcityDataIEexcel) {
|
||||
List<DataI> data = new ArrayList<>();
|
||||
if (carryCapcityDataIEexcel == null) {
|
||||
return null;
|
||||
}
|
||||
List<String> phaseList = Stream.of("A", "B", "C").collect(Collectors.toList());
|
||||
for (String phase : phaseList) {
|
||||
DataI dataI = new DataI();
|
||||
BeanUtils.copyProperties(carryCapcityDataIEexcel,dataI);
|
||||
dataI.setPhaseType(phase);
|
||||
dataI.setTime(carryCapcityDataIEexcel.getTime().plusSeconds(8*60*60));
|
||||
|
||||
if (phase.equals("A")) {
|
||||
|
||||
dataI.setI2( carryCapcityDataIEexcel.getI2_a());
|
||||
dataI.setI3( carryCapcityDataIEexcel.getI3_a());
|
||||
dataI.setI4( carryCapcityDataIEexcel.getI4_a());
|
||||
dataI.setI5( carryCapcityDataIEexcel.getI5_a());
|
||||
dataI.setI6( carryCapcityDataIEexcel.getI6_a());
|
||||
dataI.setI7( carryCapcityDataIEexcel.getI7_a());
|
||||
dataI.setI8( carryCapcityDataIEexcel.getI8_a());
|
||||
dataI.setI9( carryCapcityDataIEexcel.getI9_a());
|
||||
dataI.setI10( carryCapcityDataIEexcel.getI10_a());
|
||||
dataI.setI11( carryCapcityDataIEexcel.getI11_a());
|
||||
dataI.setI12( carryCapcityDataIEexcel.getI12_a());
|
||||
dataI.setI13( carryCapcityDataIEexcel.getI13_a());
|
||||
dataI.setI14( carryCapcityDataIEexcel.getI14_a());
|
||||
dataI.setI15( carryCapcityDataIEexcel.getI15_a());
|
||||
dataI.setI16( carryCapcityDataIEexcel.getI16_a());
|
||||
dataI.setI17( carryCapcityDataIEexcel.getI17_a());
|
||||
dataI.setI18( carryCapcityDataIEexcel.getI18_a());
|
||||
dataI.setI19( carryCapcityDataIEexcel.getI19_a());
|
||||
dataI.setI20( carryCapcityDataIEexcel.getI20_a());
|
||||
dataI.setI21( carryCapcityDataIEexcel.getI21_a());
|
||||
dataI.setI22( carryCapcityDataIEexcel.getI22_a());
|
||||
dataI.setI23( carryCapcityDataIEexcel.getI23_a());
|
||||
dataI.setI24( carryCapcityDataIEexcel.getI24_a());
|
||||
dataI.setI25( carryCapcityDataIEexcel.getI25_a());
|
||||
|
||||
|
||||
} else if (phase.equals("B")) {
|
||||
dataI.setI2( carryCapcityDataIEexcel.getI2_b());
|
||||
dataI.setI3( carryCapcityDataIEexcel.getI3_b());
|
||||
dataI.setI4( carryCapcityDataIEexcel.getI4_b());
|
||||
dataI.setI5( carryCapcityDataIEexcel.getI5_b());
|
||||
dataI.setI6( carryCapcityDataIEexcel.getI6_b());
|
||||
dataI.setI7( carryCapcityDataIEexcel.getI7_b());
|
||||
dataI.setI8( carryCapcityDataIEexcel.getI8_b());
|
||||
dataI.setI9( carryCapcityDataIEexcel.getI9_b());
|
||||
dataI.setI10( carryCapcityDataIEexcel.getI10_b());
|
||||
dataI.setI11( carryCapcityDataIEexcel.getI11_b());
|
||||
dataI.setI12( carryCapcityDataIEexcel.getI12_b());
|
||||
dataI.setI13( carryCapcityDataIEexcel.getI13_b());
|
||||
dataI.setI14( carryCapcityDataIEexcel.getI14_b());
|
||||
dataI.setI15( carryCapcityDataIEexcel.getI15_b());
|
||||
dataI.setI16( carryCapcityDataIEexcel.getI16_b());
|
||||
dataI.setI17( carryCapcityDataIEexcel.getI17_b());
|
||||
dataI.setI18( carryCapcityDataIEexcel.getI18_b());
|
||||
dataI.setI19( carryCapcityDataIEexcel.getI19_b());
|
||||
dataI.setI20( carryCapcityDataIEexcel.getI20_b());
|
||||
dataI.setI21( carryCapcityDataIEexcel.getI21_b());
|
||||
dataI.setI22( carryCapcityDataIEexcel.getI22_b());
|
||||
dataI.setI23( carryCapcityDataIEexcel.getI23_b());
|
||||
dataI.setI24( carryCapcityDataIEexcel.getI24_b());
|
||||
dataI.setI25( carryCapcityDataIEexcel.getI25_b());
|
||||
|
||||
}else if (phase.equals("C")){
|
||||
dataI.setI2( carryCapcityDataIEexcel.getI2_c());
|
||||
dataI.setI3( carryCapcityDataIEexcel.getI3_c());
|
||||
dataI.setI4( carryCapcityDataIEexcel.getI4_c());
|
||||
dataI.setI5( carryCapcityDataIEexcel.getI5_c());
|
||||
dataI.setI6( carryCapcityDataIEexcel.getI6_c());
|
||||
dataI.setI7( carryCapcityDataIEexcel.getI7_c());
|
||||
dataI.setI8( carryCapcityDataIEexcel.getI8_c());
|
||||
dataI.setI9( carryCapcityDataIEexcel.getI9_c());
|
||||
dataI.setI10( carryCapcityDataIEexcel.getI10_c());
|
||||
dataI.setI11( carryCapcityDataIEexcel.getI11_c());
|
||||
dataI.setI12( carryCapcityDataIEexcel.getI12_c());
|
||||
dataI.setI13( carryCapcityDataIEexcel.getI13_c());
|
||||
dataI.setI14( carryCapcityDataIEexcel.getI14_c());
|
||||
dataI.setI15( carryCapcityDataIEexcel.getI15_c());
|
||||
dataI.setI16( carryCapcityDataIEexcel.getI16_c());
|
||||
dataI.setI17( carryCapcityDataIEexcel.getI17_c());
|
||||
dataI.setI18( carryCapcityDataIEexcel.getI18_c());
|
||||
dataI.setI19( carryCapcityDataIEexcel.getI19_c());
|
||||
dataI.setI20( carryCapcityDataIEexcel.getI20_c());
|
||||
dataI.setI21( carryCapcityDataIEexcel.getI21_c());
|
||||
dataI.setI22( carryCapcityDataIEexcel.getI22_c());
|
||||
dataI.setI23( carryCapcityDataIEexcel.getI23_c());
|
||||
dataI.setI24( carryCapcityDataIEexcel.getI24_c());
|
||||
dataI.setI25( carryCapcityDataIEexcel.getI25_c());
|
||||
|
||||
}
|
||||
data.add(dataI);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.excel;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.njcn.influx.utils.InstantDateSerializer;
|
||||
import com.njcn.influx.pojo.bo.CarryCapcityData;
|
||||
import lombok.Data;
|
||||
import org.influxdb.annotation.Column;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 类的介绍:
|
||||
@@ -18,24 +21,45 @@ import java.time.Instant;
|
||||
@Data
|
||||
public class CarryCapcityDataPEexcel {
|
||||
|
||||
@Column(name = "time")
|
||||
@JsonSerialize(using = InstantDateSerializer.class)
|
||||
@Excel(name = "时间",width = 30)
|
||||
private Instant time;
|
||||
|
||||
@Column(name = "line_id")
|
||||
@Excel(name = "监测点id",width = 30)
|
||||
private String lineId;
|
||||
|
||||
@Column(name = "phasic_type")
|
||||
@Excel(name = "项别",width = 30)
|
||||
private String phaseType;
|
||||
|
||||
@Column(name = "value_type")
|
||||
@Excel(name = "数据类型",width = 30)
|
||||
@Excel(name = "数据类型(CP95)",width = 30)
|
||||
private String valueType;
|
||||
|
||||
@Excel(name = "数据(有功功率)",width = 30)
|
||||
private Double value;
|
||||
@Excel(name = "数据(A项有功功率)",width = 30)
|
||||
private Double value_a;
|
||||
@Excel(name = "数据(B项有功功率)",width = 30)
|
||||
private Double value_b;
|
||||
@Excel(name = "数据(C项有功功率)",width = 30)
|
||||
private Double value_c;
|
||||
|
||||
public static List<CarryCapcityData> excelToPO(CarryCapcityDataPEexcel carryCapcityDataPEexcel) {
|
||||
List<CarryCapcityData> data = new ArrayList<>();
|
||||
if (carryCapcityDataPEexcel == null) {
|
||||
return null;
|
||||
}
|
||||
List<String> phaseList = Stream.of("A", "B", "C").collect(Collectors.toList());
|
||||
for (String phase : phaseList) {
|
||||
CarryCapcityData carryCapcityData = new CarryCapcityData();
|
||||
BeanUtils.copyProperties(carryCapcityDataPEexcel,carryCapcityData);
|
||||
carryCapcityData.setPhaseType(phase);
|
||||
carryCapcityData.setTime(carryCapcityDataPEexcel.getTime().plusSeconds(8*60*60));
|
||||
|
||||
if (phase.equals("A")) {
|
||||
carryCapcityData.setValue(carryCapcityDataPEexcel.getValue_a());
|
||||
} else if (phase.equals("B")) {
|
||||
carryCapcityData.setValue(carryCapcityDataPEexcel.getValue_b());
|
||||
}else if (phase.equals("C")){
|
||||
carryCapcityData.setValue(carryCapcityDataPEexcel.getValue_c());
|
||||
}
|
||||
data.add(carryCapcityData);
|
||||
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.excel;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.njcn.influx.utils.InstantDateSerializer;
|
||||
import com.njcn.influx.pojo.bo.CarryCapcityData;
|
||||
import lombok.Data;
|
||||
import org.influxdb.annotation.Column;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 类的介绍:
|
||||
@@ -18,24 +21,47 @@ import java.time.Instant;
|
||||
@Data
|
||||
public class CarryCapcityDataQEexcel {
|
||||
|
||||
@Column(name = "time")
|
||||
@JsonSerialize(using = InstantDateSerializer.class)
|
||||
@Excel(name = "时间",width = 30)
|
||||
private Instant time;
|
||||
|
||||
@Column(name = "line_id")
|
||||
@Excel(name = "监测点id",width = 30)
|
||||
private String lineId;
|
||||
|
||||
@Column(name = "phasic_type")
|
||||
@Excel(name = "项别",width = 30)
|
||||
private String phaseType;
|
||||
|
||||
@Column(name = "value_type")
|
||||
@Excel(name = "数据类型",width = 30)
|
||||
@Excel(name = "数据类型(CP95)",width = 30)
|
||||
private String valueType;
|
||||
|
||||
@Excel(name = "数据(无功功率)",width = 30)
|
||||
private Double value;
|
||||
@Excel(name = "数据(A项无功功率)",width = 30)
|
||||
private Double value_a;
|
||||
@Excel(name = "数据(B项无功功率)",width = 30)
|
||||
private Double value_b;
|
||||
@Excel(name = "数据(C项无功功率)",width = 30)
|
||||
private Double value_c;
|
||||
|
||||
|
||||
public static List<CarryCapcityData> excelToPO(CarryCapcityDataQEexcel carryCapcityDataQEexcel) {
|
||||
List<CarryCapcityData> data = new ArrayList<>();
|
||||
if (carryCapcityDataQEexcel == null) {
|
||||
return null;
|
||||
}
|
||||
List<String> phaseList = Stream.of("A", "B", "C").collect(Collectors.toList());
|
||||
for (String phase : phaseList) {
|
||||
CarryCapcityData carryCapcityData = new CarryCapcityData();
|
||||
BeanUtils.copyProperties(carryCapcityDataQEexcel,carryCapcityData);
|
||||
carryCapcityData.setPhaseType(phase);
|
||||
carryCapcityData.setTime(carryCapcityDataQEexcel.getTime().plusSeconds(8*60*60));
|
||||
|
||||
if (phase.equals("A")) {
|
||||
carryCapcityData.setValue(carryCapcityDataQEexcel.getValue_a());
|
||||
} else if (phase.equals("B")) {
|
||||
carryCapcityData.setValue(carryCapcityDataQEexcel.getValue_b());
|
||||
}else if (phase.equals("C")){
|
||||
carryCapcityData.setValue(carryCapcityDataQEexcel.getValue_c());
|
||||
}
|
||||
data.add(carryCapcityData);
|
||||
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.excel;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.njcn.influx.utils.InstantDateSerializer;
|
||||
import com.njcn.influx.pojo.bo.CarryCapcityData;
|
||||
import lombok.Data;
|
||||
import org.influxdb.annotation.Column;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 类的介绍:
|
||||
@@ -18,24 +21,45 @@ import java.time.Instant;
|
||||
@Data
|
||||
public class CarryCapcityDataVEexcel {
|
||||
|
||||
@Column(name = "time")
|
||||
@JsonSerialize(using = InstantDateSerializer.class)
|
||||
@Excel(name = "时间",width = 30)
|
||||
private Instant time;
|
||||
|
||||
@Column(name = "line_id")
|
||||
@Excel(name = "监测点id",width = 30)
|
||||
private String lineId;
|
||||
|
||||
@Column(name = "phasic_type")
|
||||
@Excel(name = "项别",width = 30)
|
||||
private String phaseType;
|
||||
|
||||
@Column(name = "value_type")
|
||||
@Excel(name = "数据类型",width = 30)
|
||||
@Excel(name = "数据类型(CP95)",width = 30)
|
||||
private String valueType;
|
||||
|
||||
@Excel(name = "数据(电压)",width = 30)
|
||||
private Double value;
|
||||
|
||||
@Excel(name = "数据(A项电压)",width = 30)
|
||||
private Double value_a;
|
||||
@Excel(name = "数据(B项电压)",width = 30)
|
||||
private Double value_b;
|
||||
@Excel(name = "数据(C项电压)",width = 30)
|
||||
private Double value_c;
|
||||
|
||||
public static List<CarryCapcityData> excelToPO(CarryCapcityDataVEexcel carryCapcityDataVEexcel) {
|
||||
List<CarryCapcityData> data = new ArrayList<>();
|
||||
if (carryCapcityDataVEexcel == null) {
|
||||
return null;
|
||||
}
|
||||
List<String> phaseList = Stream.of("A", "B", "C").collect(Collectors.toList());
|
||||
for (String phase : phaseList) {
|
||||
CarryCapcityData carryCapcityData = new CarryCapcityData();
|
||||
BeanUtils.copyProperties(carryCapcityDataVEexcel,carryCapcityData);
|
||||
carryCapcityData.setPhaseType(phase);
|
||||
carryCapcityData.setTime(carryCapcityDataVEexcel.getTime().plusSeconds(8*60*60));
|
||||
|
||||
if (phase.equals("A")) {
|
||||
carryCapcityData.setValue(carryCapcityDataVEexcel.getValue_a());
|
||||
} else if (phase.equals("B")) {
|
||||
carryCapcityData.setValue(carryCapcityDataVEexcel.getValue_b());
|
||||
}else if (phase.equals("C")){
|
||||
carryCapcityData.setValue(carryCapcityDataVEexcel.getValue_c());
|
||||
}
|
||||
data.add(carryCapcityData);
|
||||
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.excel;
|
||||
|
||||
import com.njcn.influx.pojo.bo.CarryCapcityData;
|
||||
import com.njcn.influx.pojo.po.DataI;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/3/12 14:31【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
public class ExcelDataDTO {
|
||||
private List<CarryCapcityData> dataHarmPowerPList;
|
||||
private List<CarryCapcityData> dataHarmPowerQList;
|
||||
private List<DataI> dataIList;
|
||||
private List<CarryCapcityData> dataHarmPowerP2List;
|
||||
private List<CarryCapcityData> dataHarmPowerQ2List;
|
||||
private List<CarryCapcityData> dataHarmPowerU2List;
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.param;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -26,6 +28,11 @@ public class CarryCapacityCalParam {
|
||||
private String lineId;
|
||||
@ApiModelProperty("用户Id")
|
||||
private String userId;
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
|
||||
private LocalDate startTime;
|
||||
@ApiModelProperty("结束时间")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
|
||||
private LocalDate endTime;
|
||||
@ApiModelProperty(name = "scale",value = "电压等级")
|
||||
private String scale;
|
||||
@ApiModelProperty(name = "S_T",value = "S_T为配变额定容量(监测点基准容量)")
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.param;
|
||||
|
||||
import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityUserVO;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/2/20 11:15【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CarryCapacityEvaluateParam {
|
||||
@ApiModelProperty(value = "接线类型不可为空\"星型接法_0\", \"三角型接法_1\", \"开口三角型接法_2\"")
|
||||
private String ptType;
|
||||
@ApiModelProperty(value = "变压器连接方式")
|
||||
private String connectionMode;
|
||||
@ApiModelProperty(value = "功率因数(0.95-1之间)")
|
||||
private Double k;
|
||||
|
||||
@ApiModelProperty(value = "专变用户,公变用户")
|
||||
private String userMode;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "scale",value = "电压等级")
|
||||
private String scale;
|
||||
|
||||
@ApiModelProperty(name = "shortCapacity",value = "短路容量")
|
||||
private Float shortCapacity;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "deviceCapacity",value = "设备容量")
|
||||
private Float deviceCapacity;
|
||||
@ApiModelProperty(name = "userList",value = "干扰源用户列表")
|
||||
private List<CarryCapacityUserVO> userList;
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
@@ -25,11 +24,9 @@ import java.time.LocalDate;
|
||||
public class CarryCapacityQueryDataParam {
|
||||
|
||||
|
||||
@NotBlank(message = "监测点索引为空")
|
||||
@ApiModelProperty("监测点索引")
|
||||
private String lineId;
|
||||
@ApiModelProperty("用户Id")
|
||||
@NotBlank(message = "用户ID为空")
|
||||
private String userId;
|
||||
@ApiModelProperty("开始时间")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.param;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/3/8 16:23【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CarryCapacityResultParam {
|
||||
/**
|
||||
* 承载能力评估id
|
||||
*/
|
||||
private String id;
|
||||
|
||||
|
||||
private String evaluateType;
|
||||
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class CarryCapacityResultPageParam extends CarryCapacityResultParam {
|
||||
|
||||
@NotNull(message="当前页不能为空!")
|
||||
@Min(value = 1, message = "当前页不能为0")
|
||||
@ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
|
||||
private Integer pageNum;
|
||||
/**显示条数*/
|
||||
@NotNull(message="显示条数不能为空!")
|
||||
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
|
||||
private Integer pageSize;
|
||||
|
||||
@ApiModelProperty(value="起始时间")
|
||||
private String startTime;
|
||||
|
||||
@ApiModelProperty(value="结束时间")
|
||||
private String endTime;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.param;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/3/6 17:30【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
public class ExcelDataParam {
|
||||
@NotBlank(message = "监测点索引为空")
|
||||
@ApiModelProperty("监测点索引")
|
||||
private String lineId;
|
||||
|
||||
@ApiModelProperty("开始时间")
|
||||
private String startTime;
|
||||
@ApiModelProperty("结束时间")
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty(value = "excel文件")
|
||||
private MultipartFile file;
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@@ -19,6 +20,7 @@ import java.time.LocalDate;
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "carry_capacity_data")
|
||||
public class CarryCapacityDataPO extends BaseEntity{
|
||||
/**
|
||||
|
||||
@@ -4,29 +4,55 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/3/1 15:38【需求编号】
|
||||
* Date: 2024/3/8 16:23【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "carry_capacity_result")
|
||||
public class CarryCapacityResultPO {
|
||||
public class CarryCapacityResultPO extends BaseEntity {
|
||||
/**
|
||||
* 承载能力评估id
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
@TableId(value = "id",type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 台区id
|
||||
*/
|
||||
@TableField(value = "line_id")
|
||||
private String lineId;
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@TableField(value = "user_id")
|
||||
private String userId;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@TableField(value = "start_time")
|
||||
private LocalDate startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@TableField(value = "end_time")
|
||||
private LocalDate endTime;
|
||||
|
||||
/**
|
||||
* 配变首端电压等级(1-安全,2-III级预警,3-II级预警,4-I 级预警)
|
||||
*/
|
||||
@@ -64,26 +90,19 @@ public class CarryCapacityResultPO {
|
||||
private LocalDate evaluateDate;
|
||||
|
||||
/**
|
||||
* 创建用户
|
||||
* 是否删除(0,无效,1有效)
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
private String createBy;
|
||||
@TableField(value = "`status`")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
private LocalDateTime createTime;
|
||||
@TableField(value = "evaluate_type")
|
||||
private String evaluateType;
|
||||
|
||||
/**
|
||||
* 更新用户
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
private LocalDateTime updateTime;
|
||||
@TableField(value = "first_result")
|
||||
private Double firstResult;
|
||||
|
||||
@TableField(value = "i_result_list")
|
||||
private String iResultList;
|
||||
|
||||
}
|
||||
@@ -2,12 +2,11 @@ package com.njcn.advance.pojo.carrycapacity.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/3/5 10:54【需求编号】
|
||||
@@ -19,7 +18,7 @@ import java.time.LocalDateTime;
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "carry_capacity_strategy")
|
||||
public class CarryCapacityStrategyPO {
|
||||
public class CarryCapacityStrategyPO extends BaseEntity {
|
||||
/**
|
||||
* 总承载能力评估结果(1-安全,2-III级预警,3-II级预警,4-I 级预警)
|
||||
*/
|
||||
@@ -56,27 +55,4 @@ public class CarryCapacityStrategyPO {
|
||||
@TableField(value = "user_flag")
|
||||
private Integer userFlag;
|
||||
|
||||
/**
|
||||
* 创建用户
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 更新用户
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
private LocalDateTime updateTime;
|
||||
}
|
||||
@@ -1,7 +1,11 @@
|
||||
package com.njcn.advance.pojo.carrycapacity.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/2/27 11:24【需求编号】
|
||||
@@ -13,6 +17,35 @@ import lombok.Data;
|
||||
@Data
|
||||
public class CarryCapacityDResultVO {
|
||||
|
||||
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 台区id
|
||||
*/
|
||||
private String lineId;
|
||||
|
||||
private String lineName;
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
private String userId;
|
||||
|
||||
private String userName;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private LocalDate startTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private LocalDate endTime;
|
||||
|
||||
|
||||
|
||||
private Integer uTLevel;
|
||||
|
||||
/**
|
||||
@@ -34,4 +67,26 @@ public class CarryCapacityDResultVO {
|
||||
* 总结果等级(1-安全,2-III级预警,3-II级预警,4-I 级预警)
|
||||
*/
|
||||
private Integer reslutLevel;
|
||||
|
||||
private LocalDate evaluateDate;
|
||||
|
||||
|
||||
private String evaluateType;
|
||||
//电弧炉等评估结果
|
||||
|
||||
private double firstResult;
|
||||
|
||||
private List<CarryCapacityDResultVO.CarryCapacityIResult> iResultList;
|
||||
|
||||
|
||||
@Data
|
||||
public static class CarryCapacityIResult {
|
||||
|
||||
@ApiModelProperty("谐波次数")
|
||||
private Integer time=2;
|
||||
|
||||
private Double i;
|
||||
|
||||
private Double i_limit;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user