Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-03-28 11:33:38 +08:00
parent 8f6844df30 d84337a03a
commit 374d2be704
214 changed files with 6501 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java
View File

@@ -23,8 +23,6 @@ public interface ServerInfo {
String USER = "user-boot";
String JOB = "job-admin";
String QUALITY = "quality-boot";
String HARMONIC_PREPARE = "harmonic-prepare";
String EVENT_PREPARE = "event-prepare";
String PROCESS = "process-boot";
String PREPARE_BOOT = "prepare-boot";

4
pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java
View File

@@ -80,4 +80,8 @@ public class BusinessException extends RuntimeException {
this.result = result;
}
public BusinessException(String message) {
super(message);
this.message = message;
}
}

2
pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java
View File

@@ -34,7 +34,7 @@ import java.util.stream.Stream;
@Slf4j
public class XssRequestWrapper extends HttpServletRequestWrapper {
private final static String[] WHITE_PARAMETER_NAME = {"password", "mxContent", "docContent", "bgImage"};
private final static String[] WHITE_PARAMETER_NAME = {"password", "mxContent", "docContent", "bgImage","fileContent"};
public XssRequestWrapper(HttpServletRequest request) {

7
pqs-device/common-device-biz/pom.xml
View File

@@ -43,6 +43,11 @@
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>system-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>

316
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java
View File

@@ -1,30 +1,43 @@
package com.njcn.device.biz.utils;
import com.njcn.system.enums.DicDataEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.math.RoundingMode;
@Component
public class COverlimit {
private static int MAX_SCALE_NO = 9;
private static int MAXOVERLIMITNUM = 55+16;//WW 2017-08-10 overlimit增加电压偏差的下偏差值,原来个数是53 WW2017-11-29 54->53 新增负序电流 间谐波电压含有率
private static int MAXOVERLIMITNUM = 55 + 16;//WW 2017-08-10 overlimit增加电压偏差的下偏差值,原来个数是53 WW2017-11-29 54->53 新增负序电流 间谐波电压含有率
private static float[] fULimit = {
2.0f,1.6f,0.8f,10.0f,
2.0f, 1.6f, 0.8f, 10.0f,
// 3.0f,2.4f,1.2f,10.0f,
3.0f,2.4f,1.2f,10.0f,
4.0f,3.2f,1.6f,7.0f,
4.0f,3.2f,1.6f,7.0f,
5.0f, 4.0f, 2.0f,7.0f,
3.0f,2.4f,1.2f,10.0f,
3.0f, 2.4f, 1.2f, 10.0f,
4.0f, 3.2f, 1.6f, 7.0f,
4.0f, 3.2f, 1.6f, 7.0f,
5.0f, 4.0f, 2.0f, 7.0f,
3.0f, 2.4f, 1.2f, 10.0f,
};
private static float[] fUDevL_Limit = {-3, -7, -10};
private static float[] fILimit = {
12.0f, 9.6f, 6.0f, 9.6f, 4.0f, 6.8f, 3.0f, 3.2f, 2.4f, 4.3f, 2.0f, 3.7f, 1.7f, 1.9f, 1.5f, 2.8f, 1.3f, 2.5f, 1.2f, 1.4f, 1.1f, 2.1f, 1.0f, 1.9f,
// 16.0f,13.0f,8.1f,13.0f,5.4f,9.3f,4.1f,4.3f,3.3f,5.9f,2.7f,5.0f,2.3f,2.6f,2.0f,3.8f,1.8f,3.4f,1.6f,1.9f,1.5f,2.8f,1.4f,2.6f,
15.0f, 12.0f, 7.7f, 12.0f, 5.1f, 8.8f, 3.8f, 4.1f, 3.1f, 5.6f, 2.6f, 4.7f, 2.2f, 2.5f, 1.9f, 3.6f, 1.7f, 3.2f, 1.5f, 1.8f, 1.4f, 2.7f, 1.3f, 2.5f,
26.0f, 20.0f, 13.0f, 20.0f, 8.5f, 15.0f, 6.4f, 6.8f, 5.1f, 9.3f, 4.3f, 7.9f, 3.7f, 4.1f, 3.2f, 6.0f, 2.8f, 5.4f, 2.6f, 2.9f, 2.3f, 4.5f, 2.1f, 4.1f,
43.0f, 34.0f, 21.0f, 34.0f, 14.0f, 24.0f, 11.0f, 11.0f, 8.5f, 16.0f, 7.1f, 13.0f, 6.1f, 6.8f, 5.3f, 10.0f, 4.7f, 9.0f, 4.3f, 4.9f, 3.9f, 7.4f, 3.6f, 6.8f,
78.0f, 62.0f, 39.0f, 62.0f, 26.0f, 44.0f, 19.0f, 21.0f, 16.0f, 28.0f, 13.0f, 24.0f, 11.0f, 12.0f, 9.7f, 18.0f, 8.6f, 16.0f, 7.8f, 8.9f, 7.1f, 14.0f, 6.5f, 12.0f,
private static final double[][] ARR = {
{78, 62, 39, 62, 26, 44, 19, 21, 16, 28, 13, 24, 11, 12, 9.7, 18, 8.6, 16, 7.8, 8.9, 7.1, 14, 6.5, 12, 6.0, 6.9, 5.6, 11, 5.2, 10, 4.9, 5.6, 4.6, 8.9, 4.3, 8.4, 4.1, 4.8, 3.9, 7.6, 3.7, 7.2, 3.5, 4.1, 3.4, 6.6, 3.3, 6.3, 3.1},
{43, 34, 21, 34, 14, 24, 11, 11, 8.5, 16, 7.1, 13, 6.1, 6.8, 5.3, 10, 4.7, 9, 4.3, 4.9, 3.9, 7.4, 3.6, 6.8, 3.3, 3.8, 3.1, 5.9, 2.9, 5.5, 2.7, 3.1, 2.5, 4.9, 2.4, 4.6, 2.3, 2.6, 2.2, 4.1, 2.0, 4.0, 2.0, 2.3, 1.9, 3.6, 1.8, 3.5, 1.7},
{26, 20, 13, 20, 8.5, 15, 6.4, 6.8, 5.1, 9.3, 4.3, 7.9, 3.7, 4.1, 3.2, 6, 2.8, 5.4, 2.6, 2.9, 2.3, 4.5, 2.1, 4.1, 2.0, 2.2, 1.9, 3.4, 1.7, 3.2, 1.6, 1.8, 1.5, 2.9, 1.4, 2.7, 1.4, 1.5, 1.3, 2.4, 1.2, 2.3, 1.2, 1.3, 1.1, 2.1, 1.1, 2.0, 1.0},
{15, 12, 7.7, 12, 5.1, 8.8, 3.8, 4.1, 3.1, 5.6, 2.6, 4.7, 2.2, 2.5, 1.9, 3.6, 1.7, 3.2, 1.5, 1.8, 1.4, 2.7, 1.3, 2.5, 1.2, 1.3, 1.1, 2.1, 1.0, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.6, 0.8, 0.9, 0.8, 1.5, 0.7, 1.4, 0.7, 0.8, 0.7, 1.3, 0.6, 1.2, 0.6},
{16, 13, 8.1, 13, 5.4, 9.3, 4.1, 4.3, 3.3, 5.9, 2.7, 5, 2.3, 2.6, 2, 3.8, 1.8, 3.4, 1.6, 1.9, 1.5, 2.8, 1.4, 2.6, 1.2, 1.4, 1.1, 2.2, 1.1, 2.1, 1.0, 1.2, 0.9, 1.9, 0.9, 1.8, 0.8, 1.0, 0.8, 1.6, 0.8, 1.5, 0.7, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6},
{12, 9.6, 6, 9.6, 4, 6.8, 3, 3.2, 2.4, 4.3, 2, 3.7, 1.7, 1.9, 1.5, 2.8, 1.3, 2.5, 1.2, 1.4, 1.1, 2.1, 1, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.5, 0.8, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6, 0.7, 0.6, 1.2, 0.6, 1.1, 0.5, 0.6, 0.5, 1.0, 0.5, 1.0, 0.5}
};
private static float[] fILimitCoe = {
2.0f, 1.1f, 2.0f, 1.2f, 2.0f, 1.4f, 2.0f, 2.0f, 2.0f, 1.8f, 2.0f, 1.9f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f
};
@@ -39,12 +52,10 @@ public class COverlimit {
private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率
{
if (nHarm < 0) {
if (nHarm < 0)
return 0.0f;
}
if (iScaleSelect >= MAX_SCALE_NO) {
if (iScaleSelect >= MAX_SCALE_NO)
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
@@ -56,16 +67,13 @@ public class COverlimit {
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
if (iScaleSelect < 2)
iScaleSelect = 0;
}
else {
else
iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 1;
if (nHarm % 2 == 0) {
if (nHarm % 2 == 0)
nSelect = iScaleSelect * 4 + 2;
}
return fULimit[nSelect];
}
@@ -85,21 +93,18 @@ public class COverlimit {
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
if (iScaleSelect < 2)
iScaleSelect = 0;
}
else {
else
iScaleSelect--;
}
int nSelect = iScaleSelect * 4;
return fULimit[nSelect];
}
private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差
{
if (iScaleSelect >= MAX_SCALE_NO) {
if (iScaleSelect >= MAX_SCALE_NO)
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
@@ -111,132 +116,165 @@ public class COverlimit {
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
if (iScaleSelect < 2)
iScaleSelect = 0;
}
else {
else
iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 3;
return fULimit[nSelect];
}
private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数
{
if (iScaleSelect >= MAX_SCALE_NO) {
if (iScaleSelect >= MAX_SCALE_NO)
return 0.0f;
}
int nReturn = 0;
if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) {
if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6)
nReturn = 1;
}
else if (iScaleSelect == -1) {
else if (iScaleSelect == -1)
nReturn = 2;
}
return fUDevL_Limit[nReturn];
}
private static float GetCurrentLimit(int nHarm, int iScaleSelect, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
if (nHarm < 0) {
return 0.0f;
}
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
break;
case 7:
iScaleSelect = 2;
break;
case 8:
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
iScaleSelect = 0;
}
else {
iScaleSelect--;
}
int nBaseSelect = nHarm + iScaleSelect * 24;
float fRealLimit = fDLRL / fJZRL * fILimit[nBaseSelect];
fRealLimit = fRealLimit * (float) Math.pow(fXYRL / fSBRL, 1.0f / fILimitCoe[nHarm]);
return fRealLimit;
private static float GetCurrentLimit(int nHarm, String voltageLevel, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
Double tag = getHarmTag(nHarm,voltageLevel);
Double limit = getHarmonicLimit(nHarm,tag,new BigDecimal(String.valueOf(fSBRL)).doubleValue(),new BigDecimal(String.valueOf(fXYRL)).doubleValue());
BigDecimal bigDecimal = new BigDecimal(limit).setScale(4,RoundingMode.HALF_UP);
return bigDecimal.floatValue();
}
public static float GetFCurrentLimit(String strScale, float fDLRL){
float uL = 0.0f;
switch (strScale) {
case "0.38kV":
uL = 0.4f;
break;
case "6kV":
uL = 6.3f;
break;
case "10kV":
uL = 10.5f;
break;
case "20kV":
uL = 21.0f;
break;
case "35kV":
uL = 36.5f;
break;
case "66kV":
uL = 69.0f;
break;
case "110kV":
uL = 115.0f;
break;
case "220kV":
uL = 230.0f;
break;
case "330kV":
uL = 345.0f;
break;
default:
return 0.0f;
}
return 2.6f/100 * fDLRL * 1000 / ((float)Math.sqrt(3) * uL);
//电流谐波限值
private static Double getHarmTag(Integer iCount, String voltageLevel) {
int x, y;
if (DicDataEnum.KV038.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.V380.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.V400.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.KV04.getName().equalsIgnoreCase(voltageLevel)) {
x = 0;
} else if (DicDataEnum.KV6.getName().equalsIgnoreCase(voltageLevel)) {
x = 1;
} else if (DicDataEnum.KV10.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.KV20.getName().equalsIgnoreCase(voltageLevel)) {
x = 2;
} else if (DicDataEnum.KV35.getName().equalsIgnoreCase(voltageLevel)) {
x = 3;
} else if (DicDataEnum.KV66.getName().equalsIgnoreCase(voltageLevel)) {
x = 4;
} else {
x = 5;
}
y = iCount - 2;
return ARR[x][y];
}
public static float GetInHarm(int i, int iScaleSelect){
if(iScaleSelect == 5){
return InharmLimit1[i];
}else{
return InharmLimit2[i];
}
;
public static Double getHarmonicLimit(Integer times, double iTag, double supply, double user) {
if (supply == 0) {
return 0.0;
}
double coefficient = 2.0;
if (times == 3) {
coefficient = 1.1;
} else if (times == 5) {
coefficient = 1.2;
} else if (times == 7) {
coefficient = 1.4;
} else if (times == 11) {
coefficient = 1.8;
} else if (times == 13) {
coefficient = 1.9;
}
BigDecimal bd = new BigDecimal(iTag * Math.pow((user / supply), (1 / coefficient)));
bd = bd.setScale(2, RoundingMode.HALF_UP);
return Double.parseDouble(bd.toString());
}
public static float GetFCurrentLimit(String strScale, float fDLRL) {
float uL = 0.0f;
switch (strScale) {
case "0.38kV":
uL = 0.4f;
break;
case "6kV":
uL = 6.3f;
break;
case "10kV":
uL = 10.5f;
break;
case "20kV":
uL = 21.0f;
break;
case "35kV":
uL = 36.5f;
break;
case "66kV":
uL = 69.0f;
break;
case "110kV":
uL = 115.0f;
break;
case "220kV":
uL = 230.0f;
break;
case "330kV":
uL = 345.0f;
break;
case "500kV":
uL = 520.0f;
break;
case "515kV":
uL = 535.0f;
break;
default:
return 0.0f;
}
return 2.6f / 100 * fDLRL * 1000 / ((float) Math.sqrt(3) * uL);
}
public static float GetInHarm(int i, int iScaleSelect) {
if (iScaleSelect == 5) {
return InharmLimit1[i];
} else {
return InharmLimit2[i];
}
}
public static int TransStringScaleToInt(String strScale) {
if (strScale.equals("110kV")) {
if (strScale.equals("110kV"))
return 1;
}
else if (strScale.equals("35kV") || strScale.equals("66kV")) {
else if (strScale.equals("35kV") || strScale.equals("66kV"))
return 2;
}
else if (strScale.equals("10kV")) {
else if (strScale.equals("10kV"))
return 3;
}
else if (strScale.equals("6kV")) {
else if (strScale.equals("6kV"))
return 4;
}
else if (strScale.equals("0.38kV")) {
else if (strScale.equals("0.38kV"))
return 5;
}
else if (strScale.equals("20kV")) {
else if (strScale.equals("20kV"))
return 6;
}
else if (strScale.equals("220kV")) {
else if (strScale.equals("220kV") || strScale.equals("500kV"))
return -1;
}
return 0;
}
/*单独处理闪变的*/
public static float dealFlickerByScale(String strScale) {
if (strScale.equals("110kV") || strScale.equals("35kV") || strScale.equals("66kV") || strScale.equals("10kV") || strScale.equals("6kV") || strScale.equals("0.38kV") || strScale.equals("20kV")) {
return 1.0f;
} else if (strScale.equals("220kV") || strScale.equals("500kV")) {
return 0.8f;
} else {
return 1.0f;
}
}
public static float[] GetOverLimit(String strScale, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
int i = 0;
@@ -250,52 +288,32 @@ public class COverlimit {
//电压不平衡
fLimit[2] = 2.0f;
//闪变
if (nScale < 2) {
fLimit[3] = 1.0f;
}
else {
fLimit[3] = 0.8f;
}
fLimit[3] = dealFlickerByScale(strScale);
//畸变率
fLimit[4] = GetVoltageJBLimit(nScale);
//24谐波电压幅值
for (i = 0; i < 24; i++) {
for (i = 0; i < 24; i++)
fLimit[5 + i] = GetVoltageLimit(i, nScale);
}
//24谐波电流幅值
for (i = 0; i < 24; i++) {
fLimit[5 + 24 + i] = GetCurrentLimit(i, nScale, fDLRL, fJZRL, fXYRL, fSBRL);
}
for (i = 0; i < 24; i++)
fLimit[5 + 24 + i] = GetCurrentLimit(i+2, strScale, fDLRL, fJZRL, fXYRL, fSBRL);
/****************************
* Modify by yexb 20181015
*此项为电压下偏差
* 增加则MAXOVERLIMITNUM的值为54
* 不增加则MAXOVERLIMITNUM的值为53
***************************/
fLimit[COverlimit.MAXOVERLIMITNUM-2-16] = GetVoltageDevationLimit_L(nScale);
fLimit[COverlimit.MAXOVERLIMITNUM - 2 - 16] = GetVoltageDevationLimit_L(nScale);
//负序电流
fLimit[COverlimit.MAXOVERLIMITNUM-1-16] = GetFCurrentLimit(strScale,fDLRL);
fLimit[COverlimit.MAXOVERLIMITNUM - 1 - 16] = GetFCurrentLimit(strScale, fDLRL);
//间谐波电压含有率
for (i = 0; i < 16; i++) {
for (i = 0; i < 16; i++)
fLimit[55 + i] = GetInHarm(i, nScale);
}
return fLimit;
}
/* public void addOverLimit(String lineId, String scaTmp) {
Overlimit overlimit = new Overlimit();
LineDetail tmp = lineDetailMapper.selectById(lineId);
float fDLRL = tmp.getShortCapacity();
float fJZRL = tmp.getStandardCapacity();
float fXYRL = tmp.getDealCapacity();
float fSBRL = tmp.getDevCapacity();
float[] fLimit = COverlimit.GetOverLimit(scaTmp, fDLRL, fJZRL, fXYRL, fSBRL);
overLimitMapper.insert(overlimit);
}*/
}

2
pqs-device/pq-device/pq-device-api/pom.xml
View File

@@ -23,4 +23,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java
View File

@@ -2,7 +2,7 @@ package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.device.pq.utils.COverlimit;
import com.njcn.device.biz.utils.COverlimit;
import lombok.Data;
/**

301
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/COverlimit.java
View File

@@ -1,301 +0,0 @@
package com.njcn.device.pq.utils;
public class COverlimit {
private static int MAX_SCALE_NO = 9;
private static int MAXOVERLIMITNUM = 55+16;//WW 2017-08-10 overlimit增加电压偏差的下偏差值,原来个数是53 WW2017-11-29 54->53 新增负序电流 间谐波电压含有率
private static float[] fULimit = {
2.0f,1.6f,0.8f,10.0f,
// 3.0f,2.4f,1.2f,10.0f,
3.0f,2.4f,1.2f,10.0f,
4.0f,3.2f,1.6f,7.0f,
4.0f,3.2f,1.6f,7.0f,
5.0f, 4.0f, 2.0f,7.0f,
3.0f,2.4f,1.2f,10.0f,
};
private static float[] fUDevL_Limit = {-3, -7, -10};
private static float[] fILimit = {
12.0f, 9.6f, 6.0f, 9.6f, 4.0f, 6.8f, 3.0f, 3.2f, 2.4f, 4.3f, 2.0f, 3.7f, 1.7f, 1.9f, 1.5f, 2.8f, 1.3f, 2.5f, 1.2f, 1.4f, 1.1f, 2.1f, 1.0f, 1.9f,
// 16.0f,13.0f,8.1f,13.0f,5.4f,9.3f,4.1f,4.3f,3.3f,5.9f,2.7f,5.0f,2.3f,2.6f,2.0f,3.8f,1.8f,3.4f,1.6f,1.9f,1.5f,2.8f,1.4f,2.6f,
15.0f, 12.0f, 7.7f, 12.0f, 5.1f, 8.8f, 3.8f, 4.1f, 3.1f, 5.6f, 2.6f, 4.7f, 2.2f, 2.5f, 1.9f, 3.6f, 1.7f, 3.2f, 1.5f, 1.8f, 1.4f, 2.7f, 1.3f, 2.5f,
26.0f, 20.0f, 13.0f, 20.0f, 8.5f, 15.0f, 6.4f, 6.8f, 5.1f, 9.3f, 4.3f, 7.9f, 3.7f, 4.1f, 3.2f, 6.0f, 2.8f, 5.4f, 2.6f, 2.9f, 2.3f, 4.5f, 2.1f, 4.1f,
43.0f, 34.0f, 21.0f, 34.0f, 14.0f, 24.0f, 11.0f, 11.0f, 8.5f, 16.0f, 7.1f, 13.0f, 6.1f, 6.8f, 5.3f, 10.0f, 4.7f, 9.0f, 4.3f, 4.9f, 3.9f, 7.4f, 3.6f, 6.8f,
78.0f, 62.0f, 39.0f, 62.0f, 26.0f, 44.0f, 19.0f, 21.0f, 16.0f, 28.0f, 13.0f, 24.0f, 11.0f, 12.0f, 9.7f, 18.0f, 8.6f, 16.0f, 7.8f, 8.9f, 7.1f, 14.0f, 6.5f, 12.0f,
};
private static float[] fILimitCoe = {
2.0f, 1.1f, 2.0f, 1.2f, 2.0f, 1.4f, 2.0f, 2.0f, 2.0f, 1.8f, 2.0f, 1.9f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f
};
//间谐波含有率
private static float[] InharmLimit1 = {
0.16f, 0.16f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f
};
private static float[] InharmLimit2 = {
0.2f, 0.2f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f
};
private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率
{
if (nHarm < 0) {
return 0.0f;
}
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
break;
case 7:
iScaleSelect = 2;
break;
case 8:
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
iScaleSelect = 0;
}
else {
iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 1;
if (nHarm % 2 == 0) {
nSelect = iScaleSelect * 4 + 2;
}
return fULimit[nSelect];
}
private static float GetVoltageJBLimit(int iScaleSelect)//谐波畸变率
{
if (iScaleSelect >= MAX_SCALE_NO)
return 0.0f;
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
break;
case 7:
iScaleSelect = 2;
break;
case 8:
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
iScaleSelect = 0;
}
else {
iScaleSelect--;
}
int nSelect = iScaleSelect * 4;
return fULimit[nSelect];
}
private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差
{
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
break;
case 7:
iScaleSelect = 2;
break;
case 8:
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
iScaleSelect = 0;
}
else {
iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 3;
return fULimit[nSelect];
}
private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数
{
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f;
}
int nReturn = 0;
if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) {
nReturn = 1;
}
else if (iScaleSelect == -1) {
nReturn = 2;
}
return fUDevL_Limit[nReturn];
}
private static float GetCurrentLimit(int nHarm, int iScaleSelect, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
if (nHarm < 0) {
return 0.0f;
}
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f;
}
switch (iScaleSelect) {
case 6:
iScaleSelect = 4;
break;
case 7:
iScaleSelect = 2;
break;
case 8:
iScaleSelect = 0;
break;
}
if (iScaleSelect < 2) {
iScaleSelect = 0;
}
else {
iScaleSelect--;
}
int nBaseSelect = nHarm + iScaleSelect * 24;
float fRealLimit = fDLRL / fJZRL * fILimit[nBaseSelect];
fRealLimit = fRealLimit * (float) Math.pow(fXYRL / fSBRL, 1.0f / fILimitCoe[nHarm]);
return fRealLimit;
}
public static float GetFCurrentLimit(String strScale, float fDLRL){
float uL = 0.0f;
switch (strScale) {
case "0.38kV":
uL = 0.4f;
break;
case "6kV":
uL = 6.3f;
break;
case "10kV":
uL = 10.5f;
break;
case "20kV":
uL = 21.0f;
break;
case "35kV":
uL = 36.5f;
break;
case "66kV":
uL = 69.0f;
break;
case "110kV":
uL = 115.0f;
break;
case "220kV":
uL = 230.0f;
break;
case "330kV":
uL = 345.0f;
break;
default:
return 0.0f;
}
return 2.6f/100 * fDLRL * 1000 / ((float)Math.sqrt(3) * uL);
}
public static float GetInHarm(int i, int iScaleSelect){
if(iScaleSelect == 5){
return InharmLimit1[i];
}else{
return InharmLimit2[i];
}
}
public static int TransStringScaleToInt(String strScale) {
if (strScale.equals("110kV")) {
return 1;
}
else if (strScale.equals("35kV") || strScale.equals("66kV")) {
return 2;
}
else if (strScale.equals("10kV")) {
return 3;
}
else if (strScale.equals("6kV")) {
return 4;
}
else if (strScale.equals("0.38kV")) {
return 5;
}
else if (strScale.equals("20kV")) {
return 6;
}
else if (strScale.equals("220kV")) {
return -1;
}
return 0;
}
public static float[] GetOverLimit(String strScale, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
int i = 0;
int nScale = TransStringScaleToInt(strScale);
float[] fLimit = new float[COverlimit.MAXOVERLIMITNUM];
//频率偏差
fLimit[0] = 0.2f;
//电压偏差
fLimit[1] = GetVoltageDevationLimit(nScale);
//电压不平衡
fLimit[2] = 2.0f;
//闪变
if (nScale < 2) {
fLimit[3] = 1.0f;
}
else {
fLimit[3] = 0.8f;
}
//畸变率
fLimit[4] = GetVoltageJBLimit(nScale);
//24谐波电压幅值
for (i = 0; i < 24; i++) {
fLimit[5 + i] = GetVoltageLimit(i, nScale);
}
//24谐波电流幅值
for (i = 0; i < 24; i++) {
fLimit[5 + 24 + i] = GetCurrentLimit(i, nScale, fDLRL, fJZRL, fXYRL, fSBRL);
}
/****************************
* Modify by yexb 20181015
*此项为电压下偏差
* 增加则MAXOVERLIMITNUM的值为54
* 不增加则MAXOVERLIMITNUM的值为53
***************************/
fLimit[COverlimit.MAXOVERLIMITNUM-2-16] = GetVoltageDevationLimit_L(nScale);
//负序电流
fLimit[COverlimit.MAXOVERLIMITNUM-1-16] = GetFCurrentLimit(strScale,fDLRL);
//间谐波电压含有率
for (i = 0; i < 16; i++) {
fLimit[55 + i] = GetInHarm(i, nScale);
}
return fLimit;
}
/* public void addOverLimit(String lineId, String scaTmp) {
Overlimit overlimit = new Overlimit();
LineDetail tmp = lineDetailMapper.selectById(lineId);
float fDLRL = tmp.getShortCapacity();
float fJZRL = tmp.getStandardCapacity();
float fXYRL = tmp.getDealCapacity();
float fSBRL = tmp.getDevCapacity();
float[] fLimit = COverlimit.GetOverLimit(scaTmp, fDLRL, fJZRL, fXYRL, fSBRL);
overLimitMapper.insert(overlimit);
}*/
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -690,7 +690,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(scaleResult.getData())) {
throw new BusinessException(CommonResponseEnum.DIC_DATA);
}
Overlimit overlimit = new Overlimit(line.getId(), updateSubVoltageParam.getScale(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
Overlimit overlimit = new Overlimit(line.getId(),scaleResult.getData().getName(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.insert(overlimit);
}
}

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java
View File

@@ -26,7 +26,7 @@ public class EventDetailNew {
private String eventDescribe;
@Column(name = "wave_type")
private Integer waveType;
private String waveType;
@Column(name = "persist_time")
private Double persistTime;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java
View File

@@ -41,7 +41,7 @@ public class RStatEventM implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java
View File

@@ -38,7 +38,7 @@ public class RStatEventOrgM implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java
View File

@@ -37,7 +37,7 @@ public class RStatEventOrgQ implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java
View File

@@ -37,7 +37,7 @@ public class RStatEventOrgY implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java
View File

@@ -41,7 +41,7 @@ public class RStatEventQ implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java
View File

@@ -44,7 +44,7 @@ public class RStatEventVoltageM implements Serializable {
private String voltageType;
@ApiModelProperty(value = "日均发生暂态监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java
View File

@@ -41,7 +41,7 @@ public class RStatEventY implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

115
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
View File

@@ -1,10 +1,20 @@
package com.njcn.event.pojo.po;
import cn.hutool.core.date.DateTime;
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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.influxdb.annotation.Column;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -14,57 +24,90 @@ import java.util.Date;
* @since 2022-10-12 18:34:55
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("r_mp_event_detail")
@ApiModel(value="RmpEventDetail对象", description="")
public class RmpEventDetailPO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 暂时事件ID
*/
@ApiModelProperty(name = "eventId",value = "暂时事件ID")
@ApiModelProperty(value = "暂时事件ID")
@TableId(value = "event_id", type = IdType.ASSIGN_ID)
private String eventId;
/**
* 监测点ID
*/
@ApiModelProperty(name = "measurementPointId",value = "监测点ID")
@ApiModelProperty(value = "监测点ID")
private String measurementPointId;
/**
* 事件类型
*/
@ApiModelProperty(name = "eventType",value = "事件类型")
@ApiModelProperty(value = "事件类型")
private String eventType;
/**
* 开始时间
*/
@ApiModelProperty(name = "startTime",value = "开始时间")
@ApiModelProperty(value = "暂降原因（字典表PQS_Dicdata）")
@TableField("Event_Reason")
private String eventReason;
@ApiModelProperty(value = "事件关联分析表Guid")
private String eventassIndex;
@ApiModelProperty(value = "dq计算持续时间 ")
private Double dqTime;
@ApiModelProperty(value = "特征值计算更新时间（外键PQS_Relevance的Time字段）")
private LocalDateTime dealTime;
@ApiModelProperty(value = "默认事件个数为0")
private Integer num;
@ApiModelProperty(value = "波形文件是否从装置招到本地(0：未招，1：已招)默认值为0")
private Integer fileFlag;
@ApiModelProperty(value = "特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0")
private Integer dealFlag;
@ApiModelProperty(value = "处理结果第一条事件发生时间(读comtra文件获取)")
private LocalDateTime firstTime;
@ApiModelProperty(value = "处理结果第一条事件暂降类型（字典表PQS_Dicdata）")
private String firstType;
@ApiModelProperty(value = "处理结果第一条事件发生时间毫秒(读comtra文件获取)")
private Double firstMs;
@ApiModelProperty(value = "暂降能量")
private Double energy;
@ApiModelProperty(value = "暂降严重度")
private Double severity;
@ApiModelProperty(value = "暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算")
private String sagsource;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
private Date startTime;
/**
* 持续时间
*/
@ApiModelProperty(name = "duration",value = "持续时间")
@ApiModelProperty(value = "持续时间，单位秒")
private Double duration;
/**
* 特征幅值
*/
@ApiModelProperty(name = "featureAmplitude",value = "特征幅值")
@ApiModelProperty(value = "特征幅值")
private Double featureAmplitude;
/**
* 相别
*/
@ApiModelProperty(name = "phase",value = "相别")
@ApiModelProperty(value = "相别")
private String phase;
/**
* 事件描述
*/
@ApiModelProperty(name = "eventDescribe",value = "事件描述")
@ApiModelProperty(value = "事件描述")
private String eventDescribe;
/**
* 波形路径
*/
@ApiModelProperty(name = "wavePath",value = "波形路径")
@ApiModelProperty(value = "波形路径")
private String wavePath;
@ApiModelProperty(value = "波形名称")
@TableField("wave_path")
private String waveName;
private String phasicType;
private Double transientValue;
}

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java
View File

@@ -23,7 +23,7 @@ public class RStatEventMVO {
private String eventName;
@ApiModelProperty(value = "日均发生暂态监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数")
private Integer eventMeasurementAccrued;

16
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/EventDetailMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.event.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.event.pojo.po.RmpEventDetailPO;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wr
* @since 2023-03-27
*/
public interface EventDetailMapper extends BaseMapper<RmpEventDetailPO> {
}

19
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.event.mapper.majornetwork.EventDetailMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.njcn.event.pojo.po.RmpEventDetailPO">
<id column="event_id" property="eventId" />
<result column="measurement_point_id" property="measurementPointId" />
<result column="event_type" property="eventType" />
<result column="Event_Reason" property="eventReason" />
<result column="start_time" property="startTime" />
<result column="duration" property="duration" />
<result column="feature_amplitude" property="featureAmplitude" />
<result column="phase" property="phase" />
<result column="event_describe" property="eventDescribe" />
<result column="wave_path" property="wavePath" />
</resultMap>
</mapper>

5
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventDetailService.java
View File

@@ -1,6 +1,9 @@
package com.njcn.event.service.majornetwork;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.event.pojo.po.EventDetail;
import com.njcn.event.pojo.po.RStatEventOrgM;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import java.util.List;
@@ -9,7 +12,7 @@ import java.util.List;
* @version 1.0.0
* @date 2022年04月07日 09:39
*/
public interface EventDetailService {
public interface EventDetailService extends IService<RmpEventDetailPO> {
/**
* 根据监测点id获取暂降事件
*

193
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
View File

@@ -1,6 +1,10 @@
package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.api.TerminalBaseClient;
@@ -10,20 +14,24 @@ import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
import com.njcn.event.pojo.constant.Param;
import com.njcn.event.pojo.po.EventDetailNew;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.AreaSubLineVO;
import com.njcn.event.service.majornetwork.AreaInfoService;
import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.influxdb.dto.QueryResult;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -45,7 +53,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
private final LineFeignClient lineFeignClient;
private final TerminalBaseClient terminalBaseClient;
private final EventDetailService eventDetailService;
@Override
public List<AreaSubLineVO> getAreaLineInfo(DeviceInfoParam.BusinessParam deviceInfoParam) {
@@ -55,32 +63,60 @@ public class AreaInfoServiceImpl implements AreaInfoService {
if (CollectionUtil.isNotEmpty(lineIds)) {
List<AreaLineInfoVO> resList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
//查询监测点未处理暂态事件
StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds);
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds)
.ge(StringUtils.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
.le(StringUtils.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
);
//根据监测点分组统计数量
Map<String, Long> count = eventDetails.stream().collect(Collectors.groupingBy(RmpEventDetailPO::getMeasurementPointId, Collectors.counting()));
String stringResult = "SELECT count(eventass_index) FROM " + Param.EVENT_DETAIL + Param.WHERE + "time >= '" + deviceInfoParam.getSearchBeginTime() + InfluxDBPublicParam.START_TIME + "' and " + "time <= '" + deviceInfoParam.getSearchEndTime() + InfluxDBPublicParam.END_TIME + "' and " + lineIdsStr + " and eventass_index = '' group by line_id" + InfluxDBPublicParam.TIME_ZONE;
// 结果集
QueryResult result = influxDbUtils.query(stringResult);
if (!result.hasError()) {
List<QueryResult.Series> list = result.getResults().get(0).getSeries();
for (AreaLineInfoVO areaLineInfoVO : resList) {
boolean flag = false;
if(CollectionUtil.isNotEmpty(list)) {
for (QueryResult.Series tem : list) {
String lineId = tem.getTags().get("line_id");
if (areaLineInfoVO.getLineId().equals(lineId)) {
areaLineInfoVO.setNoDealCount(Double.valueOf(tem.getValues().get(0).get(1).toString()).intValue());
flag = true;
break;
}
for (AreaLineInfoVO areaLineInfoVO : resList) {
boolean flag = false;
if(CollectionUtil.isNotEmpty(count)) {
for (String s : count.keySet()) {
if (count.containsKey(areaLineInfoVO.getLineId())) {
Long aLong = count.get(s);
areaLineInfoVO.setNoDealCount(Math.toIntExact(aLong));
flag = true;
break;
}
}
if (!flag) {
areaLineInfoVO.setNoDealCount(0);
}
}
if (!flag) {
areaLineInfoVO.setNoDealCount(0);
}
}
//查询监测点未处理暂态事件
// StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds);
//
// String stringResult = "SELECT count(eventass_index) FROM " + Param.EVENT_DETAIL + Param.WHERE + "time >= '" + deviceInfoParam.getSearchBeginTime() + InfluxDBPublicParam.START_TIME + "' and " + "time <= '" + deviceInfoParam.getSearchEndTime() + InfluxDBPublicParam.END_TIME + "' and " + lineIdsStr + " and eventass_index = '' group by line_id" + InfluxDBPublicParam.TIME_ZONE;
// // 结果集
// QueryResult result = influxDbUtils.query(stringResult);
// if (!result.hasError()) {
// List<QueryResult.Series> list = result.getResults().get(0).getSeries();
//
// for (AreaLineInfoVO areaLineInfoVO : resList) {
// boolean flag = false;
// if(CollectionUtil.isNotEmpty(list)) {
// for (QueryResult.Series tem : list) {
// String lineId = tem.getTags().get("line_id");
// if (areaLineInfoVO.getLineId().equals(lineId)) {
// areaLineInfoVO.setNoDealCount(Double.valueOf(tem.getValues().get(0).get(1).toString()).intValue());
// flag = true;
// break;
// }
// }
// }
// if (!flag) {
// areaLineInfoVO.setNoDealCount(0);
// }
// }
// }
//组装成变电站
if (CollectionUtil.isNotEmpty(resList)) {
Map<String, List<AreaLineInfoVO>> map = resList.stream().collect(Collectors.groupingBy(AreaLineInfoVO::getSubId));
@@ -117,50 +153,99 @@ public class AreaInfoServiceImpl implements AreaInfoService {
if (CollectionUtil.isNotEmpty(lineIds)) {
List<AreaLineInfoVO> lineList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
//查询监测点未处理暂态事件
StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds);
Map<String, AreaLineInfoVO> lineMap = lineList.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity(), (key1, kye2) -> key1));
String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + lineIdsStr + "and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE;
// 结果集
QueryResult result = influxDbUtils.query(stringResult);
// 结果集映射到对象中
InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn();
resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class);
//对未处理暂降事件的监测点替换成中文名称
if (CollectionUtil.isNotEmpty(resList)) {
for (EventDetailNew eventDetail : resList) {
for (AreaLineInfoVO tem : lineList) {
if (eventDetail.getLineId().equals(tem.getLineId())) {
eventDetail.setLineName(tem.getLineName());
eventDetail.setLng(tem.getLng());
eventDetail.setLat(tem.getLat());
break;
}
}
//查询监测点未处理暂态事件
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds));
EventDetailNew eventDetailNew;
for (RmpEventDetailPO eventDetail : eventDetails) {
eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class);
//监测点id
eventDetailNew.setLineId(eventDetail.getMeasurementPointId());
//持续时间
eventDetailNew.setPersistTime(eventDetail.getDuration());
//特征幅值
eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude());
if(lineMap.containsKey(eventDetail.getMeasurementPointId())){
AreaLineInfoVO areaLineInfoVO = lineMap.get(eventDetail.getMeasurementPointId());
eventDetailNew.setLineName(areaLineInfoVO.getLineName());
eventDetailNew.setLng(areaLineInfoVO.getLng());
eventDetailNew.setLat(areaLineInfoVO.getLat());
resList.add(eventDetailNew);
}
}
// //查询监测点未处理暂态事件
// StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds);
//
// String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + lineIdsStr + "and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE;
// // 结果集
// QueryResult result = influxDbUtils.query(stringResult);
// // 结果集映射到对象中
// InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn();
// resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class);
// //对未处理暂降事件的监测点替换成中文名称
// if (CollectionUtil.isNotEmpty(resList)) {
// for (EventDetailNew eventDetail : resList) {
// for (AreaLineInfoVO tem : lineList) {
// if (eventDetail.getLineId().equals(tem.getLineId())) {
// eventDetail.setLineName(tem.getLineName());
// eventDetail.setLng(tem.getLng());
// eventDetail.setLat(tem.getLat());
// break;
// }
// }
// }
// }
}
return resList;
}
@Override
public List<EventDetailNew> getNoDealEventsByLineId(String id) {
String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + "line_id = '"+id+"' and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE;
// 结果集
QueryResult result = influxDbUtils.query(stringResult);
// 结果集映射到对象中
InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn();
List<EventDetailNew> resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class);
List<AreaLineInfoVO> lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData();
if(CollectionUtil.isNotEmpty(lineList)){
resList = resList.stream().peek(item->{
item.setGdName(lineList.get(0).getGdName());
item.setSubName(lineList.get(0).getSubName());
item.setLineName(lineList.get(0).getLineName());
}).collect(Collectors.toList());
List<EventDetailNew> resList = new ArrayList<>();
//查询监测点未处理暂态事件
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, id));
EventDetailNew eventDetailNew;
for (RmpEventDetailPO eventDetail : eventDetails) {
eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class);
//监测点id
eventDetailNew.setLineId(eventDetail.getMeasurementPointId());
//持续时间
eventDetailNew.setPersistTime(eventDetail.getDuration());
//特征幅值
eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude());
if(CollectionUtil.isNotEmpty(lineList)){
resList = resList.stream().peek(item->{
item.setGdName(lineList.get(0).getGdName());
item.setSubName(lineList.get(0).getSubName());
item.setLineName(lineList.get(0).getLineName());
}).collect(Collectors.toList());
resList.add(eventDetailNew);
}
}
// String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + "line_id = '"+id+"' and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE;
// // 结果集
// QueryResult result = influxDbUtils.query(stringResult);
// // 结果集映射到对象中
// InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn();
// List<EventDetailNew> resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class);
// List<AreaLineInfoVO> lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData();
// if(CollectionUtil.isNotEmpty(lineList)){
// resList = resList.stream().peek(item->{
// item.setGdName(lineList.get(0).getGdName());
// item.setSubName(lineList.get(0).getSubName());
// item.setLineName(lineList.get(0).getLineName());
// }).collect(Collectors.toList());
// }
return resList;
}

359
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -1,7 +1,9 @@
package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.exception.BusinessException;
@@ -16,14 +18,17 @@ import com.njcn.event.pojo.dto.wave.WaveDataDTO;
import com.njcn.event.pojo.param.*;
import com.njcn.event.pojo.po.EventDetail;
import com.njcn.event.pojo.po.EventDetailNew;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.*;
import com.njcn.event.service.majornetwork.EventAnalysisService;
import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.influxdb.dto.QueryResult;
import org.influxdb.impl.InfluxDBResultMapper;
import org.springframework.stereotype.Service;
@@ -35,6 +40,7 @@ import java.text.ParseException;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -59,6 +65,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
private final DicDataFeignClient dicDataFeignClient;
@Override
public Page<EventDetail> getEventAnalyse(EventBaseParam eventBaseParam) {
@@ -138,10 +145,17 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
*/
@Override
public List<CoordsVO> getCoords(StatisticsParam statisticsParam) {
QueryResult query = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<CoordsVO> result = new ArrayList<>();
List<EventDetail> info = influxDBResultMapper.toPOJO(query, EventDetail.class);
// QueryResult query = MonitorQuery(statisticsParam);
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// List<EventDetail> info = influxDBResultMapper.toPOJO(query, EventDetail.class);
//查询监测点未处理暂态事件
List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
for (int i = 0; i < 10; i++) {
for (int j = 0; j < 9; j++) {
@@ -151,204 +165,204 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
for (int i = 0; i < info.size(); i++) {
Integer index = null;
CoordsVO dto = new CoordsVO();
if (info.get(i).getEventValue() >= 0 && info.get(i).getEventValue() <= 0.1) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
if (info.get(i).getFeatureAmplitude() >= 0 && info.get(i).getFeatureAmplitude() <= 0.1) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 0;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 1;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 2;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 3;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 4;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 5;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 6;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 7;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 8;
}
} else if (info.get(i).getEventValue() > 0.1 && info.get(i).getEventValue() <= 0.2) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.1 && info.get(i).getFeatureAmplitude() <= 0.2) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 9;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 10;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 11;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 12;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 13;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 14;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 15;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 16;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 17;
}
} else if (info.get(i).getEventValue() > 0.2 && info.get(i).getEventValue() <= 0.3) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.2 && info.get(i).getFeatureAmplitude() <= 0.3) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 18;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 19;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 20;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 21;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 22;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 23;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 24;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 25;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 26;
}
} else if (info.get(i).getEventValue() > 0.3 && info.get(i).getEventValue() <= 0.4) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.3 && info.get(i).getFeatureAmplitude() <= 0.4) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 27;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 28;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 29;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 30;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 31;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 32;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 33;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 34;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 35;
}
} else if (info.get(i).getEventValue() > 0.4 && info.get(i).getEventValue() <= 0.5) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.4 && info.get(i).getFeatureAmplitude() <= 0.5) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 36;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 37;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 38;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 39;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 40;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 41;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 42;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 43;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 44;
}
} else if (info.get(i).getEventValue() > 0.5 && info.get(i).getEventValue() <= 0.6) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.5 && info.get(i).getFeatureAmplitude() <= 0.6) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 45;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 46;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 47;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 48;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 49;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 50;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 51;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 52;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 53;
}
} else if (info.get(i).getEventValue() > 0.6 && info.get(i).getEventValue() <= 0.7) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.6 && info.get(i).getFeatureAmplitude() <= 0.7) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 54;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 55;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 56;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 57;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 58;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 59;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 60;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 61;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 62;
}
} else if (info.get(i).getEventValue() > 0.7 && info.get(i).getEventValue() <= 0.8) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.7 && info.get(i).getFeatureAmplitude() <= 0.8) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 63;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 64;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 65;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 66;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 67;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 68;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 69;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 70;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 71;
}
} else if (info.get(i).getEventValue() > 0.8 && info.get(i).getEventValue() <= 0.9) {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
} else if (info.get(i).getFeatureAmplitude() > 0.8 && info.get(i).getFeatureAmplitude() <= 0.9) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 72;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 73;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 74;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 75;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 76;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 77;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 78;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 79;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 80;
}
} else {
if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) {
if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) {
index = 81;
} else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) {
} else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) {
index = 82;
} else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) {
} else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) {
index = 83;
} else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) {
} else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) {
index = 84;
} else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) {
} else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) {
index = 85;
} else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) {
} else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) {
index = 86;
} else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) {
} else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) {
index = 87;
} else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) {
} else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) {
index = 88;
} else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) {
} else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) {
index = 89;
}
}
@@ -479,10 +493,17 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
@Override
public List<IEC411VO> IEC411(StatisticsParam statisticsParam) {
List<IEC411VO> result = new ArrayList<>();
List<EventDetail> info = new ArrayList<>();
QueryResult query = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
info = influxDBResultMapper.toPOJO(query, EventDetail.class);
// List<EventDetail> info = new ArrayList<>();
// QueryResult query = MonitorQuery(statisticsParam);
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// info = influxDBResultMapper.toPOJO(query, EventDetail.class);
//查询监测点未处理暂态事件
List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
int[][] arr = new int[3][6];
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 6; j++) {
@@ -490,8 +511,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
}
}
for (int i = 0; i < info.size(); i++) {
Double eventvalue = info.get(i).getEventValue();
double persisttime = info.get(i).getPersistTime();
Double eventvalue = info.get(i).getFeatureAmplitude();
double persisttime = info.get(i).getDuration();
if (eventvalue * 100 < 1) {
if (persisttime < 20 && persisttime >= 10) {
arr[2][0]++;
@@ -894,6 +915,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
*/
@Override
public List<TimeVO> getReasonTypeTime(StatisticsParam statisticsParam) throws ParseException {
//获取暂降字典信息
DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
List<TimeVO> list = new ArrayList<>();
//参数
StringBuilder builder1 = new StringBuilder();
@@ -918,10 +941,16 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
} else {
builder2.append(startYear).append("-").append(startMonth + 1).append("-").append(startDays);
}
query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
long count = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
// query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
// long count = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
long count = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count();
if (startMonth < 10) {
list.add(new TimeVO(null, null,"", "0" + startMonth.toString(), count+"", startYear.toString(), startYear.toString()+"-"+"0"+startMonth.toString()));
} else {
@@ -937,10 +966,16 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
builder2.delete(0, builder2.length());
builder1.append(startYear).append("-").append(startMonth).append("-").append(startDays);
builder2.append(startYear).append("-").append(startMonth).append("-").append(endDays);
query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
long count1 = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
// query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag()));
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class);
// long count1 = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count();
List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
long count1 = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count();
if (startMonth < 10) {
list.add(new TimeVO(null, null,"", "0" + startMonth.toString(), count1+"", startYear.toString(), startYear.toString()+"-"+"0"+startMonth.toString()));
} else {
@@ -949,18 +984,27 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
return list;
}
else {
QueryResult monitorQuery = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class);
// QueryResult monitorQuery = MonitorQuery(statisticsParam);
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class);
// Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> x.getWaveType()==1).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
List<RmpEventDetailPO> eventDetailList = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
Map<String, List<RmpEventDetailPO>> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType()))
.collect(Collectors.groupingBy(s -> DateUtil.format(s.getStartTime(), "yyyy-MM-dd")));
Set<String> keySet = map.keySet();
LocalDate parse1 = LocalDate.parse(startTime);
LocalDate parse2 = LocalDate.parse(endTime);
while (!parse1.equals(parse2.plus(1, ChronoUnit.DAYS))){
if (keySet.contains(parse1.toString())){
List<EventDetailNew> eventDetailNews = map.get(parse1.toString());
// List<EventDetailNew> eventDetailNews = map.get(parse1.toString());
List<RmpEventDetailPO> eventDetailNews = map.get(parse1.toString());
TimeVO timeVO = new TimeVO();
timeVO.setTimes(eventDetailNews.size()+"");
if (parse1.getDayOfMonth()<10){
@@ -1351,28 +1395,65 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
@Override
public List<EventDetail> getPlot(StatisticsParam statisticsParam) {
List<EventDetail> result = new ArrayList<>();
QueryResult query = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
result = influxDBResultMapper.toPOJO(query, EventDetail.class);
HttpResult<List<DictData>> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName());
HttpResult<List<DictData>> type = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName());
List<DictData> reasonData = reason.getData();
List<DictData> typeData = type.getData();
//添加detail
for (EventDetail detail : result) {
if (detail.getWaveType() == 1) {
for (DictData data : reasonData) {
if (detail.getEventReason().equals(data.getId())) {
detail.setEventReason(data.getName());
}
// QueryResult query = MonitorQuery(statisticsParam);
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// result = influxDBResultMapper.toPOJO(query, EventDetail.class);
// //添加detail
// for (EventDetail detail : result) {
// if (detail.getWaveType() == 1) {
// for (DictData data : reasonData) {
// if (detail.getEventReason().equals(data.getId())) {
// detail.setEventReason(data.getName());
// }
// }
// for (DictData data : typeData) {
// if (detail.getEventType().equals(data.getId())) {
// detail.setEventType(data.getName());
// }
// }
// }
// }
//查询监测点未处理暂态事件
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
//获取字典属性
List<DictData> reasonData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData();
Map<String, DictData> reasonMap = reasonData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1));
List<DictData> typeData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData();
Map<String, DictData> typeMap = typeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1));
//获取电压暂降信息
DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
EventDetail eventDetailNew;
for (RmpEventDetailPO eventDetail : eventDetails) {
eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetail.class);
//监测点id
eventDetailNew.setLineId(eventDetail.getMeasurementPointId());
//持续时间
eventDetailNew.setPersistTime(eventDetail.getDuration());
//特征幅值
eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude());
//波形路径
eventDetailNew.setWaveName(eventDetail.getWavePath());
if(data.getId().equals(eventDetail.getEventType())){
if (reasonMap.containsKey(eventDetail.getEventReason())) {
//暂降原因
DictData dictData = reasonMap.get(eventDetail.getEventReason());
eventDetailNew.setEventReason(dictData.getName());
}
for (DictData data : typeData) {
if (detail.getEventType().equals(data.getId())) {
detail.setEventType(data.getName());
}
if (typeMap.containsKey(eventDetail.getEventType())) {
//事件类型
DictData dictData = typeMap.get(eventDetail.getEventType());
eventDetailNew.setEventType(dictData.getName());
}
}
result.add(eventDetailNew);
}
return result;
}

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
View File

