Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -213,6 +213,115 @@ public class DataHarmpowerP {
|
||||
@Column(name = "p_50")
|
||||
private Double p50;
|
||||
|
||||
//在线监测添加的字段
|
||||
@Column(name = "totPf")
|
||||
private Double totPf;
|
||||
@Column(name = "totDf")
|
||||
private Double totDf;
|
||||
@Column(name = "totP")
|
||||
private Double totP;
|
||||
@Column(name = "totP1")
|
||||
private Double totP1;
|
||||
@Column(name = "totP2")
|
||||
private Double totP2;
|
||||
@Column(name = "totP3")
|
||||
private Double totP3;
|
||||
@Column(name = "totP4")
|
||||
private Double totP4;
|
||||
@Column(name = "totP5")
|
||||
private Double totP5;
|
||||
@Column(name = "totP6")
|
||||
private Double totP6;
|
||||
@Column(name = "totP7")
|
||||
private Double totP7;
|
||||
@Column(name = "totP8")
|
||||
private Double totP8;
|
||||
@Column(name = "totP9")
|
||||
private Double totP9;
|
||||
@Column(name = "totP10")
|
||||
private Double totP10;
|
||||
@Column(name = "totP11")
|
||||
private Double totP11;
|
||||
@Column(name = "totP12")
|
||||
private Double totP12;
|
||||
@Column(name = "totP13")
|
||||
private Double totP13;
|
||||
@Column(name = "totP14")
|
||||
private Double totP14;
|
||||
@Column(name = "totP15")
|
||||
private Double totP15;
|
||||
@Column(name = "totP16")
|
||||
private Double totP16;
|
||||
@Column(name = "totP17")
|
||||
private Double totP17;
|
||||
@Column(name = "totP18")
|
||||
private Double totP18;
|
||||
@Column(name = "totP19")
|
||||
private Double totP19;
|
||||
@Column(name = "totP20")
|
||||
private Double totP20;
|
||||
@Column(name = "totP21")
|
||||
private Double totP21;
|
||||
@Column(name = "totP22")
|
||||
private Double totP22;
|
||||
@Column(name = "totP23")
|
||||
private Double totP23;
|
||||
@Column(name = "totP24")
|
||||
private Double totP24;
|
||||
@Column(name = "totP25")
|
||||
private Double totP25;
|
||||
@Column(name = "totP26")
|
||||
private Double totP26;
|
||||
@Column(name = "totP27")
|
||||
private Double totP27;
|
||||
@Column(name = "totP28")
|
||||
private Double totP28;
|
||||
@Column(name = "totP29")
|
||||
private Double totP29;
|
||||
@Column(name = "totP30")
|
||||
private Double totP30;
|
||||
@Column(name = "totP31")
|
||||
private Double totP31;
|
||||
@Column(name = "totP32")
|
||||
private Double totP32;
|
||||
@Column(name = "totP33")
|
||||
private Double totP33;
|
||||
@Column(name = "totP34")
|
||||
private Double totP34;
|
||||
@Column(name = "totP35")
|
||||
private Double totP35;
|
||||
@Column(name = "totP36")
|
||||
private Double totP36;
|
||||
@Column(name = "totP37")
|
||||
private Double totP37;
|
||||
@Column(name = "totP38")
|
||||
private Double totP38;
|
||||
@Column(name = "totP39")
|
||||
private Double totP39;
|
||||
@Column(name = "totP40")
|
||||
private Double totP40;
|
||||
@Column(name = "totP41")
|
||||
private Double totP41;
|
||||
@Column(name = "totP42")
|
||||
private Double totP42;
|
||||
@Column(name = "totP43")
|
||||
private Double totP43;
|
||||
@Column(name = "totP44")
|
||||
private Double totP44;
|
||||
@Column(name = "totP45")
|
||||
private Double totP45;
|
||||
@Column(name = "totP46")
|
||||
private Double totP46;
|
||||
@Column(name = "totP47")
|
||||
private Double totP47;
|
||||
@Column(name = "totP49")
|
||||
private Double totP48;
|
||||
@Column(name = "totP49")
|
||||
private Double totP49;
|
||||
@Column(name = "totP50")
|
||||
private Double totP50;
|
||||
|
||||
|
||||
public static List<DataHarmpowerP> relationToInfluxDB(DataHarmpowerPDTO dataHarmpowerP) {
|
||||
if (dataHarmpowerP == null) {
|
||||
return null;
|
||||
|
||||
@@ -207,6 +207,111 @@ public class DataHarmpowerQ {
|
||||
@Column(name = "q_50")
|
||||
private Double q50;
|
||||
|
||||
//在线监测添加的字段
|
||||
@Column(name = "totQ")
|
||||
private Double totQ;
|
||||
@Column(name = "totQ1")
|
||||
private Double totQ1;
|
||||
@Column(name = "totQ2")
|
||||
private Double totQ2;
|
||||
@Column(name = "totQ3")
|
||||
private Double totQ3;
|
||||
@Column(name = "totQ4")
|
||||
private Double totQ4;
|
||||
@Column(name = "totQ5")
|
||||
private Double totQ5;
|
||||
@Column(name = "totQ6")
|
||||
private Double totQ6;
|
||||
@Column(name = "totQ7")
|
||||
private Double totQ7;
|
||||
@Column(name = "totQ8")
|
||||
private Double totQ8;
|
||||
@Column(name = "totQ9")
|
||||
private Double totQ9;
|
||||
@Column(name = "totQ10")
|
||||
private Double totQ10;
|
||||
@Column(name = "totQ11")
|
||||
private Double totQ11;
|
||||
@Column(name = "totQ12")
|
||||
private Double totQ12;
|
||||
@Column(name = "totQ13")
|
||||
private Double totQ13;
|
||||
@Column(name = "totQ14")
|
||||
private Double totQ14;
|
||||
@Column(name = "totQ15")
|
||||
private Double totQ15;
|
||||
@Column(name = "totQ16")
|
||||
private Double totQ16;
|
||||
@Column(name = "totQ17")
|
||||
private Double totQ17;
|
||||
@Column(name = "totQ18")
|
||||
private Double totQ18;
|
||||
@Column(name = "totQ19")
|
||||
private Double totQ19;
|
||||
@Column(name = "totQ20")
|
||||
private Double totQ20;
|
||||
@Column(name = "totQ21")
|
||||
private Double totQ21;
|
||||
@Column(name = "totQ22")
|
||||
private Double totQ22;
|
||||
@Column(name = "totQ23")
|
||||
private Double totQ23;
|
||||
@Column(name = "totQ24")
|
||||
private Double totQ24;
|
||||
@Column(name = "totQ25")
|
||||
private Double totQ25;
|
||||
@Column(name = "totQ26")
|
||||
private Double totQ26;
|
||||
@Column(name = "totQ27")
|
||||
private Double totQ27;
|
||||
@Column(name = "totQ28")
|
||||
private Double totQ28;
|
||||
@Column(name = "totQ29")
|
||||
private Double totQ29;
|
||||
@Column(name = "totQ30")
|
||||
private Double totQ30;
|
||||
@Column(name = "totQ31")
|
||||
private Double totQ31;
|
||||
@Column(name = "totQ32")
|
||||
private Double totQ32;
|
||||
@Column(name = "totQ33")
|
||||
private Double totQ33;
|
||||
@Column(name = "totQ34")
|
||||
private Double totQ34;
|
||||
@Column(name = "totQ35")
|
||||
private Double totQ35;
|
||||
@Column(name = "totQ36")
|
||||
private Double totQ36;
|
||||
@Column(name = "totQ37")
|
||||
private Double totQ37;
|
||||
@Column(name = "totQ38")
|
||||
private Double totQ38;
|
||||
@Column(name = "totQ39")
|
||||
private Double totQ39;
|
||||
@Column(name = "totQ40")
|
||||
private Double totQ40;
|
||||
@Column(name = "totQ41")
|
||||
private Double totQ41;
|
||||
@Column(name = "totQ42")
|
||||
private Double totQ42;
|
||||
@Column(name = "totQ43")
|
||||
private Double totQ43;
|
||||
@Column(name = "totQ44")
|
||||
private Double totQ44;
|
||||
@Column(name = "totQ45")
|
||||
private Double totQ45;
|
||||
@Column(name = "totQ46")
|
||||
private Double totQ46;
|
||||
@Column(name = "totQ47")
|
||||
private Double totQ47;
|
||||
@Column(name = "totQ49")
|
||||
private Double totQ48;
|
||||
@Column(name = "totQ49")
|
||||
private Double totQ49;
|
||||
@Column(name = "totQ50")
|
||||
private Double totQ50;
|
||||
|
||||
|
||||
public static List<DataHarmpowerQ> relationToInfluxDB(DataHarmpowerQDTO dataHarmpowerQ) {
|
||||
if (dataHarmpowerQ == null) {
|
||||
return null;
|
||||
|
||||
@@ -207,6 +207,111 @@ public class DataHarmpowerS {
|
||||
@Column(name = "s_50")
|
||||
private Double s50;
|
||||
|
||||
//在线监测添加的字段
|
||||
@Column(name = "totS")
|
||||
private Double totS;
|
||||
@Column(name = "totS1")
|
||||
private Double totS1;
|
||||
@Column(name = "totS2")
|
||||
private Double totS2;
|
||||
@Column(name = "totS3")
|
||||
private Double totS3;
|
||||
@Column(name = "totS4")
|
||||
private Double totS4;
|
||||
@Column(name = "totS5")
|
||||
private Double totS5;
|
||||
@Column(name = "totS6")
|
||||
private Double totS6;
|
||||
@Column(name = "totS7")
|
||||
private Double totS7;
|
||||
@Column(name = "totS8")
|
||||
private Double totS8;
|
||||
@Column(name = "totS9")
|
||||
private Double totS9;
|
||||
@Column(name = "totS10")
|
||||
private Double totS10;
|
||||
@Column(name = "totS11")
|
||||
private Double totS11;
|
||||
@Column(name = "totS12")
|
||||
private Double totS12;
|
||||
@Column(name = "totS13")
|
||||
private Double totS13;
|
||||
@Column(name = "totS14")
|
||||
private Double totS14;
|
||||
@Column(name = "totS15")
|
||||
private Double totS15;
|
||||
@Column(name = "totS16")
|
||||
private Double totS16;
|
||||
@Column(name = "totS17")
|
||||
private Double totS17;
|
||||
@Column(name = "totS18")
|
||||
private Double totS18;
|
||||
@Column(name = "totS19")
|
||||
private Double totS19;
|
||||
@Column(name = "totS20")
|
||||
private Double totS20;
|
||||
@Column(name = "totS21")
|
||||
private Double totS21;
|
||||
@Column(name = "totS22")
|
||||
private Double totS22;
|
||||
@Column(name = "totS23")
|
||||
private Double totS23;
|
||||
@Column(name = "totS24")
|
||||
private Double totS24;
|
||||
@Column(name = "totS25")
|
||||
private Double totS25;
|
||||
@Column(name = "totS26")
|
||||
private Double totS26;
|
||||
@Column(name = "totS27")
|
||||
private Double totS27;
|
||||
@Column(name = "totS28")
|
||||
private Double totS28;
|
||||
@Column(name = "totS29")
|
||||
private Double totS29;
|
||||
@Column(name = "totS30")
|
||||
private Double totS30;
|
||||
@Column(name = "totS31")
|
||||
private Double totS31;
|
||||
@Column(name = "totS32")
|
||||
private Double totS32;
|
||||
@Column(name = "totS33")
|
||||
private Double totS33;
|
||||
@Column(name = "totS34")
|
||||
private Double totS34;
|
||||
@Column(name = "totS35")
|
||||
private Double totS35;
|
||||
@Column(name = "totS36")
|
||||
private Double totS36;
|
||||
@Column(name = "totS37")
|
||||
private Double totS37;
|
||||
@Column(name = "totS38")
|
||||
private Double totS38;
|
||||
@Column(name = "totS39")
|
||||
private Double totS39;
|
||||
@Column(name = "totS40")
|
||||
private Double totS40;
|
||||
@Column(name = "totS41")
|
||||
private Double totS41;
|
||||
@Column(name = "totS42")
|
||||
private Double totS42;
|
||||
@Column(name = "totS43")
|
||||
private Double totS43;
|
||||
@Column(name = "totS44")
|
||||
private Double totS44;
|
||||
@Column(name = "totS45")
|
||||
private Double totS45;
|
||||
@Column(name = "totS46")
|
||||
private Double totS46;
|
||||
@Column(name = "totS47")
|
||||
private Double totS47;
|
||||
@Column(name = "totS49")
|
||||
private Double totS48;
|
||||
@Column(name = "totS49")
|
||||
private Double totS49;
|
||||
@Column(name = "totS50")
|
||||
private Double totS50;
|
||||
|
||||
|
||||
public static List<DataHarmpowerS> relationToInfluxDB(DataHarmpowerSDTO dataHarmpowerS) {
|
||||
if (dataHarmpowerS == null) {
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user