补充新更新
This commit is contained in:
@@ -217,11 +217,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 10:
|
||||
//相电压有效值
|
||||
sql = "SELECT time as time, rms as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, rms as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, rms as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -231,11 +227,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 11:
|
||||
//线电压有效值
|
||||
sql = "SELECT time as time, rms_lvr as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, rms_lvr as bValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, rms_lvr as cValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("AB相");
|
||||
phasicType.add("BC相");
|
||||
phasicType.add("CA相");
|
||||
@@ -245,11 +237,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 12:
|
||||
//电压偏差
|
||||
sql = "SELECT time as time, vu_dev as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, vu_dev as bValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, vu_dev as cValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = overlimit.getVoltageDev();
|
||||
lowerLimit = overlimit.getUvoltageDev();
|
||||
if (ptType == 0) {
|
||||
@@ -276,11 +264,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 14:
|
||||
//电压不平衡
|
||||
sql = "SELECT time as time, v_zero as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_pos as bValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_neg as cValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("零序电压");
|
||||
phasicType.add("正序电压");
|
||||
phasicType.add("负序电压");
|
||||
@@ -292,11 +276,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 15:
|
||||
//电压总谐波畸变率
|
||||
sql = "SELECT time as time, v_thd as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_thd as bValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_thd as cValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = overlimit.getUaberrance();
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
@@ -313,12 +293,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 20:
|
||||
//电流有效值
|
||||
sql = "SELECT time as time, rms as aValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, rms as bValue FROM data_i" +
|
||||
" WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, rms as cValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -328,11 +303,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 21:
|
||||
//电流总畸变率
|
||||
sql = "SELECT time as time, i_thd as aValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_thd as bValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_thd as cValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -342,11 +313,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 22:
|
||||
//负序电流
|
||||
sql = "SELECT time as time, i_neg as aValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_neg as bValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_neg as cValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = overlimit.getINeg();
|
||||
phasicType.add("负序电流");
|
||||
unit.add("A");
|
||||
@@ -365,11 +332,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 40:
|
||||
//谐波电压含有率
|
||||
sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as bValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as cValue FROM data_harmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = PubUtils.getValueByMethod(overlimit, "getUharm", number);
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
@@ -386,11 +349,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 41:
|
||||
//谐波电流含有率
|
||||
sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as bValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as cValue FROM data_harmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -400,11 +359,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 42:
|
||||
//谐波电压幅值
|
||||
sql = "SELECT time as time, v_" + number + " as aValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as bValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as cValue FROM data_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
@@ -424,11 +379,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 43:
|
||||
//谐波电流幅值
|
||||
sql = "SELECT time as time, i_" + number + " as aValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as bValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as cValue FROM data_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = PubUtils.getValueByMethod(overlimit, "getIharm", number);
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
@@ -439,11 +390,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 44:
|
||||
//谐波电压相角
|
||||
sql = "SELECT time as time, v_" + number + " as aValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as bValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as cValue FROM data_harmphasic_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
@@ -459,11 +406,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 45:
|
||||
//谐波电流相角
|
||||
sql = "SELECT time as time, i_" + number + " as aValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as bValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as cValue FROM data_harmphasic_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -473,11 +416,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 46:
|
||||
//间谐波电压含有率
|
||||
sql = "SELECT time as time, v_" + number + " as aValue FROM data_inharmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as bValue FROM data_inharmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as cValue FROM data_inharmrate_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = PubUtils.getValueByMethod(overlimit, "getInuharm", number);
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
@@ -494,11 +433,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 47:
|
||||
//间谐波电流含有率
|
||||
sql = "SELECT time as time, i_" + number + " as aValue FROM data_inharmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as bValue FROM data_inharmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as cValue FROM data_inharmrate_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -508,11 +443,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 48:
|
||||
//间谐波电压幅值
|
||||
sql = "SELECT time as time, v_" + number + " as aValue FROM data_inharm_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as bValue FROM data_inharm_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, v_" + number + " as cValue FROM data_inharm_v WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
targetName = "间谐波电压幅值";
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
@@ -528,11 +459,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 49:
|
||||
//间谐波电流幅值
|
||||
sql = "SELECT time as time, i_" + number + " as aValue FROM data_inharm_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as bValue FROM data_inharm_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, i_" + number + " as cValue FROM data_inharm_i WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -542,11 +469,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 50:
|
||||
//谐波有功功率
|
||||
sql = "SELECT time as time, p_" + number + " as aValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, p_" + number + " as bValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, p_" + number + " as cValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -560,11 +483,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 51:
|
||||
//谐波无功功率
|
||||
sql = "SELECT time as time, q_" + number + " as aValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, q_" + number + " as bValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, q_" + number + " as cValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -578,11 +497,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 52:
|
||||
//谐波视在功率
|
||||
sql = "SELECT time as time, s_" + number + " as aValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, s_" + number + " as bValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, s_" + number + " as cValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -596,11 +511,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 53:
|
||||
//三相有功功率
|
||||
sql = "SELECT time as time, p as aValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, p as bValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, p as cValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -610,11 +521,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 54:
|
||||
//三相无功功率
|
||||
sql = "SELECT time as time, q as aValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, q as bValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, q as cValue FROM data_harmpower_q WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -624,11 +531,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 55:
|
||||
//三相视在功率
|
||||
sql = "SELECT time as time, s as aValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, s as bValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, s as cValue FROM data_harmpower_s WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -662,11 +565,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 59:
|
||||
//视在功率因数
|
||||
sql = "SELECT time as time, pf as aValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, pf as bValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, pf as cValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -675,11 +574,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 591:
|
||||
//位移功率因数
|
||||
sql = "SELECT time as time, df as aValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, df as bValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, df as cValue FROM data_harmpower_p WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
phasicType.add("C相");
|
||||
@@ -702,11 +597,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 61:
|
||||
//长时闪变
|
||||
sql = "SELECT time as time, plt as aValue FROM data_plt WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, plt as bValue FROM data_plt WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, plt as cValue FROM data_plt WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
@@ -722,11 +613,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 60:
|
||||
//短时闪变
|
||||
sql = "SELECT time as time, pst as aValue FROM data_flicker WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, pst as bValue FROM data_flicker WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, pst as cValue FROM data_flicker WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
topLimit = overlimit.getFlicker();
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
@@ -742,11 +629,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
|
||||
case 62:
|
||||
//电压波动
|
||||
sql = "SELECT time as time, fluc as aValue FROM data_fluc WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='A' order by time asc;" +
|
||||
"SELECT time as time, fluc as bValue FROM data_fluc WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='B' order by time asc;" +
|
||||
"SELECT time as time, fluc as cValue FROM data_fluc WHERE " + stringBuilder.toString() +
|
||||
" and phasic_type ='C' order by time asc;";
|
||||
" and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') group by phasic_type order by time asc;";
|
||||
if (ptType == 0) {
|
||||
phasicType.add("A相");
|
||||
phasicType.add("B相");
|
||||
|
||||
Reference in New Issue
Block a user