@@ -1,9 +1,11 @@
package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.event.mapper.majornetwork.EventDetailMapper;
import com.njcn.event.pojo.po.EventDetail;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.influxdb.utils.AssembleSqlUtil;
import com.njcn.influxdb.utils.InfluxDbUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +25,7 @@ import java.util.Objects;
@Slf4j
@Service
@RequiredArgsConstructor
public class EventDetailServiceImpl implements EventDetailService {
public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEventDetailPO> implements EventDetailService {
private final InfluxDbUtils influxDbUtils;

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java
View File

@@ -882,7 +882,7 @@ public class EventReportServiceImpl implements EventReportService {
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class);
Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> x.getWaveType()==1).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> x.getWaveType()=="1").collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
Set<String> keySet = map.keySet();
LocalDate parse1 = LocalDate.parse(startTime);

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -298,7 +298,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -619,7 +619,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
View File

@@ -78,7 +78,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO r = new RStatEventMVO();
r.setEventName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -198,7 +198,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -350,7 +350,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -374,7 +374,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
View File

@@ -77,7 +77,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO r = new RStatEventMVO();
r.setEventName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -197,7 +197,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -350,7 +350,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -374,7 +374,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
View File

@@ -223,7 +223,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -375,7 +375,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -482,7 +482,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventQServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatEventQServiceImpl extends ServiceImpl<RStatEventQMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -219,7 +219,7 @@ public class RStatEventQServiceImpl extends ServiceImpl<RStatEventQMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatEventYServiceImpl extends ServiceImpl<RStatEventYMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -221,7 +221,7 @@ public class RStatEventYServiceImpl extends ServiceImpl<RStatEventYMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -514,7 +514,7 @@ public class ReportServiceImpl implements ReportService {
ArrayList<String> idlist = new ArrayList<>();
for (EventDetailNew eventDetail : info) {
for (String s : keySet) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 1) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "1") {
countMap.put(s, countMap.get(s) + 1);
}
}
@@ -581,7 +581,7 @@ public class ReportServiceImpl implements ReportService {
ArrayList<String> idlist = new ArrayList<>();
for (EventDetailNew eventDetail : info) {
for (String s : keySet) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 2) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "2") {
countMap.put(s, countMap.get(s) + 1);
}
}
@@ -648,7 +648,7 @@ public class ReportServiceImpl implements ReportService {
ArrayList<String> idlist = new ArrayList<>();
for (EventDetailNew eventDetail : info) {
for (String s : keySet) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 3) {
if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "3") {
countMap.put(s, countMap.get(s) + 1);
}
}

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
@Override
public List<RStatOrgVO> getRStatOrg(UniversalFrontEndParam param) {
//获取所有子部门信息
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
if (CollectionUtil.isEmpty(deptDTOList)) {
return Collections.emptyList();
}
@@ -130,7 +130,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
@Override
public List<RStatEventOrgVO> getRStatEventOrg(UniversalFrontEndParam param) {
//获取所有子部门信息
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
if (CollectionUtil.isEmpty(deptDTOList)) {
return Collections.emptyList();
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
View File

@@ -38,7 +38,7 @@ public class RStatHarmonicM {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgM implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgQ implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgY implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicQ implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicVoltageM {
private String voltageType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicY implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgM implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgM implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java
View File

@@ -56,7 +56,7 @@ public class RStatOrgMPO {
* 日均有效接入监测点数
*/
@TableField(value = "effective_measurement_average")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatOrgMPO {
* 日均稳态超标监测点数
*/
@TableField(value = "harmonic_measurement_average")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -110,7 +110,7 @@ public class RStatOrgMPO {
* 日均监测到暂态指标的监测点数
*/
@TableField(value = "event_measurement_average")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
/**
* 累计监测到暂态指标的监测点数

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgQ implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgQ implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgY implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgY implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
View File

@@ -20,7 +20,7 @@ public class RIconVO {
private Integer sort;
@ApiModelProperty(value ="日均监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value ="累计监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicMVO {
private String harmonicName;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicVO {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
View File

@@ -21,13 +21,13 @@ public class RStatOrgVO {
private String orgName;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;

22
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
View File

@@ -50,7 +50,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -62,7 +62,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -87,7 +87,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 频率偏差
*/
private Integer tAverage;
private Float tAverage;
private Integer tAccrued;
private Float oAverage;
private Float oAccrued;
@@ -100,7 +100,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 电压偏差
*/
private Integer tAverage1;
private Float tAverage1;
private Integer tAccrued1;
private Float oAverage1;
private Float oAccrued1;
@@ -113,7 +113,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 闪变
*/
private Integer tAverage2;
private Float tAverage2;
private Integer tAccrued2;
private Float oAverage2;
private Float oAccrued2;
@@ -126,7 +126,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 谐波电压
*/
private Integer tAverage3;
private Float tAverage3;
private Integer tAccrued3;
private Float oAverage3;
private Float oAccrued3;
@@ -139,7 +139,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*谐波电流
*/
private Integer tAverage4;
private Float tAverage4;
private Integer tAccrued4;
private Float oAverage4;
private Float oAccrued4;
@@ -153,7 +153,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*间谐波电压
*/
private Integer tAverage5;
private Float tAverage5;
private Integer tAccrued5;
private Float oAverage5;
private Float oAccrued5;
@@ -167,7 +167,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*三相电压不平衡度
*/
private Integer tAverage6;
private Float tAverage6;
private Integer tAccrued6;
private Float oAverage6;
private Float oAccrued6;
@@ -180,7 +180,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*负序电流
*/
private Integer tAverage7;
private Float tAverage7;
private Integer tAccrued7;
private Float oAverage7;
private Float oAccrued7;
@@ -193,7 +193,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*总稳态指标
*/
private Integer tAverage8;
private Float tAverage8;
private Integer tAccrued8;
private Float oAverage8;
private Float oAccrued8;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
View File

@@ -56,7 +56,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -97,7 +97,7 @@ public class RStatSubstationOrgVO implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -235,7 +235,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0f);
iconVO.setOverLimitMeasurementRatioAccrued(0f);
@@ -506,7 +506,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

8
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -214,7 +214,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -375,7 +375,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -478,7 +478,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java
View File

@@ -189,7 +189,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -343,7 +343,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -366,7 +366,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java
View File

@@ -117,7 +117,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
org = new RStatHarmonicVO();
org.setOrgNo(deptLevelVO.getCode());
org.setHarmonicType(notData.getId());
org.setOverLimitMeasurementAverage(0);
org.setOverLimitMeasurementAverage(0.0F);
org.setOverLimitMeasurementAccrued(0);
org.setAverageOverDay(0.0F);
org.setOverLimitMeasurementRatioAverage(0.0F);
@@ -227,7 +227,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
rIconVO.setOverLimitMeasurementRatioAverage(list.get(0).getOverLimitMeasurementRatioAverage());
rIconVO.setAverageOverDay(list.get(0).getAverageOverDay());
} else {
rIconVO.setOverLimitMeasurementAverage(0);
rIconVO.setOverLimitMeasurementAverage(0.0F);
rIconVO.setOverLimitMeasurementAccrued(0);
rIconVO.setOverLimitMeasurementRatioAverage(0.0F);
rIconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -308,7 +308,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
org = new RStatHarmonicVO();
org.setOrgNo(deptLevelVO.getCode());
org.setHarmonicType(notData.getId());
org.setOverLimitMeasurementAverage(0);
org.setOverLimitMeasurementAverage(0.0F);
org.setOverLimitMeasurementAccrued(0);
org.setAverageOverDay(0.0F);
org.setOverLimitMeasurementRatioAverage(0.0F);
@@ -498,7 +498,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
rIconVO.setOverLimitMeasurementRatioAverage(list.get(0).getOverLimitMeasurementRatioAverage());
rIconVO.setAverageOverDay(list.get(0).getAverageOverDay());
} else {
rIconVO.setOverLimitMeasurementAverage(0);
rIconVO.setOverLimitMeasurementAverage(0.0F);
rIconVO.setOverLimitMeasurementAccrued(0);
rIconVO.setOverLimitMeasurementRatioAverage(0.0F);
rIconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -586,7 +586,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -609,7 +609,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -221,7 +221,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -222,7 +222,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java
View File

@@ -34,4 +34,13 @@ public class HarmComprehensiveAssessJob {
lineParam.setDataSource(1);
harmonicGeneralFeignClient.generalData(lineParam);
}
@XxlJob("comprehensiveAssessHandlerToMysql")
public void comprehensiveAssessHandlerToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
harmonicGeneralFeignClient.generalDataToMysql(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java
View File

@@ -45,4 +45,13 @@ public class HarmDateToDayJob {
dayDataFeignClient.dayDataHanlder(lineParam);
}
@XxlJob("harmDateToDayJobToMysql")
public void harmDateToDayJobToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
dayDataFeignClient.dataToDayHandler(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java
View File

@@ -35,4 +35,13 @@ public class HarmIntegrityJob {
integrityFeignClient.computeDataIntegrity(lineParam);
}
@XxlJob("harmIntegrityJobToMysql")
public void harmIntegrityJobToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
integrityFeignClient.dataIntegrity(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java
View File

@@ -35,4 +35,13 @@ public class HarmKpiAssessJob {
lineParam.setDataSource(1);
harmonicMetricFeignClient.metricData(lineParam);
}
@XxlJob("kpiAssessHandlerToMysql")
public void kpiAssessHandlerToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
harmonicMetricFeignClient.metricDataToMysql(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java
View File

@@ -41,4 +41,13 @@ public class HarmLimitRateJob {
limitrateFeignClient.limitRateHanlder(lineParam);
}
@XxlJob("harmLimitRateJobToMysql")
public void harmLimitRateJobToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
limitrateFeignClient.limitRate(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java
View File

@@ -36,4 +36,13 @@ public class HarmLimitTargetJob {
limitTargetFeignClient.getLimitTargetData(lineParam);
}
@XxlJob("harmLimitTargetJobToMysql")
public void harmLimitTargetJobToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
limitTargetFeignClient.limitTargetData(lineParam);
}
}

9
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java
View File

@@ -31,4 +31,13 @@ public class HarmOnlineRateJob {
onlineRateFeignClient.getOnlineRateData(lineParam);
}
@XxlJob("harmOnlineRateJobToMysql")
public void harmOnlineRateJobToMysql(){
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataSource(2);
onlineRateFeignClient.onlineRateData(lineParam);
}
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/report",//对应controller请求类
fallbackFactory = CoustomReportFeignClientFallbackFactory.class//服务降级处理类
)

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/daydata",//对应controller请求类
fallbackFactory = DayDataFeignClientFallbackFactory.class//服务降级处理类
)
@@ -28,4 +28,7 @@ public interface DayDataFeignClient {
@PostMapping("/dayDataHanlder")
HttpResult<Boolean> dayDataHanlder(@RequestBody LineParam jobParam);
@PostMapping("/dataToDay")
HttpResult<Boolean> dataToDayHandler(@RequestBody LineParam jobParam);
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java
View File

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @createTime 2022/11/4 15:58
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,
value = ServerInfo.PREPARE_BOOT,
path = "/distortion",
fallbackFactory = DistortionRateFeignClientFallbackFactory.class
)

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java
View File

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,
value = ServerInfo.PREPARE_BOOT,
path = "/general",
fallbackFactory = DistortionRateFeignClientFallbackFactory.class
)
@@ -25,4 +25,7 @@ public interface HarmonicGeneralFeignClient {
@PostMapping("/generalData")
HttpResult<String> generalData(@RequestBody @Validated LineParam lineParam);
@PostMapping("/generalDataToMysql")
HttpResult<String> generalDataToMysql(@RequestBody @Validated LineParam lineParam);
}

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java
View File

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,
value = ServerInfo.PREPARE_BOOT,
path = "/metric",
fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class
)
@@ -24,4 +24,7 @@ public interface HarmonicMetricFeignClient {
@PostMapping("/metricData")
HttpResult<String> metricData(@RequestBody @Validated LineParam lineParam);
@PostMapping("/metricDataToMysql")
HttpResult<String> metricDataToMysql(@RequestBody @Validated LineParam lineParam);
}

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/integrity",//对应controller请求类
fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类
)
@@ -29,4 +29,7 @@ public interface IntegrityFeignClient {
@PostMapping("/computeDataIntegrity")
HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam);
@PostMapping("/dataIntegrity")
HttpResult<String> dataIntegrity(@RequestBody @Validated LineParam lineParam);
}

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/limitTarget",//对应controller请求类
fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类
)
@@ -29,4 +29,7 @@ public interface LimitTargetFeignClient {
@PostMapping("/getLimitTargetData")
HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam);
@PostMapping("/limitTargetData")
HttpResult<String> limitTargetData(@RequestBody @Validated LineParam lineParam);
}

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/limitrate",//对应controller请求类
fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类
)
@@ -26,4 +26,7 @@ public interface LimitrateFeignClient {
@PostMapping("/LimitRateHanlder")
HttpResult<Boolean> limitRateHanlder(@RequestBody LineParam limitRateHanlderParam );
@PostMapping("/LimitRate")
HttpResult<Boolean> limitRate(@RequestBody LineParam limitRateHanlderParam );
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/normalLimit",//对应controller请求类
fallbackFactory = NormalFeignClientFallbackFactory.class//服务降级处理类
)

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/onlineRate",//对应controller请求类
fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类
)
@@ -27,4 +27,7 @@ public interface OnlineRateFeignClient {
@PostMapping("/getOnlineRateData")
HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam);
@PostMapping("/onlineRateData")
HttpResult<String> onlineRateData(@RequestBody @Validated LineParam lineParam);
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java
View File

@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 自定义报表
* 污区数据（日,月,年）
* @author qijian
* @date 2022/10/20
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,//对应模块名
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/pollution",//对应controller请求类
fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类
)

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
View File

@@ -37,6 +37,12 @@ public class DayDataFeignClientFallbackFactory implements FallbackFactory<DayDat
log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Boolean> dataToDayHandler(LineParam jobParam) {
log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java
View File

@@ -35,6 +35,12 @@ public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactor
log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> generalDataToMysql(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java
View File

@@ -35,6 +35,12 @@ public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory
log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> metricDataToMysql(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
View File

@@ -34,6 +34,12 @@ public class IntegrityFeignClientFallbackFactory implements FallbackFactory<Inte
log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> dataIntegrity(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
View File

@@ -38,6 +38,12 @@ public class LimitTargetFeignClientFallbackFactory implements FallbackFactory<Li
log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> limitTargetData(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
View File

@@ -37,6 +37,12 @@ public class LimitrateFeignClientFallbackFactory implements FallbackFactory<Limi
log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Boolean> limitRate(LineParam limitRateHanlderParam) {
log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
View File

@@ -34,6 +34,12 @@ public class OnlineRateFeignClientFallbackFactory implements FallbackFactory<Onl
log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> onlineRateData(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

13
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/SuperviseDto.java Normal file
View File

@@ -0,0 +1,13 @@
package com.njcn.prepare.harmonic.pojo.dto;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SuperviseDto extends BaseParam {
@ApiModelProperty("删除的技术监督id集合")
private List<String> deleteIds;
}

10
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/UploadSuperviceTicketDto.java Normal file
View File

@@ -0,0 +1,10 @@
package com.njcn.prepare.harmonic.pojo.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class UploadSuperviceTicketDto {
@ApiModelProperty("告警/预警监测点记录id")
private String id;
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
View File

@@ -29,7 +29,7 @@ public class LineParam {
@NotBlank(message = "时间不可为空")
private String dataDate;
@ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb）")
@ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）")
@NotNull(message = "数据源不可为空")
private Integer dataSource;

9
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java
View File

@@ -1,6 +1,7 @@
package com.njcn.prepare.harmonic.pojo.param;
import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
import com.njcn.prepare.harmonic.pojo.po.ThsSupervise;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,4 +18,12 @@ public class SuperviseParam {
private String deptId;
@ApiModelProperty(name = "overRunLog", value = "监测点集合")
private List<ThsOverRunLog> overRunLog;
@ApiModelProperty(name = "supIndex", value = "技术监督Guid")
private String supIndex;
@ApiModelProperty(name = "name", value = "技术监督名称")
private String name;
@ApiModelProperty(name = "description", value = "描述")
private String description;
@ApiModelProperty(name = "thsSupervise", value = "技术监督参数")
private ThsSupervise thsSupervise;
}

44
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/27 15:20
*/
@Data
@TableName(value = "r_stat_asses_d")
public class RStatAssesDPO implements Serializable {
@MppMultiId
@TableField(value = "time_id")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@TableField(value = "vu_dev")
private Double vuDev;
@TableField(value = "freq_dev")
private Double freqDev;
@TableField(value = "data_plt")
private Double dataPlt;
@TableField(value = "v_unbalance_cp95")
private Double vUnbalanceCp95;
@TableField(value = "v_thd_cp95")
private Double vThdCp95;
}

120
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java Normal file
View File

@@ -0,0 +1,120 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/27 15:20
*/
@Data
@TableName(value = "r_stat_comasses_d")
public class RStatComassesDPO implements Serializable {
@MppMultiId
@TableField(value = "time_id")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@TableField(value = "freq_dev1")
private Double freqDev1;
@TableField(value = "freq_dev2")
private Double freqDev2;
@TableField(value = "freq_dev3")
private Double freqDev3;
@TableField(value = "freq_dev4")
private Double freqDev4;
@TableField(value = "freq_dev5")
private Double freqDev5;
@TableField(value = "vu_dev1")
private Double vuDev1;
@TableField(value = "vu_dev2")
private Double vuDev2;
@TableField(value = "vu_dev3")
private Double vuDev3;
@TableField(value = "vu_dev4")
private Double vuDev4;
@TableField(value = "vu_dev5")
private Double vuDev5;
@TableField(value = "data_pst1")
private Double dataPst1;
@TableField(value = "data_pst2")
private Double dataPst2;
@TableField(value = "data_pst3")
private Double dataPst3;
@TableField(value = "data_pst4")
private Double dataPst4;
@TableField(value = "data_pst5")
private Double dataPst5;
@TableField(value = "v_unbalance1")
private Double vUnbalance1;
@TableField(value = "v_unbalance2")
private Double vUnbalance2;
@TableField(value = "v_unbalance3")
private Double vUnbalance3;
@TableField(value = "v_unbalance4")
private Double vUnbalance4;
@TableField(value = "v_unbalance5")
private Double vUnbalance5;
@TableField(value = "v_thd1")
private Double vThd1;
@TableField(value = "v_thd2")
private Double vThd2;
@TableField(value = "v_thd3")
private Double vThd3;
@TableField(value = "v_thd4")
private Double vThd4;
@TableField(value = "v_thd5")
private Double vThd5;
@TableField(value = "event1")
private Double event1;
@TableField(value = "event2")
private Double event2;
@TableField(value = "event3")
private Double event3;
@TableField(value = "event4")
private Double event4;
@TableField(value = "event5")
private Double event5;
}

51
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java Normal file
View File

@@ -0,0 +1,51 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/22 19:07
*/
@Data
@TableName(value = "r_stat_data_flicker_d")
public class RStatDataFlickerDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "fluc")
private Double fluc;
@TableField(value = "plt")
private Double plt;
@TableField(value = "pst")
private Double pst;
}

46
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java Normal file
View File

@@ -0,0 +1,46 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 11:21
*/
@Data
@TableName(value = "r_stat_data_fluc_d")
public class RStatDataFlucDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "fluc")
private Double fluc;
@TableField(value = "fluccf")
private Double fluccf;
}

190
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java Normal file
View File

@@ -0,0 +1,190 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 11:39
*/
@Data
@TableName(value = "r_stat_data_harmphasic_i_d")
public class RStatDataHarmphasicIDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "i_1")
private Double i1;
@TableField(value = "i_2")
private Double i2;
@TableField(value = "i_3")
private Double i3;
@TableField(value = "i_4")
private Double i4;
@TableField(value = "i_5")
private Double i5;
@TableField(value = "i_6")
private Double i6;
@TableField(value = "i_7")
private Double i7;
@TableField(value = "i_8")
private Double i8;
@TableField(value = "i_9")
private Double i9;
@TableField(value = "i_10")
private Double i10;
@TableField(value = "i_11")
private Double i11;
@TableField(value = "i_12")
private Double i12;
@TableField(value = "i_13")
private Double i13;
@TableField(value = "i_14")
private Double i14;
@TableField(value = "i_15")
private Double i15;
@TableField(value = "i_16")
private Double i16;
@TableField(value = "i_17")
private Double i17;
@TableField(value = "i_18")
private Double i18;
@TableField(value = "i_19")
private Double i19;
@TableField(value = "i_20")
private Double i20;
@TableField(value = "i_21")
private Double i21;
@TableField(value = "i_22")
private Double i22;
@TableField(value = "i_23")
private Double i23;
@TableField(value = "i_24")
private Double i24;
@TableField(value = "i_25")
private Double i25;
@TableField(value = "i_26")
private Double i26;
@TableField(value = "i_27")
private Double i27;
@TableField(value = "i_28")
private Double i28;
@TableField(value = "i_29")
private Double i29;
@TableField(value = "i_30")
private Double i30;
@TableField(value = "i_31")
private Double i31;
@TableField(value = "i_32")
private Double i32;
@TableField(value = "i_33")
private Double i33;
@TableField(value = "i_34")
private Double i34;
@TableField(value = "i_35")
private Double i35;
@TableField(value = "i_36")
private Double i36;
@TableField(value = "i_37")
private Double i37;
@TableField(value = "i_38")
private Double i38;
@TableField(value = "i_39")
private Double i39;
@TableField(value = "i_40")
private Double i40;
@TableField(value = "i_41")
private Double i41;
@TableField(value = "i_42")
private Double i42;
@TableField(value = "i_43")
private Double i43;
@TableField(value = "i_44")
private Double i44;
@TableField(value = "i_45")
private Double i45;
@TableField(value = "i_46")
private Double i46;
@TableField(value = "i_47")
private Double i47;
@TableField(value = "i_48")
private Double i48;
@TableField(value = "i_49")
private Double i49;
@TableField(value = "i_50")
private Double i50;
}

190
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java Normal file
View File

@@ -0,0 +1,190 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 11:39
*/
@Data
@TableName(value = "r_stat_data_harmphasic_v_d")
public class RStatDataHarmphasicVDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "v_1")
private Double v1;
@TableField(value = "v_2")
private Double v2;
@TableField(value = "v_3")
private Double v3;
@TableField(value = "v_4")
private Double v4;
@TableField(value = "v_5")
private Double v5;
@TableField(value = "v_6")
private Double v6;
@TableField(value = "v_7")
private Double v7;
@TableField(value = "v_8")
private Double v8;
@TableField(value = "v_9")
private Double v9;
@TableField(value = "v_10")
private Double v10;
@TableField(value = "v_11")
private Double v11;
@TableField(value = "v_12")
private Double v12;
@TableField(value = "v_13")
private Double v13;
@TableField(value = "v_14")
private Double v14;
@TableField(value = "v_15")
private Double v15;
@TableField(value = "v_16")
private Double v16;
@TableField(value = "v_17")
private Double v17;
@TableField(value = "v_18")
private Double v18;
@TableField(value = "v_19")
private Double v19;
@TableField(value = "v_20")
private Double v20;
@TableField(value = "v_21")
private Double v21;
@TableField(value = "v_22")
private Double v22;
@TableField(value = "v_23")
private Double v23;
@TableField(value = "v_24")
private Double v24;
@TableField(value = "v_25")
private Double v25;
@TableField(value = "v_26")
private Double v26;
@TableField(value = "v_27")
private Double v27;
@TableField(value = "v_28")
private Double v28;
@TableField(value = "v_29")
private Double v29;
@TableField(value = "v_30")
private Double v30;
@TableField(value = "v_31")
private Double v31;
@TableField(value = "v_32")
private Double v32;
@TableField(value = "v_33")
private Double v33;
@TableField(value = "v_34")
private Double v34;
@TableField(value = "v_35")
private Double v35;
@TableField(value = "v_36")
private Double v36;
@TableField(value = "v_37")
private Double v37;
@TableField(value = "v_38")
private Double v38;
@TableField(value = "v_39")
private Double v39;
@TableField(value = "v_40")
private Double v40;
@TableField(value = "v_41")
private Double v41;
@TableField(value = "v_42")
private Double v42;
@TableField(value = "v_43")
private Double v43;
@TableField(value = "v_44")
private Double v44;
@TableField(value = "v_45")
private Double v45;
@TableField(value = "v_46")
private Double v46;
@TableField(value = "v_47")
private Double v47;
@TableField(value = "v_48")
private Double v48;
@TableField(value = "v_49")
private Double v49;
@TableField(value = "v_50")
private Double v50;
}

200
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java Normal file
View File

@@ -0,0 +1,200 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import org.influxdb.annotation.Column;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 13:31
*/
@Data
@TableName(value = "r_stat_data_harmpower_p_d")
public class RStatDataHarmpowerPDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "df")
private Double df;
@TableField(value = "pf")
private Double pf;
@TableField(value = "p")
private Double p;
@TableField(value = "p_1")
private Double p1;
@TableField(value = "p_2")
private Double p2;
@TableField(value = "p_3")
private Double p3;
@TableField(value = "p_4")
private Double p4;
@TableField(value = "p_5")
private Double p5;
@TableField(value = "p_6")
private Double p6;
@TableField(value = "p_7")
private Double p7;
@TableField(value = "p_8")
private Double p8;
@TableField(value = "p_9")
private Double p9;
@TableField(value = "p_10")
private Double p10;
@TableField(value = "p_11")
private Double p11;
@TableField(value = "p_12")
private Double p12;
@TableField(value = "p_13")
private Double p13;
@TableField(value = "p_14")
private Double p14;
@TableField(value = "p_15")
private Double p15;
@TableField(value = "p_16")
private Double p16;
@TableField(value = "p_17")
private Double p17;
@TableField(value = "p_18")
private Double p18;
@TableField(value = "p_19")
private Double p19;
@TableField(value = "p_20")
private Double p20;
@TableField(value = "p_21")
private Double p21;
@TableField(value = "p_22")
private Double p22;
@TableField(value = "p_23")
private Double p23;
@TableField(value = "p_24")
private Double p24;
@TableField(value = "p_25")
private Double p25;
@TableField(value = "p_26")
private Double p26;
@TableField(value = "p_27")
private Double p27;
@TableField(value = "p_28")
private Double p28;
@TableField(value = "p_29")
private Double p29;
@TableField(value = "p_30")
private Double p30;
@TableField(value = "p_31")
private Double p31;
@TableField(value = "p_32")
private Double p32;
@TableField(value = "p_33")
private Double p33;
@TableField(value = "p_34")
private Double p34;
@TableField(value = "p_35")
private Double p35;
@TableField(value = "p_36")
private Double p36;
@TableField(value = "p_37")
private Double p37;
@TableField(value = "p_38")
private Double p38;
@TableField(value = "p_39")
private Double p39;
@TableField(value = "p_40")
private Double p40;
@TableField(value = "p_41")
private Double p41;
@TableField(value = "p_42")
private Double p42;
@TableField(value = "p_43")
private Double p43;
@TableField(value = "p_44")
private Double p44;
@TableField(value = "p_45")
private Double p45;
@TableField(value = "p_46")
private Double p46;
@TableField(value = "p_47")
private Double p47;
@TableField(value = "p_48")
private Double p48;
@TableField(value = "p_49")
private Double p49;
@TableField(value = "p_50")
private Double p50;
}

193
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java Normal file
View File

@@ -0,0 +1,193 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 13:31
*/
@Data
@TableName(value = "r_stat_data_harmpower_q_d")
public class RStatDataHarmpowerQDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "q")
private Double q;
@TableField(value = "q_1")
private Double q1;
@TableField(value = "q_2")
private Double q2;
@TableField(value = "q_3")
private Double q3;
@TableField(value = "q_4")
private Double q4;
@TableField(value = "q_5")
private Double q5;
@TableField(value = "q_6")
private Double q6;
@TableField(value = "q_7")
private Double q7;
@TableField(value = "q_8")
private Double q8;
@TableField(value = "q_9")
private Double q9;
@TableField(value = "q_10")
private Double q10;
@TableField(value = "q_11")
private Double q11;
@TableField(value = "q_12")
private Double q12;
@TableField(value = "q_13")
private Double q13;
@TableField(value = "q_14")
private Double q14;
@TableField(value = "q_15")
private Double q15;
@TableField(value = "q_16")
private Double q16;
@TableField(value = "q_17")
private Double q17;
@TableField(value = "q_18")
private Double q18;
@TableField(value = "q_19")
private Double q19;
@TableField(value = "q_20")
private Double q20;
@TableField(value = "q_21")
private Double q21;
@TableField(value = "q_22")
private Double q22;
@TableField(value = "q_23")
private Double q23;
@TableField(value = "q_24")
private Double q24;
@TableField(value = "q_25")
private Double q25;
@TableField(value = "q_26")
private Double q26;
@TableField(value = "q_27")
private Double q27;
@TableField(value = "q_28")
private Double q28;
@TableField(value = "q_29")
private Double q29;
@TableField(value = "q_30")
private Double q30;
@TableField(value = "q_31")
private Double q31;
@TableField(value = "q_32")
private Double q32;
@TableField(value = "q_33")
private Double q33;
@TableField(value = "q_34")
private Double q34;
@TableField(value = "q_35")
private Double q35;
@TableField(value = "q_36")
private Double q36;
@TableField(value = "q_37")
private Double q37;
@TableField(value = "q_38")
private Double q38;
@TableField(value = "q_39")
private Double q39;
@TableField(value = "q_40")
private Double q40;
@TableField(value = "q_41")
private Double q41;
@TableField(value = "q_42")
private Double q42;
@TableField(value = "q_43")
private Double q43;
@TableField(value = "q_44")
private Double q44;
@TableField(value = "q_45")
private Double q45;
@TableField(value = "q_46")
private Double q46;
@TableField(value = "q_47")
private Double q47;
@TableField(value = "q_48")
private Double q48;
@TableField(value = "q_49")
private Double q49;
@TableField(value = "q_50")
private Double q50;
}

193
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java Normal file
View File

@@ -0,0 +1,193 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 13:31
*/
@Data
@TableName(value = "r_stat_data_harmpower_s_d")
public class RStatDataHarmpowerSDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "s")
private Double s;
@TableField(value = "s_1")
private Double s1;
@TableField(value = "s_2")
private Double s2;
@TableField(value = "s_3")
private Double s3;
@TableField(value = "s_4")
private Double s4;
@TableField(value = "s_5")
private Double s5;
@TableField(value = "s_6")
private Double s6;
@TableField(value = "s_7")
private Double s7;
@TableField(value = "s_8")
private Double s8;
@TableField(value = "s_9")
private Double s9;
@TableField(value = "s_10")
private Double s10;
@TableField(value = "s_11")
private Double s11;
@TableField(value = "s_12")
private Double s12;
@TableField(value = "s_13")
private Double s13;
@TableField(value = "s_14")
private Double s14;
@TableField(value = "s_15")
private Double s15;
@TableField(value = "s_16")
private Double s16;
@TableField(value = "s_17")
private Double s17;
@TableField(value = "s_18")
private Double s18;
@TableField(value = "s_19")
private Double s19;
@TableField(value = "s_20")
private Double s20;
@TableField(value = "s_21")
private Double s21;
@TableField(value = "s_22")
private Double s22;
@TableField(value = "s_23")
private Double s23;
@TableField(value = "s_24")
private Double s24;
@TableField(value = "s_25")
private Double s25;
@TableField(value = "s_26")
private Double s26;
@TableField(value = "s_27")
private Double s27;
@TableField(value = "s_28")
private Double s28;
@TableField(value = "s_29")
private Double s29;
@TableField(value = "s_30")
private Double s30;
@TableField(value = "s_31")
private Double s31;
@TableField(value = "s_32")
private Double s32;
@TableField(value = "s_33")
private Double s33;
@TableField(value = "s_34")
private Double s34;
@TableField(value = "s_35")
private Double s35;
@TableField(value = "s_36")
private Double s36;
@TableField(value = "s_37")
private Double s37;
@TableField(value = "s_38")
private Double s38;
@TableField(value = "s_39")
private Double s39;
@TableField(value = "s_40")
private Double s40;
@TableField(value = "s_41")
private Double s41;
@TableField(value = "s_42")
private Double s42;
@TableField(value = "s_43")
private Double s43;
@TableField(value = "s_44")
private Double s44;
@TableField(value = "s_45")
private Double s45;
@TableField(value = "s_46")
private Double s46;
@TableField(value = "s_47")
private Double s47;
@TableField(value = "s_48")
private Double s48;
@TableField(value = "s_49")
private Double s49;
@TableField(value = "s_50")
private Double s50;
}

191
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java Normal file
View File

@@ -0,0 +1,191 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 14:18
*/
@Data
@TableName(value = "r_stat_data_harmrate_i_d")
public class RStatDataHarmrateIDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "i_1")
private Double i1;
@TableField(value = "i_2")
private Double i2;
@TableField(value = "i_3")
private Double i3;
@TableField(value = "i_4")
private Double i4;
@TableField(value = "i_5")
private Double i5;
@TableField(value = "i_6")
private Double i6;
@TableField(value = "i_7")
private Double i7;
@TableField(value = "i_8")
private Double i8;
@TableField(value = "i_9")
private Double i9;
@TableField(value = "i_10")
private Double i10;
@TableField(value = "i_11")
private Double i11;
@TableField(value = "i_12")
private Double i12;
@TableField(value = "i_13")
private Double i13;
@TableField(value = "i_14")
private Double i14;
@TableField(value = "i_15")
private Double i15;
@TableField(value = "i_16")
private Double i16;
@TableField(value = "i_17")
private Double i17;
@TableField(value = "i_18")
private Double i18;
@TableField(value = "i_19")
private Double i19;
@TableField(value = "i_20")
private Double i20;
@TableField(value = "i_21")
private Double i21;
@TableField(value = "i_22")
private Double i22;
@TableField(value = "i_23")
private Double i23;
@TableField(value = "i_24")
private Double i24;
@TableField(value = "i_25")
private Double i25;
@TableField(value = "i_26")
private Double i26;
@TableField(value = "i_27")
private Double i27;
@TableField(value = "i_28")
private Double i28;
@TableField(value = "i_29")
private Double i29;
@TableField(value = "i_30")
private Double i30;
@TableField(value = "i_31")
private Double i31;
@TableField(value = "i_32")
private Double i32;
@TableField(value = "i_33")
private Double i33;
@TableField(value = "i_34")
private Double i34;
@TableField(value = "i_35")
private Double i35;
@TableField(value = "i_36")
private Double i36;
@TableField(value = "i_37")
private Double i37;
@TableField(value = "i_38")
private Double i38;
@TableField(value = "i_39")
private Double i39;
@TableField(value = "i_40")
private Double i40;
@TableField(value = "i_41")
private Double i41;
@TableField(value = "i_42")
private Double i42;
@TableField(value = "i_43")
private Double i43;
@TableField(value = "i_44")
private Double i44;
@TableField(value = "i_45")
private Double i45;
@TableField(value = "i_46")
private Double i46;
@TableField(value = "i_47")
private Double i47;
@TableField(value = "i_48")
private Double i48;
@TableField(value = "i_49")
private Double i49;
@TableField(value = "i_50")
private Double i50;
}

191
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java Normal file
View File

@@ -0,0 +1,191 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 14:18
*/
@Data
@TableName(value = "r_stat_data_harmrate_v_d")
public class RStatDataHarmrateVDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "v_1")
private Double v1;
@TableField(value = "v_2")
private Double v2;
@TableField(value = "v_3")
private Double v3;
@TableField(value = "v_4")
private Double v4;
@TableField(value = "v_5")
private Double v5;
@TableField(value = "v_6")
private Double v6;
@TableField(value = "v_7")
private Double v7;
@TableField(value = "v_8")
private Double v8;
@TableField(value = "v_9")
private Double v9;
@TableField(value = "v_10")
private Double v10;
@TableField(value = "v_11")
private Double v11;
@TableField(value = "v_12")
private Double v12;
@TableField(value = "v_13")
private Double v13;
@TableField(value = "v_14")
private Double v14;
@TableField(value = "v_15")
private Double v15;
@TableField(value = "v_16")
private Double v16;
@TableField(value = "v_17")
private Double v17;
@TableField(value = "v_18")
private Double v18;
@TableField(value = "v_19")
private Double v19;
@TableField(value = "v_20")
private Double v20;
@TableField(value = "v_21")
private Double v21;
@TableField(value = "v_22")
private Double v22;
@TableField(value = "v_23")
private Double v23;
@TableField(value = "v_24")
private Double v24;
@TableField(value = "v_25")
private Double v25;
@TableField(value = "v_26")
private Double v26;
@TableField(value = "v_27")
private Double v27;
@TableField(value = "v_28")
private Double v28;
@TableField(value = "v_29")
private Double v29;
@TableField(value = "v_30")
private Double v30;
@TableField(value = "v_31")
private Double v31;
@TableField(value = "v_32")
private Double v32;
@TableField(value = "v_33")
private Double v33;
@TableField(value = "v_34")
private Double v34;
@TableField(value = "v_35")
private Double v35;
@TableField(value = "v_36")
private Double v36;
@TableField(value = "v_37")
private Double v37;
@TableField(value = "v_38")
private Double v38;
@TableField(value = "v_39")
private Double v39;
@TableField(value = "v_40")
private Double v40;
@TableField(value = "v_41")
private Double v41;
@TableField(value = "v_42")
private Double v42;
@TableField(value = "v_43")
private Double v43;
@TableField(value = "v_44")
private Double v44;
@TableField(value = "v_45")
private Double v45;
@TableField(value = "v_46")
private Double v46;
@TableField(value = "v_47")
private Double v47;
@TableField(value = "v_48")
private Double v48;
@TableField(value = "v_49")
private Double v49;
@TableField(value = "v_50")
private Double v50;
}

209
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java Normal file
View File

@@ -0,0 +1,209 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 14:29
*/
@Data
@TableName(value = "r_stat_data_i_d")
public class RStatDataIDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "i_neg")
private Double iNeg;
@TableField(value = "i_pos")
private Double iPos;
@TableField(value = "i_thd")
private Double iThd;
@TableField(value = "i_unbalance")
private Double iUnbalance;
@TableField(value = "i_zero")
private Double iZero;
@TableField(value = "rms")
private Double rms;
@TableField(value = "i_1")
private Double i1;
@TableField(value = "i_2")
private Double i2;
@TableField(value = "i_3")
private Double i3;
@TableField(value = "i_4")
private Double i4;
@TableField(value = "i_5")
private Double i5;
@TableField(value = "i_6")
private Double i6;
@TableField(value = "i_7")
private Double i7;
@TableField(value = "i_8")
private Double i8;
@TableField(value = "i_9")
private Double i9;
@TableField(value = "i_10")
private Double i10;
@TableField(value = "i_11")
private Double i11;
@TableField(value = "i_12")
private Double i12;
@TableField(value = "i_13")
private Double i13;
@TableField(value = "i_14")
private Double i14;
@TableField(value = "i_15")
private Double i15;
@TableField(value = "i_16")
private Double i16;
@TableField(value = "i_17")
private Double i17;
@TableField(value = "i_18")
private Double i18;
@TableField(value = "i_19")
private Double i19;
@TableField(value = "i_20")
private Double i20;
@TableField(value = "i_21")
private Double i21;
@TableField(value = "i_22")
private Double i22;
@TableField(value = "i_23")
private Double i23;
@TableField(value = "i_24")
private Double i24;
@TableField(value = "i_25")
private Double i25;
@TableField(value = "i_26")
private Double i26;
@TableField(value = "i_27")
private Double i27;
@TableField(value = "i_28")
private Double i28;
@TableField(value = "i_29")
private Double i29;
@TableField(value = "i_30")
private Double i30;
@TableField(value = "i_31")
private Double i31;
@TableField(value = "i_32")
private Double i32;
@TableField(value = "i_33")
private Double i33;
@TableField(value = "i_34")
private Double i34;
@TableField(value = "i_35")
private Double i35;
@TableField(value = "i_36")
private Double i36;
@TableField(value = "i_37")
private Double i37;
@TableField(value = "i_38")
private Double i38;
@TableField(value = "i_39")
private Double i39;
@TableField(value = "i_40")
private Double i40;
@TableField(value = "i_41")
private Double i41;
@TableField(value = "i_42")
private Double i42;
@TableField(value = "i_43")
private Double i43;
@TableField(value = "i_44")
private Double i44;
@TableField(value = "i_45")
private Double i45;
@TableField(value = "i_46")
private Double i46;
@TableField(value = "i_47")
private Double i47;
@TableField(value = "i_48")
private Double i48;
@TableField(value = "i_49")
private Double i49;
@TableField(value = "i_50")
private Double i50;
}

191
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java Normal file
View File

@@ -0,0 +1,191 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 14:36
*/
@Data
@TableName(value = "r_stat_data_inharm_i_d")
public class RStatDataInharmIDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "i_1")
private Double i1;
@TableField(value = "i_2")
private Double i2;
@TableField(value = "i_3")
private Double i3;
@TableField(value = "i_4")
private Double i4;
@TableField(value = "i_5")
private Double i5;
@TableField(value = "i_6")
private Double i6;
@TableField(value = "i_7")
private Double i7;
@TableField(value = "i_8")
private Double i8;
@TableField(value = "i_9")
private Double i9;
@TableField(value = "i_10")
private Double i10;
@TableField(value = "i_11")
private Double i11;
@TableField(value = "i_12")
private Double i12;
@TableField(value = "i_13")
private Double i13;
@TableField(value = "i_14")
private Double i14;
@TableField(value = "i_15")
private Double i15;
@TableField(value = "i_16")
private Double i16;
@TableField(value = "i_17")
private Double i17;
@TableField(value = "i_18")
private Double i18;
@TableField(value = "i_19")
private Double i19;
@TableField(value = "i_20")
private Double i20;
@TableField(value = "i_21")
private Double i21;
@TableField(value = "i_22")
private Double i22;
@TableField(value = "i_23")
private Double i23;
@TableField(value = "i_24")
private Double i24;
@TableField(value = "i_25")
private Double i25;
@TableField(value = "i_26")
private Double i26;
@TableField(value = "i_27")
private Double i27;
@TableField(value = "i_28")
private Double i28;
@TableField(value = "i_29")
private Double i29;
@TableField(value = "i_30")
private Double i30;
@TableField(value = "i_31")
private Double i31;
@TableField(value = "i_32")
private Double i32;
@TableField(value = "i_33")
private Double i33;
@TableField(value = "i_34")
private Double i34;
@TableField(value = "i_35")
private Double i35;
@TableField(value = "i_36")
private Double i36;
@TableField(value = "i_37")
private Double i37;
@TableField(value = "i_38")
private Double i38;
@TableField(value = "i_39")
private Double i39;
@TableField(value = "i_40")
private Double i40;
@TableField(value = "i_41")
private Double i41;
@TableField(value = "i_42")
private Double i42;
@TableField(value = "i_43")
private Double i43;
@TableField(value = "i_44")
private Double i44;
@TableField(value = "i_45")
private Double i45;
@TableField(value = "i_46")
private Double i46;
@TableField(value = "i_47")
private Double i47;
@TableField(value = "i_48")
private Double i48;
@TableField(value = "i_49")
private Double i49;
@TableField(value = "i_50")
private Double i50;
}

191
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java Normal file
View File

@@ -0,0 +1,191 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/3/24 14:36
*/
@Data
@TableName(value = "r_stat_data_inharm_v_d")
public class RStatDataInharmVDPO implements Serializable {
@MppMultiId
@TableField(value = "time")
private Date time;
@MppMultiId
@TableField(value = "line_id")
private String lineId;
@MppMultiId
@TableField(value = "phasic_type")
private String phaseType;
@MppMultiId
@TableField(value = "value_type")
private String valueType;
@TableField(value = "quality_flag")
private Integer qualityFlag;
@TableField(value = "v_1")
private Double v1;
@TableField(value = "v_2")
private Double v2;
@TableField(value = "v_3")
private Double v3;
@TableField(value = "v_4")
private Double v4;
@TableField(value = "v_5")
private Double v5;
@TableField(value = "v_6")
private Double v6;
@TableField(value = "v_7")
private Double v7;
@TableField(value = "v_8")
private Double v8;
@TableField(value = "v_9")
private Double v9;
@TableField(value = "v_10")
private Double v10;
@TableField(value = "v_11")
private Double v11;
@TableField(value = "v_12")
private Double v12;
@TableField(value = "v_13")
private Double v13;
@TableField(value = "v_14")
private Double v14;
@TableField(value = "v_15")
private Double v15;
@TableField(value = "v_16")
private Double v16;
@TableField(value = "v_17")
private Double v17;
@TableField(value = "v_18")
private Double v18;
@TableField(value = "v_19")
private Double v19;
@TableField(value = "v_20")
private Double v20;
@TableField(value = "v_21")
private Double v21;
@TableField(value = "v_22")
private Double v22;
@TableField(value = "v_23")
private Double v23;
@TableField(value = "v_24")
private Double v24;
@TableField(value = "v_25")
private Double v25;
@TableField(value = "v_26")
private Double v26;
@TableField(value = "v_27")
private Double v27;
@TableField(value = "v_28")
private Double v28;
@TableField(value = "v_29")
private Double v29;
@TableField(value = "v_30")
private Double v30;
@TableField(value = "v_31")
private Double v31;
@TableField(value = "v_32")
private Double v32;
@TableField(value = "v_33")
private Double v33;
@TableField(value = "v_34")
private Double v34;
@TableField(value = "v_35")
private Double v35;
@TableField(value = "v_36")
private Double v36;
@TableField(value = "v_37")
private Double v37;
@TableField(value = "v_38")
private Double v38;
@TableField(value = "v_39")
private Double v39;
@TableField(value = "v_40")
private Double v40;
@TableField(value = "v_41")
private Double v41;
@TableField(value = "v_42")
private Double v42;
@TableField(value = "v_43")
private Double v43;
@TableField(value = "v_44")
private Double v44;
@TableField(value = "v_45")
private Double v45;
@TableField(value = "v_46")
private Double v46;
@TableField(value = "v_47")
private Double v47;
@TableField(value = "v_48")
private Double v48;
@TableField(value = "v_49")
private Double v49;
@TableField(value = "v_50")
private Double v50;
}

Some files were not shown because too many files have changed in this diff Show More