调度任务
This commit is contained in:
@@ -95,7 +95,7 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
*/
|
*/
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
private List<HistoryHarmOverLimitVO> getMyCondition(String startTime, String endTime, List<String> lineId, String contion, int[] number, int[] inharm) {
|
private List<HistoryHarmOverLimitVO> getMyCondition(String startTime, String endTime, List<String> lineId, String contion, int[] number, int[] inharm) {
|
||||||
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOList = new ArrayList<>();
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListData = new ArrayList<>();
|
||||||
//数据的转化
|
//数据的转化
|
||||||
String targetName;//指标名称
|
String targetName;//指标名称
|
||||||
String unit;//单位
|
String unit;//单位
|
||||||
@@ -104,75 +104,70 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
case 12:
|
case 12:
|
||||||
targetName = "电压偏差";
|
targetName = "电压偏差";
|
||||||
unit = "%";
|
unit = "%";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getDyPc(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOList = normLimitMapper.getDyPc(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getMinData()) ? 3 : 2);
|
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getMinData()) ? 3 : 2);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 13:
|
case 13:
|
||||||
targetName = "三相电压不平衡度";
|
targetName = "三相电压不平衡度";
|
||||||
unit = "/";
|
unit = "/";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getSxBpHd(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListS = normLimitMapper.getSxBpHd(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListS) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getCp95Data()) ? 3 : 4);
|
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getCp95Data()) ? 3 : 4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 15:
|
case 15:
|
||||||
targetName = "电压总谐波畸变率";
|
targetName = "电压总谐波畸变率";
|
||||||
unit = "%";
|
unit = "%";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getDyZjBl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListD = normLimitMapper.getDyZjBl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListD) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(4);
|
historyHarmOverLimitVO.setStatisticalType(4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 22:
|
case 22:
|
||||||
targetName = "负序电流";
|
targetName = "负序电流";
|
||||||
unit = "/";
|
unit = "/";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getFxDl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListF = normLimitMapper.getFxDl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListF) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getCp95Data()) ? 3 : 4);
|
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getCp95Data()) ? 3 : 4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 30:
|
case 30:
|
||||||
targetName = "频率";
|
targetName = "频率";
|
||||||
unit = "Hz";
|
unit = "Hz";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getPl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListP = normLimitMapper.getPl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListP) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getMinData()) ? 3 : 2);
|
historyHarmOverLimitVO.setStatisticalType(Math.abs(historyHarmOverLimitVO.getMaxData()) > Math.abs(historyHarmOverLimitVO.getMinData()) ? 3 : 2);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -180,16 +175,15 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
targetName = "谐波电压含有率";
|
targetName = "谐波电压含有率";
|
||||||
unit = "%";
|
unit = "%";
|
||||||
for (int i : number) {
|
for (int i : number) {
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getXbDyHyl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListX = normLimitMapper.getXbDyHyl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListX) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setNumber(i);
|
historyHarmOverLimitVO.setNumber(i);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(4);
|
historyHarmOverLimitVO.setStatisticalType(4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -198,16 +192,15 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
targetName = "谐波电流幅值";
|
targetName = "谐波电流幅值";
|
||||||
unit = "A";
|
unit = "A";
|
||||||
for (int i : number) {
|
for (int i : number) {
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getXbDlFz(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListQ = normLimitMapper.getXbDlFz(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListQ) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setNumber(i);
|
historyHarmOverLimitVO.setNumber(i);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(4);
|
historyHarmOverLimitVO.setStatisticalType(4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -216,16 +209,15 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
targetName = "间谐波电压含有率";
|
targetName = "间谐波电压含有率";
|
||||||
unit = "%";
|
unit = "%";
|
||||||
for (int i : inharm) {
|
for (int i : inharm) {
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getJxbHyl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListJ = normLimitMapper.getJxbHyl(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)), i);
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListJ) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159 && historyHarmOverLimitVO.getMaxData() == -3.14159 && historyHarmOverLimitVO.getMinData() == -3.14159 && historyHarmOverLimitVO.getCp95Data() == -3.14159) {
|
if (historyHarmOverLimitVO.getMaxData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setNumber(i);
|
historyHarmOverLimitVO.setNumber(i);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(4);
|
historyHarmOverLimitVO.setStatisticalType(4);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -234,11 +226,9 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
//长时闪变
|
//长时闪变
|
||||||
targetName = "长时闪变";
|
targetName = "长时闪变";
|
||||||
unit = "/";
|
unit = "/";
|
||||||
historyHarmOverLimitVOList = normLimitMapper.getCsSb(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
List<HistoryHarmOverLimitVO> historyHarmOverLimitVOListC = normLimitMapper.getCsSb(lineId, DateUtil.beginOfDay(DateUtil.parse(startTime)), DateUtil.endOfDay(DateUtil.parse(endTime)));
|
||||||
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOList) {
|
for (HistoryHarmOverLimitVO historyHarmOverLimitVO : historyHarmOverLimitVOListC) {
|
||||||
if (historyHarmOverLimitVO.getAvgData() == -3.14159) {
|
if (historyHarmOverLimitVO.getAvgData() != -3.14159f) {
|
||||||
historyHarmOverLimitVOList.remove(historyHarmOverLimitVO);
|
|
||||||
} else {
|
|
||||||
historyHarmOverLimitVO.setTargetName(targetName);
|
historyHarmOverLimitVO.setTargetName(targetName);
|
||||||
historyHarmOverLimitVO.setUnit(unit);
|
historyHarmOverLimitVO.setUnit(unit);
|
||||||
historyHarmOverLimitVO.setMaxData(3.14159f);
|
historyHarmOverLimitVO.setMaxData(3.14159f);
|
||||||
@@ -246,6 +236,7 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
historyHarmOverLimitVO.setCp95Data(3.14159f);
|
historyHarmOverLimitVO.setCp95Data(3.14159f);
|
||||||
historyHarmOverLimitVO.setTargetCode(contion);
|
historyHarmOverLimitVO.setTargetCode(contion);
|
||||||
historyHarmOverLimitVO.setStatisticalType(1);
|
historyHarmOverLimitVO.setStatisticalType(1);
|
||||||
|
historyHarmOverLimitVOListData.add(historyHarmOverLimitVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -253,8 +244,8 @@ public class NormLimitServiceImpl implements NormLimitService {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return historyHarmOverLimitVOList;
|
return historyHarmOverLimitVOListData;
|
||||||
}
|
}
|
||||||
return historyHarmOverLimitVOList;
|
return historyHarmOverLimitVOListData;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,6 +66,19 @@
|
|||||||
<artifactId>harmonic-prepare</artifactId>
|
<artifactId>harmonic-prepare</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.njcn</groupId>
|
||||||
|
<artifactId>harmonic-prepare</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.njcn</groupId>
|
||||||
|
<artifactId>common-swagger</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@@ -146,4 +159,4 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
|
|
||||||
import cn.hutool.core.date.DateUtil;
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.common.pojo.constant.BizParamConstant;
|
|
||||||
import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
|
import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.context.XxlJobHelper;
|
import com.xxl.job.core.context.XxlJobHelper;
|
||||||
@@ -12,10 +11,6 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pqs
|
* pqs
|
||||||
@@ -33,41 +28,13 @@ public class HarmCustomReportJob {
|
|||||||
@XxlJob("harmCustomReportHandler")
|
@XxlJob("harmCustomReportHandler")
|
||||||
public void harmCustomReportHandler(){
|
public void harmCustomReportHandler(){
|
||||||
long a = System.currentTimeMillis();
|
long a = System.currentTimeMillis();
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
||||||
|
|
||||||
String command = XxlJobHelper.getJobParam();
|
String command = XxlJobHelper.getJobParam();
|
||||||
LineParam lineParam = new LineParam();
|
LineParam lineParam = new LineParam();
|
||||||
lineParam.setType(Integer.valueOf(command));
|
lineParam.setType(Integer.valueOf(command));
|
||||||
|
|
||||||
String date = null;
|
String date = CommonExecutorUtils.prepareTimeDeal(command);
|
||||||
|
//date = "2022-10-26";
|
||||||
if(command.equals(BizParamConstant.STAT_BIZ_YEAR)){
|
|
||||||
//年
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.add(Calendar.YEAR,-1);
|
|
||||||
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
|
||||||
} else if(command.equals(BizParamConstant.STAT_BIZ_MONTH)){
|
|
||||||
//月
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.add(Calendar.MONTH,-1);
|
|
||||||
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
|
||||||
}else if(command.equals(BizParamConstant.STAT_BIZ_QUARTER)){
|
|
||||||
//季度
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.add(Calendar.MONTH,-3);
|
|
||||||
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
|
||||||
}else if(command.equals(BizParamConstant.STAT_BIZ_WEEK)){
|
|
||||||
//周
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.add(Calendar.WEEK_OF_MONTH,-1);
|
|
||||||
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
|
||||||
}else if(command.equals(BizParamConstant.STAT_BIZ_DAY)){
|
|
||||||
//天
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.add(Calendar.DAY_OF_MONTH,-1);
|
|
||||||
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
|
||||||
}
|
|
||||||
//date = "2022-10-27";
|
|
||||||
lineParam.setDataDate(date);
|
lineParam.setDataDate(date);
|
||||||
coustmReportFeignClient.batchReport(lineParam);
|
coustmReportFeignClient.batchReport(lineParam);
|
||||||
long b = System.currentTimeMillis();
|
long b = System.currentTimeMillis();
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package com.njcn.executor.handler;
|
|||||||
|
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
|
import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
@@ -32,21 +34,14 @@ public class HarmDateToDayJob {
|
|||||||
@XxlJob("harmDateToDayJob")
|
@XxlJob("harmDateToDayJob")
|
||||||
public void harmDateToDayJob(){
|
public void harmDateToDayJob(){
|
||||||
|
|
||||||
long a = System.currentTimeMillis();
|
|
||||||
LocalDateTime localDateTime = LocalDateTime.now().minusDays(1);
|
|
||||||
String startTime = LocalDateTimeUtil.beginOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
||||||
String endTime = LocalDateTimeUtil.endOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
||||||
|
|
||||||
//下面两行测试数据部署需删除
|
LineParam lineParam = new LineParam();
|
||||||
//startTime = "2022-10-27 00:00:00";
|
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
|
||||||
//endTime = "2022-10-27 23:59:59";
|
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
|
||||||
|
|
||||||
LimitRateHanlderParam limitRateHanlderParam = new LimitRateHanlderParam();
|
//下面测试数据部署需删除
|
||||||
limitRateHanlderParam.setStartTime(startTime);
|
//lineParam.setDataDate("2022-10-27");
|
||||||
limitRateHanlderParam.setEndTime(endTime);
|
dayDataFeignClient.dayDataHanlder(lineParam);
|
||||||
dayDataFeignClient.dayDataHanlder(limitRateHanlderParam);
|
|
||||||
long b = System.currentTimeMillis();
|
|
||||||
log.info("时间"+endTime+"执行时间"+(b-a)/1000+"\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient;
|
import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.context.XxlJobHelper;
|
import com.xxl.job.core.context.XxlJobHelper;
|
||||||
@@ -26,16 +28,9 @@ public class HarmIntegrityJob {
|
|||||||
|
|
||||||
@XxlJob("harmIntegrityJob")
|
@XxlJob("harmIntegrityJob")
|
||||||
public void harmIntegrityJob(){
|
public void harmIntegrityJob(){
|
||||||
|
|
||||||
|
|
||||||
LineParam lineParam = new LineParam();
|
LineParam lineParam = new LineParam();
|
||||||
lineParam.setType(5);
|
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
|
||||||
String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
|
||||||
|
|
||||||
//date = "2022-10-28";
|
|
||||||
lineParam.setDataDate(date);
|
|
||||||
|
|
||||||
|
|
||||||
integrityFeignClient.computeDataIntegrity(lineParam);
|
integrityFeignClient.computeDataIntegrity(lineParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
|
import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
||||||
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -26,18 +29,15 @@ public class HarmLimitRateJob {
|
|||||||
|
|
||||||
@XxlJob("harmLimitRateJob")
|
@XxlJob("harmLimitRateJob")
|
||||||
public void harmLimitRateJob(){
|
public void harmLimitRateJob(){
|
||||||
LocalDateTime localDateTime = LocalDateTime.now().minusDays(1);
|
|
||||||
String startTime = LocalDateTimeUtil.beginOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
||||||
String endTime = LocalDateTimeUtil.endOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
||||||
|
|
||||||
//下面两行测试数据部署需删除
|
|
||||||
//startTime = "2022-10-27 00:00:00";
|
|
||||||
//endTime = "2022-10-27 23:59:59";
|
|
||||||
|
|
||||||
LimitRateHanlderParam limitRateHanlderParam = new LimitRateHanlderParam();
|
LineParam lineParam = new LineParam();
|
||||||
limitRateHanlderParam.setStartTime(startTime);
|
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
|
||||||
limitRateHanlderParam.setEndTime(endTime);
|
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
|
||||||
limitrateFeignClient.limitRateHanlder(limitRateHanlderParam);
|
|
||||||
|
//下面测试数据部署需删除
|
||||||
|
//lineParam.setDataDate("2022-10-26");
|
||||||
|
limitrateFeignClient.limitRateHanlder(lineParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient;
|
import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||||
@@ -25,10 +27,9 @@ public class HarmLimitTargetJob {
|
|||||||
|
|
||||||
@XxlJob("harmLimitTargetJob")
|
@XxlJob("harmLimitTargetJob")
|
||||||
public void harmLimitTargetJob(){
|
public void harmLimitTargetJob(){
|
||||||
String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
||||||
LineParam lineParam = new LineParam();
|
LineParam lineParam = new LineParam();
|
||||||
lineParam.setType(5);
|
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
|
||||||
lineParam.setDataDate(date);
|
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
|
||||||
|
|
||||||
//lineParam.setDataDate("2022-10-27");
|
//lineParam.setDataDate("2022-10-27");
|
||||||
limitTargetFeignClient.getLimitTargetData(lineParam);
|
limitTargetFeignClient.getLimitTargetData(lineParam);
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient;
|
import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||||
@@ -23,7 +25,8 @@ public class HarmOnlineRateJob {
|
|||||||
@XxlJob("harmOnlineRateJob")
|
@XxlJob("harmOnlineRateJob")
|
||||||
public void harmOnlineRateJob(){
|
public void harmOnlineRateJob(){
|
||||||
LineParam lineParam = new LineParam();
|
LineParam lineParam = new LineParam();
|
||||||
lineParam.setType(5);
|
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
|
||||||
|
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
|
||||||
onlineRateFeignClient.getOnlineRateData(lineParam);
|
onlineRateFeignClient.getOnlineRateData(lineParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
package com.njcn.executor.handler;
|
package com.njcn.executor.handler;
|
||||||
|
|
||||||
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import com.njcn.executor.utils.CommonExecutorUtils;
|
||||||
import com.njcn.prepare.harmonic.api.line.PollutionFeignClient;
|
import com.njcn.prepare.harmonic.api.line.PollutionFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import com.xxl.job.core.context.XxlJobHelper;
|
import com.xxl.job.core.context.XxlJobHelper;
|
||||||
@@ -8,8 +11,10 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.Calendar;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 污区数据
|
* 污区数据
|
||||||
@@ -23,25 +28,17 @@ public class HarmPollutionJob {
|
|||||||
|
|
||||||
@XxlJob("harmPollutionJob")
|
@XxlJob("harmPollutionJob")
|
||||||
public void harmPollutionJob(){
|
public void harmPollutionJob(){
|
||||||
long a = System.currentTimeMillis();
|
|
||||||
|
|
||||||
String command = XxlJobHelper.getJobParam();
|
String command = XxlJobHelper.getJobParam();
|
||||||
|
|
||||||
LineParam lineParam = new LineParam();
|
LineParam lineParam = new LineParam();
|
||||||
lineParam.setType(Integer.valueOf(command));
|
lineParam.setType(Integer.valueOf(command));
|
||||||
String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
||||||
|
|
||||||
|
String date = CommonExecutorUtils.prepareTimeDeal(command);
|
||||||
log.info("执行日期harmPollutionJob。。。。。。。。。。"+date);
|
log.info("执行日期harmPollutionJob。。。。。。。。。。"+date);
|
||||||
|
|
||||||
/**
|
//测试数据部署时注释
|
||||||
* 测试数据部署时注释
|
|
||||||
*/
|
|
||||||
//date = "2022-10-21";
|
//date = "2022-10-21";
|
||||||
lineParam.setDataDate(date);
|
lineParam.setDataDate(date);
|
||||||
pollutionFeignClient.processPollutionData(lineParam);
|
pollutionFeignClient.processPollutionData(lineParam);
|
||||||
|
|
||||||
long b = System.currentTimeMillis();
|
|
||||||
log.info("+++++++++++harmPollutionJob执行总时间+++++++++++++++"+(b-a)/1000);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package com.njcn.executor.utils;
|
||||||
|
|
||||||
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.njcn.common.pojo.constant.BizParamConstant;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Calendar;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* pqs
|
||||||
|
*
|
||||||
|
* @author cdf
|
||||||
|
* @date 2022/11/2
|
||||||
|
*/
|
||||||
|
@Slf4j
|
||||||
|
public class CommonExecutorUtils {
|
||||||
|
|
||||||
|
public static String prepareTimeDeal(String command){
|
||||||
|
if(StrUtil.isBlank(command)){
|
||||||
|
log.error(LocalDateTime.now()+"xxl调度任务参数未设置");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
|
|
||||||
|
String date = null;
|
||||||
|
Calendar calendar = Calendar.getInstance();
|
||||||
|
|
||||||
|
switch (command){
|
||||||
|
case BizParamConstant.STAT_BIZ_YEAR :
|
||||||
|
calendar.add(Calendar.YEAR,-1);
|
||||||
|
date = sdf.format(DateUtil.beginOfYear(calendar.getTime()));
|
||||||
|
break;
|
||||||
|
case BizParamConstant.STAT_BIZ_MONTH:
|
||||||
|
//月
|
||||||
|
date = sdf.format(DateUtil.beginOfMonth(DateUtil.lastMonth()));
|
||||||
|
break;
|
||||||
|
case BizParamConstant.STAT_BIZ_QUARTER:
|
||||||
|
//季度
|
||||||
|
calendar.add(Calendar.MONTH,-3);
|
||||||
|
date = sdf.format(DateUtil.beginOfQuarter(calendar.getTime()));
|
||||||
|
break;
|
||||||
|
case BizParamConstant.STAT_BIZ_WEEK:
|
||||||
|
calendar.add(Calendar.WEEK_OF_MONTH,-1);
|
||||||
|
date = sdf.format(DateUtil.beginOfWeek(calendar.getTime()));
|
||||||
|
break;
|
||||||
|
case BizParamConstant.STAT_BIZ_DAY:
|
||||||
|
calendar.add(Calendar.DAY_OF_MONTH,-1);
|
||||||
|
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new IllegalStateException("Unexpected value: " + command);
|
||||||
|
}
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,7 @@ package com.njcn.prepare.harmonic.api.line;
|
|||||||
|
|
||||||
import com.njcn.common.pojo.constant.ServerInfo;
|
import com.njcn.common.pojo.constant.ServerInfo;
|
||||||
import com.njcn.common.pojo.response.HttpResult;
|
import com.njcn.common.pojo.response.HttpResult;
|
||||||
|
|
||||||
import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory;
|
import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
@@ -27,7 +25,7 @@ public interface DayDataFeignClient {
|
|||||||
* @author qijian
|
* @author qijian
|
||||||
* @date 2022/10/19
|
* @date 2022/10/19
|
||||||
*/
|
*/
|
||||||
@PostMapping("/dataToDayHanlder")
|
@PostMapping("/dayDataHanlder")
|
||||||
HttpResult<Boolean> dayDataHanlder(@RequestBody LimitRateHanlderParam jobParam);
|
HttpResult<Boolean> dayDataHanlder(@RequestBody LineParam jobParam);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,7 @@ package com.njcn.prepare.harmonic.api.line;
|
|||||||
|
|
||||||
import com.njcn.common.pojo.constant.ServerInfo;
|
import com.njcn.common.pojo.constant.ServerInfo;
|
||||||
import com.njcn.common.pojo.response.HttpResult;
|
import com.njcn.common.pojo.response.HttpResult;
|
||||||
|
|
||||||
import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory;
|
|
||||||
import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory;
|
import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
@@ -27,6 +24,6 @@ public interface LimitrateFeignClient {
|
|||||||
* 越限
|
* 越限
|
||||||
*/
|
*/
|
||||||
@PostMapping("/LimitRateHanlder")
|
@PostMapping("/LimitRateHanlder")
|
||||||
HttpResult<Boolean> limitRateHanlder(@RequestBody LimitRateHanlderParam limitRateHanlderParam );
|
HttpResult<Boolean> limitRateHanlder(@RequestBody LineParam limitRateHanlderParam );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ public class CoustomReportFeignClientFallbackFactory implements FallbackFactory<
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new CoustmReportFeignClient() {
|
return new CoustmReportFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam){
|
public HttpResult<Boolean> batchReport(LineParam reportParam){
|
||||||
log.error("{}异常,降级处理,异常为:{}", "Date数据转Day数据: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "自定义报表预处理任务: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import com.njcn.common.pojo.exception.BusinessException;
|
|||||||
import com.njcn.common.pojo.response.HttpResult;
|
import com.njcn.common.pojo.response.HttpResult;
|
||||||
import com.njcn.device.pq.utils.DeviceEnumUtil;
|
import com.njcn.device.pq.utils.DeviceEnumUtil;
|
||||||
import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
|
import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import feign.hystrix.FallbackFactory;
|
import feign.hystrix.FallbackFactory;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -34,7 +33,7 @@ public class DayDataFeignClientFallbackFactory implements FallbackFactory<DayDat
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new DayDataFeignClient() {
|
return new DayDataFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<Boolean> dayDataHanlder(@RequestBody LimitRateHanlderParam jobParam){
|
public HttpResult<Boolean> dayDataHanlder(LineParam jobParam){
|
||||||
log.error("{}异常,降级处理,异常为:{}", "Date数据转Day数据: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "Date数据转Day数据: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ public class IntegrityFeignClientFallbackFactory implements FallbackFactory<Inte
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new IntegrityFeignClient() {
|
return new IntegrityFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam) {
|
public HttpResult<String> computeDataIntegrity(LineParam lineParam) {
|
||||||
log.error("{}异常,降级处理,异常为:{}", "数据完整性处理: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "数据完整性预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ public class LimitTargetFeignClientFallbackFactory implements FallbackFactory<Li
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new LimitTargetFeignClient() {
|
return new LimitTargetFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam) {
|
public HttpResult<String> getLimitTargetData(LineParam lineParam) {
|
||||||
log.error("{}异常,降级处理,异常为:{}", "越限数据: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "越限次数数据预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import com.njcn.common.pojo.exception.BusinessException;
|
|||||||
import com.njcn.common.pojo.response.HttpResult;
|
import com.njcn.common.pojo.response.HttpResult;
|
||||||
import com.njcn.device.pq.utils.DeviceEnumUtil;
|
import com.njcn.device.pq.utils.DeviceEnumUtil;
|
||||||
import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
|
import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam;
|
|
||||||
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
import com.njcn.prepare.harmonic.pojo.param.LineParam;
|
||||||
import feign.hystrix.FallbackFactory;
|
import feign.hystrix.FallbackFactory;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -34,8 +33,8 @@ public class LimitrateFeignClientFallbackFactory implements FallbackFactory<Limi
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new LimitrateFeignClient() {
|
return new LimitrateFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<Boolean> limitRateHanlder(@RequestBody LimitRateHanlderParam limitRateHanlderParam ){
|
public HttpResult<Boolean> limitRateHanlder(LineParam limitRateHanlderParam ){
|
||||||
log.error("{}异常,降级处理,异常为:{}", "越限数据处理: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "越限是否数据预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class NormalFeignClientFallbackFactory implements FallbackFactory<NormalL
|
|||||||
return new NormalLimitFeignClient() {
|
return new NormalLimitFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<String> getNormLimitData() {
|
public HttpResult<String> getNormLimitData() {
|
||||||
log.error("{}异常,降级处理,异常为:{}", "告警数据: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "告警数据预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ public class OnlineRateFeignClientFallbackFactory implements FallbackFactory<Onl
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new OnlineRateFeignClient() {
|
return new OnlineRateFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam){
|
public HttpResult<String> getOnlineRateData(LineParam lineParam){
|
||||||
log.error("{}异常,降级处理,异常为:{}", "在线率: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "在线率数据预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ public class PollutionFeignClientFallbackFactory implements FallbackFactory<Poll
|
|||||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||||
return new PollutionFeignClient() {
|
return new PollutionFeignClient() {
|
||||||
@Override
|
@Override
|
||||||
public HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam){
|
public HttpResult<String> processPollutionData(LineParam lineParam){
|
||||||
log.error("{}异常,降级处理,异常为:{}", "污区数据: ", throwable.toString());
|
log.error("{}异常,降级处理,异常为:{}", "污区数据预处理: ", throwable.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.njcn.prepare.harmonic.pojo.po;
|
package com.njcn.prepare.harmonic.pojo.po;
|
||||||
|
|
||||||
import cn.hutool.core.date.DateTime;
|
import cn.hutool.core.date.DateTime;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.influxdb.annotation.Column;
|
import org.influxdb.annotation.Column;
|
||||||
import org.influxdb.annotation.Measurement;
|
import org.influxdb.annotation.Measurement;
|
||||||
@@ -15,7 +16,7 @@ import java.time.Instant;
|
|||||||
* @date 2022/10/18 10:20
|
* @date 2022/10/18 10:20
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@Measurement(name = "r_mp_surplus_abnormal_d")
|
@TableName("r_mp_surplus_abnormal_d")
|
||||||
public class AbnormalPO {
|
public class AbnormalPO {
|
||||||
|
|
||||||
@Column(name = "Time_Id")
|
@Column(name = "Time_Id")
|
||||||
@@ -37,209 +38,209 @@ public class AbnormalPO {
|
|||||||
private Float uvoltageDev;
|
private Float uvoltageDev;
|
||||||
|
|
||||||
@Column(name = "Flicker")
|
@Column(name = "Flicker")
|
||||||
private Float flickerAllTime;
|
private Float flicker;
|
||||||
|
|
||||||
@Column(name = "Freq")
|
@Column(name = "Freq")
|
||||||
private Float freqDev;
|
private Float freq;
|
||||||
|
|
||||||
@Column(name = "Ubalance")
|
@Column(name = "Ubalance")
|
||||||
private Float uBalance;
|
private Float ubalance;
|
||||||
|
|
||||||
@Column(name = "Uaberrance")
|
@Column(name = "Uaberrance")
|
||||||
private Float uAberrance;
|
private Float uaberrance;
|
||||||
|
|
||||||
@Column(name = "I_Neg")
|
@Column(name = "I_Neg")
|
||||||
private Float iNeg;
|
private Float iNeg;
|
||||||
|
|
||||||
@Column(name = "Uharm_2")
|
@Column(name = "Uharm_2")
|
||||||
private Float uHarm2;
|
private Float uharm_2;
|
||||||
|
|
||||||
@Column(name = "Uharm_3")
|
@Column(name = "uharm_3")
|
||||||
private Float uHarm3;
|
private Float uharm_3;
|
||||||
|
|
||||||
@Column(name = "Uharm_4")
|
@Column(name = "uharm_4")
|
||||||
private Float uHarm4;
|
private Float uharm_4;
|
||||||
|
|
||||||
@Column(name = "Uharm_5")
|
@Column(name = "uharm_5")
|
||||||
private Float uHarm5;
|
private Float uharm_5;
|
||||||
|
|
||||||
@Column(name = "Uharm_6")
|
@Column(name = "uharm_6")
|
||||||
private Float uHarm6;
|
private Float uharm_6;
|
||||||
|
|
||||||
@Column(name = "Uharm_7")
|
@Column(name = "uharm_7")
|
||||||
private Float uHarm7;
|
private Float uharm_7;
|
||||||
|
|
||||||
@Column(name = "Uharm_8")
|
@Column(name = "uharm_8")
|
||||||
private Float uHarm8;
|
private Float uharm_8;
|
||||||
|
|
||||||
@Column(name = "Uharm_9")
|
@Column(name = "uharm_9")
|
||||||
private Float uHarm9;
|
private Float uharm_9;
|
||||||
|
|
||||||
@Column(name = "Uharm_10")
|
@Column(name = "uharm_10")
|
||||||
private Float uHarm10;
|
private Float uharm_10;
|
||||||
|
|
||||||
@Column(name = "Uharm_11")
|
@Column(name = "uharm_11")
|
||||||
private Float uHarm11;
|
private Float uharm_11;
|
||||||
|
|
||||||
@Column(name = "Uharm_12")
|
@Column(name = "uharm_12")
|
||||||
private Float uHarm12;
|
private Float uharm_12;
|
||||||
|
|
||||||
@Column(name = "Uharm_13")
|
@Column(name = "uharm_13")
|
||||||
private Float uHarm13;
|
private Float uharm_13;
|
||||||
|
|
||||||
@Column(name = "Uharm_14")
|
@Column(name = "uharm_14")
|
||||||
private Float uHarm14;
|
private Float uharm_14;
|
||||||
|
|
||||||
@Column(name = "Uharm_15")
|
@Column(name = "uharm_15")
|
||||||
private Float uHarm15;
|
private Float uharm_15;
|
||||||
|
|
||||||
@Column(name = "Uharm_16")
|
@Column(name = "uharm_16")
|
||||||
private Float uHarm16;
|
private Float uharm_16;
|
||||||
|
|
||||||
@Column(name = "Uharm_17")
|
@Column(name = "uharm_17")
|
||||||
private Float uHarm17;
|
private Float uharm_17;
|
||||||
|
|
||||||
@Column(name = "Uharm_18")
|
@Column(name = "uharm_18")
|
||||||
private Float uHarm18;
|
private Float uharm_18;
|
||||||
|
|
||||||
@Column(name = "Uharm_19")
|
@Column(name = "uharm_19")
|
||||||
private Float uHarm19;
|
private Float uharm_19;
|
||||||
|
|
||||||
@Column(name = "Uharm_20")
|
@Column(name = "Uharm_20")
|
||||||
private Float uHarm20;
|
private Float uharm_20;
|
||||||
|
|
||||||
@Column(name = "Uharm_21")
|
@Column(name = "Uharm_21")
|
||||||
private Float uHarm21;
|
private Float uharm_21;
|
||||||
|
|
||||||
@Column(name = "Uharm_22")
|
@Column(name = "Uharm_22")
|
||||||
private Float uHarm22;
|
private Float uharm_22;
|
||||||
|
|
||||||
@Column(name = "Uharm_23")
|
@Column(name = "Uharm_23")
|
||||||
private Float uHarm23;
|
private Float uharm_23;
|
||||||
|
|
||||||
@Column(name = "Uharm_24")
|
@Column(name = "Uharm_24")
|
||||||
private Float uHarm24;
|
private Float uharm_24;
|
||||||
|
|
||||||
@Column(name = "Uharm_25")
|
@Column(name = "Uharm_25")
|
||||||
private Float uHarm25;
|
private Float uharm_25;
|
||||||
|
|
||||||
@Column(name = "Iharm_2")
|
@Column(name = "iharm_2")
|
||||||
private Float iHarm2;
|
private Float iharm_2;
|
||||||
|
|
||||||
@Column(name = "Iharm_3")
|
@Column(name = "iharm_3")
|
||||||
private Float iHarm3;
|
private Float iharm_3;
|
||||||
|
|
||||||
@Column(name = "Iharm_4")
|
@Column(name = "iharm_4")
|
||||||
private Float iHarm4;
|
private Float iharm_4;
|
||||||
|
|
||||||
@Column(name = "Iharm_5")
|
@Column(name = "iharm_5")
|
||||||
private Float iHarm5;
|
private Float iharm_5;
|
||||||
|
|
||||||
@Column(name = "Iharm_6")
|
@Column(name = "iharm_6")
|
||||||
private Float iHarm6;
|
private Float iharm_6;
|
||||||
|
|
||||||
@Column(name = "Iharm_7")
|
@Column(name = "iharm_7")
|
||||||
private Float iHarm7;
|
private Float iharm_7;
|
||||||
|
|
||||||
@Column(name = "Iharm_8")
|
@Column(name = "iharm_8")
|
||||||
private Float iHarm8;
|
private Float iharm_8;
|
||||||
|
|
||||||
@Column(name = "Iharm_9")
|
@Column(name = "iharm_9")
|
||||||
private Float iHarm9;
|
private Float iharm_9;
|
||||||
|
|
||||||
@Column(name = "Iharm_10")
|
@Column(name = "iharm_10")
|
||||||
private Float iHarm10;
|
private Float iharm_10;
|
||||||
|
|
||||||
@Column(name = "Iharm_11")
|
@Column(name = "iharm_11")
|
||||||
private Float iHarm11;
|
private Float iharm_11;
|
||||||
|
|
||||||
@Column(name = "Iharm_12")
|
@Column(name = "iharm_12")
|
||||||
private Float iHarm12;
|
private Float iharm_12;
|
||||||
|
|
||||||
@Column(name = "Iharm_13")
|
@Column(name = "iharm_13")
|
||||||
private Float iHarm13;
|
private Float iharm_13;
|
||||||
|
|
||||||
@Column(name = "Iharm_14")
|
@Column(name = "iharm_14")
|
||||||
private Float iHarm14;
|
private Float iharm_14;
|
||||||
|
|
||||||
@Column(name = "Iharm_15")
|
@Column(name = "iharm_15")
|
||||||
private Float iHarm15;
|
private Float iharm_15;
|
||||||
|
|
||||||
@Column(name = "Iharm_16")
|
@Column(name = "iharm_16")
|
||||||
private Float iHarm16;
|
private Float iharm_16;
|
||||||
|
|
||||||
@Column(name = "Iharm_17")
|
@Column(name = "iharm_17")
|
||||||
private Float iHarm17;
|
private Float iharm_17;
|
||||||
|
|
||||||
@Column(name = "Iharm_18")
|
@Column(name = "iharm_18")
|
||||||
private Float iHarm18;
|
private Float iharm_18;
|
||||||
|
|
||||||
@Column(name = "Iharm_19")
|
@Column(name = "iharm_19")
|
||||||
private Float iHarm19;
|
private Float iharm_19;
|
||||||
|
|
||||||
@Column(name = "Iharm_20")
|
@Column(name = "iharm_20")
|
||||||
private Float iHarm20;
|
private Float iharm_20;
|
||||||
|
|
||||||
@Column(name = "Iharm_21")
|
@Column(name = "iharm_21")
|
||||||
private Float iHarm21;
|
private Float iharm_21;
|
||||||
|
|
||||||
@Column(name = "Iharm_22")
|
@Column(name = "iharm_22")
|
||||||
private Float iHarm22;
|
private Float iharm_22;
|
||||||
|
|
||||||
@Column(name = "Iharm_23")
|
@Column(name = "iharm_23")
|
||||||
private Float iHarm23;
|
private Float iharm_23;
|
||||||
|
|
||||||
@Column(name = "Iharm_24")
|
@Column(name = "iharm_24")
|
||||||
private Float iHarm24;
|
private Float iharm_24;
|
||||||
|
|
||||||
@Column(name = "Iharm_25")
|
@Column(name = "iharm_25")
|
||||||
private Float iHarm25;
|
private Float iharm_25;
|
||||||
|
|
||||||
@Column(name = "Inuharm_1")
|
@Column(name = "inuharm_1")
|
||||||
private Float inuHarm1;
|
private Float inuharm_1;
|
||||||
|
|
||||||
@Column(name = "Inuharm_2")
|
@Column(name = "inuharm_2")
|
||||||
private Float inuHarm2;
|
private Float inuharm_2;
|
||||||
|
|
||||||
@Column(name = "Inuharm_3")
|
@Column(name = "inuharm_3")
|
||||||
private Float inuHarm3;
|
private Float inuharm_3;
|
||||||
|
|
||||||
@Column(name = "Inuharm_4")
|
@Column(name = "inuharm_4")
|
||||||
private Float inuHarm4;
|
private Float inuharm_4;
|
||||||
|
|
||||||
@Column(name = "Inuharm_5")
|
@Column(name = "inuharm_5")
|
||||||
private Float inuHarm5;
|
private Float inuharm_5;
|
||||||
|
|
||||||
@Column(name = "Inuharm_6")
|
@Column(name = "inuharm_6")
|
||||||
private Float inuHarm6;
|
private Float inuharm_6;
|
||||||
|
|
||||||
@Column(name = "Inuharm_7")
|
@Column(name = "inuharm_7")
|
||||||
private Float inuHarm7;
|
private Float inuharm_7;
|
||||||
|
|
||||||
@Column(name = "Inuharm_8")
|
@Column(name = "inuharm_8")
|
||||||
private Float inuHarm8;
|
private Float inuharm_8;
|
||||||
|
|
||||||
@Column(name = "Inuharm_9")
|
@Column(name = "inuharm_9")
|
||||||
private Float inuHarm9;
|
private Float inuharm_9;
|
||||||
|
|
||||||
@Column(name = "Inuharm_10")
|
@Column(name = "inuharm_10")
|
||||||
private Float inuHarm10;
|
private Float inuharm_10;
|
||||||
|
|
||||||
@Column(name = "Inuharm_11")
|
@Column(name = "inuharm_11")
|
||||||
private Float inuHarm11;
|
private Float inuharm_11;
|
||||||
|
|
||||||
@Column(name = "Inuharm_12")
|
@Column(name = "inuharm_12")
|
||||||
private Float inuHarm12;
|
private Float inuharm_12;
|
||||||
|
|
||||||
@Column(name = "Inuharm_13")
|
@Column(name = "inuharm_13")
|
||||||
private Float inuHarm13;
|
private Float inuharm_13;
|
||||||
|
|
||||||
@Column(name = "Inuharm_14")
|
@Column(name = "inuharm_14")
|
||||||
private Float inuHarm14;
|
private Float inuharm_14;
|
||||||
|
|
||||||
@Column(name = "Inuharm_15")
|
@Column(name = "inuharm_15")
|
||||||
private Float inuHarm15;
|
private Float inuharm_15;
|
||||||
|
|
||||||
@Column(name = "Inuharm_16")
|
@Column(name = "inuharm_16")
|
||||||
private Float inuHarm16;
|
private Float inuharm_16;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
|
|
||||||
List<String> lineIds = new ArrayList<>();
|
List<String> lineIds = new ArrayList<>();
|
||||||
DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
|
DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
|
||||||
// deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
|
|
||||||
deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628");
|
deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628");
|
||||||
deviceInfoParam.setPowerFlag(2);
|
deviceInfoParam.setPowerFlag(2);
|
||||||
deviceInfoParam.setMonitorFlag(2);
|
deviceInfoParam.setMonitorFlag(2);
|
||||||
@@ -156,9 +155,17 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
//长时闪变
|
//长时闪变
|
||||||
List<AbnormalVO> flicker = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 71);
|
List<AbnormalVO> flicker = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 71);
|
||||||
//只需要判断一个指标即可
|
//只需要判断一个指标即可
|
||||||
if (!voDev.isEmpty()) {
|
if (voDev.size() > 0 && uoDev.size() > 0 && uba.size() > 0 && uab.size() > 0 && ing.size() > 0 && freq.size() > 0 && uharm2.size() > 0 && uharm3.size() > 0 && uharm4.size() > 0
|
||||||
|
&& uharm5.size() > 0 && uharm6.size() > 0 && uharm7.size() > 0 && uharm8.size() > 0 && uharm9.size() > 0 && uharm10.size() > 0 && uharm11.size() > 0 && uharm12.size() > 0 && uharm13.size() > 0 && uharm14.size() > 0
|
||||||
|
&& uharm15.size() > 0 && uharm16.size() > 0 && uharm17.size() > 0 && uharm18.size() > 0 && uharm19.size() > 0 && uharm20.size() > 0 && uharm21.size() > 0 && uharm22.size() > 0 && uharm23.size() > 0 && uharm24.size() > 0
|
||||||
|
&& uharm25.size() > 0 && iharm2.size() > 0 && iharm3.size() > 0 && iharm4.size() > 0
|
||||||
|
&& iharm5.size() > 0 && iharm6.size() > 0 && iharm7.size() > 0 && iharm8.size() > 0 && iharm9.size() > 0 && iharm10.size() > 0 && iharm11.size() > 0 && iharm12.size() > 0 && iharm13.size() > 0 && iharm14.size() > 0
|
||||||
|
&& iharm15.size() > 0 && iharm16.size() > 0 && iharm17.size() > 0 && iharm18.size() > 0 && iharm19.size() > 0 && iharm20.size() > 0 && iharm21.size() > 0 && iharm22.size() > 0 && iharm23.size() > 0 && iharm24.size() > 0
|
||||||
|
&& iharm25.size() > 0 && inharm.size() > 0 && inharm1.size() > 0 && inharm2.size() > 0
|
||||||
|
&& inharm3.size() > 0 && inharm4.size() > 0 && inharm5.size() > 0 && inharm6.size() > 0 && inharm7.size() > 0 && inharm8.size() > 0 && inharm9.size() > 0 && inharm10.size() > 0 && inharm11.size() > 0 && inharm12.size() > 0
|
||||||
|
&& inharm13.size() > 0 && inharm14.size() > 0 && inharm15.size() > 0) {
|
||||||
AbnormalPO abnormalPO = new AbnormalPO();
|
AbnormalPO abnormalPO = new AbnormalPO();
|
||||||
abnormalPO.setTimeId(DateUtil.beginOfDay(DateUtil.parse("2022-05-10")));
|
abnormalPO.setTimeId(DateUtil.beginOfDay(DateUtil.beginOfDay(DateUtil.yesterday())));
|
||||||
abnormalPO.setId(lineIndex);
|
abnormalPO.setId(lineIndex);
|
||||||
if (i == 1) {
|
if (i == 1) {
|
||||||
abnormalPO.setPhasicType("A");
|
abnormalPO.setPhasicType("A");
|
||||||
@@ -170,302 +177,299 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
abnormalPO.setPhasicType("T");
|
abnormalPO.setPhasicType("T");
|
||||||
}
|
}
|
||||||
if (j == 1) {
|
if (j == 1) {
|
||||||
abnormalPO.setFreqDev(freq.get(j).getNormValue());
|
abnormalPO.setFreq(freq.get(0).getNormValue());
|
||||||
abnormalPO.setValueType("AVG");
|
abnormalPO.setValueType("AVG");
|
||||||
abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
|
abnormalPO.setVoltageDev(voDev.get(0).getNormValue());
|
||||||
abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
|
abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue());
|
||||||
abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
|
abnormalPO.setFlicker(flicker.get(0).getNormValue());
|
||||||
abnormalPO.setUAberrance(uab.get(j).getNormValue());
|
abnormalPO.setUaberrance(uab.get(0).getNormValue());
|
||||||
abnormalPO.setUBalance(uba.get(j).getNormValue());
|
abnormalPO.setUbalance(uba.get(0).getNormValue());
|
||||||
abnormalPO.setINeg(ing.get(j).getNormValue());
|
abnormalPO.setINeg(ing.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
|
abnormalPO.setUharm_2(uharm2.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
|
abnormalPO.setUharm_3(uharm3.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
|
abnormalPO.setUharm_4(uharm4.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
|
abnormalPO.setUharm_5(uharm5.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
|
abnormalPO.setUharm_6(uharm6.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
|
abnormalPO.setUharm_7(uharm7.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
|
abnormalPO.setUharm_8(uharm8.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
|
abnormalPO.setUharm_9(uharm9.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
|
abnormalPO.setUharm_10(uharm10.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
|
abnormalPO.setUharm_11(uharm11.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
|
abnormalPO.setUharm_12(uharm12.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
|
abnormalPO.setUharm_13(uharm13.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
|
abnormalPO.setUharm_14(uharm14.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
|
abnormalPO.setUharm_15(uharm15.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
|
abnormalPO.setUharm_16(uharm16.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
|
abnormalPO.setUharm_17(uharm17.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
|
abnormalPO.setUharm_18(uharm18.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
|
abnormalPO.setUharm_19(uharm19.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
|
abnormalPO.setUharm_20(uharm20.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
|
abnormalPO.setUharm_21(uharm21.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
|
abnormalPO.setUharm_22(uharm22.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
|
abnormalPO.setUharm_23(uharm23.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
|
abnormalPO.setUharm_24(uharm24.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
|
abnormalPO.setUharm_25(uharm25.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
|
abnormalPO.setIharm_2(iharm2.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
|
abnormalPO.setIharm_3(iharm3.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
|
abnormalPO.setIharm_4(iharm4.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
|
abnormalPO.setIharm_5(iharm5.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
|
abnormalPO.setIharm_6(iharm6.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
|
abnormalPO.setIharm_7(iharm7.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
|
abnormalPO.setIharm_8(iharm8.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
|
abnormalPO.setIharm_9(iharm9.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
|
abnormalPO.setIharm_10(iharm10.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
|
abnormalPO.setIharm_11(iharm11.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
|
abnormalPO.setIharm_12(iharm12.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
|
abnormalPO.setIharm_13(iharm13.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
|
abnormalPO.setIharm_14(iharm14.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
|
abnormalPO.setIharm_15(iharm15.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
|
abnormalPO.setIharm_16(iharm16.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
|
abnormalPO.setIharm_17(iharm17.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
|
abnormalPO.setIharm_18(iharm18.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
|
abnormalPO.setIharm_19(iharm19.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
|
abnormalPO.setIharm_20(iharm20.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
|
abnormalPO.setIharm_21(iharm21.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
|
abnormalPO.setIharm_22(iharm22.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
|
abnormalPO.setIharm_23(iharm23.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
|
abnormalPO.setIharm_24(iharm24.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
|
abnormalPO.setIharm_25(iharm25.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
|
abnormalPO.setInuharm_1(inharm.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
|
abnormalPO.setInuharm_2(inharm1.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
|
abnormalPO.setInuharm_3(inharm2.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
|
abnormalPO.setInuharm_4(inharm3.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
|
abnormalPO.setInuharm_5(inharm4.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
|
abnormalPO.setInuharm_6(inharm5.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
|
abnormalPO.setInuharm_7(inharm6.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
|
abnormalPO.setInuharm_8(inharm7.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
|
abnormalPO.setInuharm_9(inharm8.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
|
abnormalPO.setInuharm_10(inharm9.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
|
abnormalPO.setInuharm_11(inharm10.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
|
abnormalPO.setInuharm_12(inharm11.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
|
abnormalPO.setInuharm_13(inharm12.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
|
abnormalPO.setInuharm_14(inharm13.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
|
abnormalPO.setInuharm_15(inharm14.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
|
abnormalPO.setInuharm_16(inharm15.get(0).getNormValue());
|
||||||
} else if (j == 2) {
|
} else if (j == 2) {
|
||||||
abnormalPO.setFreqDev(freq.get(j).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setFreq(freq.get(0).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setValueType("MAX");
|
abnormalPO.setValueType("MAX");
|
||||||
abnormalPO.setVoltageDev(voDev.get(j).getNormValue() > overlimit.getVoltageDev() ? voDev.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setVoltageDev(voDev.get(0).getNormValue() > overlimit.getVoltageDev() ? voDev.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue() > overlimit.getFlicker() ? flicker.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setFlicker(flicker.get(0).getNormValue() > overlimit.getFlicker() ? flicker.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUAberrance(uab.get(j).getNormValue() > overlimit.getUaberrance() ? uab.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUaberrance(uab.get(0).getNormValue() > overlimit.getUaberrance() ? uab.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUBalance(uba.get(j).getNormValue() > overlimit.getUbalance() ? uba.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUbalance(uba.get(0).getNormValue() > overlimit.getUbalance() ? uba.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setINeg(ing.get(j).getNormValue() > overlimit.getINeg() ? ing.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setINeg(ing.get(0).getNormValue() > overlimit.getINeg() ? ing.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm2(uharm2.get(j).getNormValue() > overlimit.getUharm2() ? uharm2.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_2(uharm2.get(0).getNormValue() > overlimit.getUharm2() ? uharm2.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm3(uharm3.get(j).getNormValue() > overlimit.getUharm3() ? uharm3.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_3(uharm3.get(0).getNormValue() > overlimit.getUharm3() ? uharm3.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm4(uharm4.get(j).getNormValue() > overlimit.getUharm4() ? uharm4.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_4(uharm4.get(0).getNormValue() > overlimit.getUharm4() ? uharm4.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm5(uharm5.get(j).getNormValue() > overlimit.getUharm5() ? uharm5.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_5(uharm5.get(0).getNormValue() > overlimit.getUharm5() ? uharm5.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm6(uharm6.get(j).getNormValue() > overlimit.getUharm6() ? uharm6.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_6(uharm6.get(0).getNormValue() > overlimit.getUharm6() ? uharm6.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm7(uharm7.get(j).getNormValue() > overlimit.getUharm7() ? uharm7.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_7(uharm7.get(0).getNormValue() > overlimit.getUharm7() ? uharm7.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm8(uharm8.get(j).getNormValue() > overlimit.getUharm8() ? uharm8.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_8(uharm8.get(0).getNormValue() > overlimit.getUharm8() ? uharm8.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm9(uharm9.get(j).getNormValue() > overlimit.getUharm9() ? uharm9.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_9(uharm9.get(0).getNormValue() > overlimit.getUharm9() ? uharm9.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm10(uharm10.get(j).getNormValue() > overlimit.getUharm10() ? uharm10.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_10(uharm10.get(0).getNormValue() > overlimit.getUharm10() ? uharm10.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm11(uharm11.get(j).getNormValue() > overlimit.getUharm11() ? uharm11.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_11(uharm11.get(0).getNormValue() > overlimit.getUharm11() ? uharm11.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm12(uharm12.get(j).getNormValue() > overlimit.getUharm12() ? uharm12.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_12(uharm12.get(0).getNormValue() > overlimit.getUharm12() ? uharm12.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm13(uharm13.get(j).getNormValue() > overlimit.getUharm13() ? uharm13.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_13(uharm13.get(0).getNormValue() > overlimit.getUharm13() ? uharm13.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm14(uharm14.get(j).getNormValue() > overlimit.getUharm14() ? uharm14.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_14(uharm14.get(0).getNormValue() > overlimit.getUharm14() ? uharm14.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm15(uharm15.get(j).getNormValue() > overlimit.getUharm15() ? uharm15.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_15(uharm15.get(0).getNormValue() > overlimit.getUharm15() ? uharm15.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm16(uharm16.get(j).getNormValue() > overlimit.getUharm16() ? uharm16.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_16(uharm16.get(0).getNormValue() > overlimit.getUharm16() ? uharm16.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm17(uharm17.get(j).getNormValue() > overlimit.getUharm17() ? uharm17.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_17(uharm17.get(0).getNormValue() > overlimit.getUharm17() ? uharm17.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm18(uharm18.get(j).getNormValue() > overlimit.getUharm18() ? uharm18.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_18(uharm18.get(0).getNormValue() > overlimit.getUharm18() ? uharm18.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm19(uharm19.get(j).getNormValue() > overlimit.getUharm19() ? uharm19.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_19(uharm19.get(0).getNormValue() > overlimit.getUharm19() ? uharm19.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm20(uharm20.get(j).getNormValue() > overlimit.getUharm20() ? uharm20.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_20(uharm20.get(0).getNormValue() > overlimit.getUharm20() ? uharm20.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm21(uharm21.get(j).getNormValue() > overlimit.getUharm21() ? uharm21.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_21(uharm21.get(0).getNormValue() > overlimit.getUharm21() ? uharm21.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm22(uharm22.get(j).getNormValue() > overlimit.getUharm22() ? uharm22.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_22(uharm22.get(0).getNormValue() > overlimit.getUharm22() ? uharm22.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm23(uharm23.get(j).getNormValue() > overlimit.getUharm23() ? uharm23.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_23(uharm23.get(0).getNormValue() > overlimit.getUharm23() ? uharm23.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm24(uharm24.get(j).getNormValue() > overlimit.getUharm24() ? uharm24.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_24(uharm24.get(0).getNormValue() > overlimit.getUharm24() ? uharm24.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setUHarm25(uharm25.get(j).getNormValue() > overlimit.getUharm25() ? uharm25.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setUharm_25(uharm25.get(0).getNormValue() > overlimit.getUharm25() ? uharm25.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm2(iharm2.get(j).getNormValue() > overlimit.getIharm2() ? iharm2.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_2(iharm2.get(0).getNormValue() > overlimit.getIharm2() ? iharm2.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm3(iharm3.get(j).getNormValue() > overlimit.getIharm3() ? iharm3.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_3(iharm3.get(0).getNormValue() > overlimit.getIharm3() ? iharm3.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm4(iharm4.get(j).getNormValue() > overlimit.getIharm4() ? iharm4.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_4(iharm4.get(0).getNormValue() > overlimit.getIharm4() ? iharm4.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm5(iharm5.get(j).getNormValue() > overlimit.getIharm5() ? iharm5.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_5(iharm5.get(0).getNormValue() > overlimit.getIharm5() ? iharm5.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm6(iharm6.get(j).getNormValue() > overlimit.getIharm6() ? iharm6.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_6(iharm6.get(0).getNormValue() > overlimit.getIharm6() ? iharm6.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm7(iharm7.get(j).getNormValue() > overlimit.getIharm7() ? iharm7.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_7(iharm7.get(0).getNormValue() > overlimit.getIharm7() ? iharm7.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm8(iharm8.get(j).getNormValue() > overlimit.getIharm8() ? iharm8.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_8(iharm8.get(0).getNormValue() > overlimit.getIharm8() ? iharm8.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm9(iharm9.get(j).getNormValue() > overlimit.getIharm9() ? iharm9.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_9(iharm9.get(0).getNormValue() > overlimit.getIharm9() ? iharm9.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm10(iharm10.get(j).getNormValue() > overlimit.getIharm10() ? iharm10.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_10(iharm10.get(0).getNormValue() > overlimit.getIharm10() ? iharm10.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm11(iharm11.get(j).getNormValue() > overlimit.getIharm11() ? iharm11.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_11(iharm11.get(0).getNormValue() > overlimit.getIharm11() ? iharm11.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm12(iharm12.get(j).getNormValue() > overlimit.getIharm12() ? iharm12.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_12(iharm12.get(0).getNormValue() > overlimit.getIharm12() ? iharm12.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm13(iharm13.get(j).getNormValue() > overlimit.getIharm13() ? iharm13.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_13(iharm13.get(0).getNormValue() > overlimit.getIharm13() ? iharm13.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm14(iharm14.get(j).getNormValue() > overlimit.getIharm14() ? iharm14.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_14(iharm14.get(0).getNormValue() > overlimit.getIharm14() ? iharm14.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm15(iharm15.get(j).getNormValue() > overlimit.getIharm15() ? iharm15.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_15(iharm15.get(0).getNormValue() > overlimit.getIharm15() ? iharm15.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm16(iharm16.get(j).getNormValue() > overlimit.getIharm16() ? iharm16.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_16(iharm16.get(0).getNormValue() > overlimit.getIharm16() ? iharm16.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm17(iharm17.get(j).getNormValue() > overlimit.getIharm17() ? iharm17.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_17(iharm17.get(0).getNormValue() > overlimit.getIharm17() ? iharm17.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm18(iharm18.get(j).getNormValue() > overlimit.getIharm18() ? iharm18.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_18(iharm18.get(0).getNormValue() > overlimit.getIharm18() ? iharm18.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm19(iharm19.get(j).getNormValue() > overlimit.getIharm19() ? iharm19.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_19(iharm19.get(0).getNormValue() > overlimit.getIharm19() ? iharm19.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm20(iharm20.get(j).getNormValue() > overlimit.getIharm20() ? iharm20.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_20(iharm20.get(0).getNormValue() > overlimit.getIharm20() ? iharm20.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm21(iharm21.get(j).getNormValue() > overlimit.getIharm21() ? iharm21.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_21(iharm21.get(0).getNormValue() > overlimit.getIharm21() ? iharm21.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm22(iharm22.get(j).getNormValue() > overlimit.getIharm22() ? iharm22.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_22(iharm22.get(0).getNormValue() > overlimit.getIharm22() ? iharm22.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm23(iharm23.get(j).getNormValue() > overlimit.getIharm23() ? iharm23.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_23(iharm23.get(0).getNormValue() > overlimit.getIharm23() ? iharm23.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm24(iharm24.get(j).getNormValue() > overlimit.getIharm24() ? iharm24.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_24(iharm24.get(0).getNormValue() > overlimit.getIharm24() ? iharm24.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setIHarm25(iharm25.get(j).getNormValue() > overlimit.getIharm25() ? iharm25.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setIharm_25(iharm25.get(0).getNormValue() > overlimit.getIharm25() ? iharm25.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm1(inharm.get(j).getNormValue() > overlimit.getInuharm1() ? inharm.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_1(inharm.get(0).getNormValue() > overlimit.getInuharm1() ? inharm.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm2(inharm1.get(j).getNormValue() > overlimit.getInuharm2() ? inharm1.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_2(inharm1.get(0).getNormValue() > overlimit.getInuharm2() ? inharm1.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm3(inharm2.get(j).getNormValue() > overlimit.getInuharm3() ? inharm2.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_3(inharm2.get(0).getNormValue() > overlimit.getInuharm3() ? inharm2.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm4(inharm3.get(j).getNormValue() > overlimit.getInuharm4() ? inharm3.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_4(inharm3.get(0).getNormValue() > overlimit.getInuharm4() ? inharm3.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm5(inharm4.get(j).getNormValue() > overlimit.getInuharm5() ? inharm4.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_5(inharm4.get(0).getNormValue() > overlimit.getInuharm5() ? inharm4.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm6(inharm5.get(j).getNormValue() > overlimit.getInuharm6() ? inharm5.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_6(inharm5.get(0).getNormValue() > overlimit.getInuharm6() ? inharm5.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm7(inharm6.get(j).getNormValue() > overlimit.getInuharm7() ? inharm6.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_7(inharm6.get(0).getNormValue() > overlimit.getInuharm7() ? inharm6.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm8(inharm7.get(j).getNormValue() > overlimit.getInuharm8() ? inharm7.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_8(inharm7.get(0).getNormValue() > overlimit.getInuharm8() ? inharm7.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm9(inharm8.get(j).getNormValue() > overlimit.getInuharm9() ? inharm8.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_9(inharm8.get(0).getNormValue() > overlimit.getInuharm9() ? inharm8.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm10(inharm9.get(j).getNormValue() > overlimit.getInuharm10() ? inharm9.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_10(inharm9.get(0).getNormValue() > overlimit.getInuharm10() ? inharm9.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm11(inharm10.get(j).getNormValue() > overlimit.getInuharm11() ? inharm10.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_11(inharm10.get(0).getNormValue() > overlimit.getInuharm11() ? inharm10.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm12(inharm11.get(j).getNormValue() > overlimit.getInuharm12() ? inharm11.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_12(inharm11.get(0).getNormValue() > overlimit.getInuharm12() ? inharm11.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm13(inharm12.get(j).getNormValue() > overlimit.getInuharm13() ? inharm12.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_13(inharm12.get(0).getNormValue() > overlimit.getInuharm13() ? inharm12.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm14(inharm13.get(j).getNormValue() > overlimit.getInuharm14() ? inharm13.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_14(inharm13.get(0).getNormValue() > overlimit.getInuharm14() ? inharm13.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm15(inharm14.get(j).getNormValue() > overlimit.getInuharm15() ? inharm14.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_15(inharm14.get(0).getNormValue() > overlimit.getInuharm15() ? inharm14.get(0).getNormValue() : -3.14159f);
|
||||||
abnormalPO.setInuHarm16(inharm15.get(j).getNormValue() > overlimit.getInuharm16() ? inharm15.get(j).getNormValue() : -3.14159f);
|
abnormalPO.setInuharm_16(inharm15.get(0).getNormValue() > overlimit.getInuharm16() ? inharm15.get(0).getNormValue() : -3.14159f);
|
||||||
} else if (j == 3) {
|
} else if (j == 3) {
|
||||||
abnormalPO.setFreqDev(freq.get(j).getNormValue());
|
abnormalPO.setFreq(freq.get(0).getNormValue());
|
||||||
abnormalPO.setValueType("MIN");
|
abnormalPO.setValueType("MIN");
|
||||||
abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
|
abnormalPO.setVoltageDev(voDev.get(0).getNormValue());
|
||||||
abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
|
abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue());
|
||||||
abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
|
abnormalPO.setFlicker(flicker.get(0).getNormValue());
|
||||||
abnormalPO.setUAberrance(uab.get(j).getNormValue());
|
abnormalPO.setUaberrance(uab.get(0).getNormValue());
|
||||||
abnormalPO.setUBalance(uba.get(j).getNormValue());
|
abnormalPO.setUbalance(uba.get(0).getNormValue());
|
||||||
abnormalPO.setINeg(ing.get(j).getNormValue());
|
abnormalPO.setINeg(ing.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
|
abnormalPO.setUharm_2(uharm2.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
|
abnormalPO.setUharm_3(uharm3.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
|
abnormalPO.setUharm_4(uharm4.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
|
abnormalPO.setUharm_5(uharm5.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
|
abnormalPO.setUharm_6(uharm6.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
|
abnormalPO.setUharm_7(uharm7.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
|
abnormalPO.setUharm_8(uharm8.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
|
abnormalPO.setUharm_9(uharm9.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
|
abnormalPO.setUharm_10(uharm10.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
|
abnormalPO.setUharm_11(uharm11.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
|
abnormalPO.setUharm_12(uharm12.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
|
abnormalPO.setUharm_13(uharm13.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
|
abnormalPO.setUharm_14(uharm14.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
|
abnormalPO.setUharm_15(uharm15.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
|
abnormalPO.setUharm_16(uharm16.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
|
abnormalPO.setUharm_17(uharm17.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
|
abnormalPO.setUharm_18(uharm18.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
|
abnormalPO.setUharm_19(uharm19.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
|
abnormalPO.setUharm_20(uharm20.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
|
abnormalPO.setUharm_21(uharm21.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
|
abnormalPO.setUharm_22(uharm22.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
|
abnormalPO.setUharm_23(uharm23.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
|
abnormalPO.setUharm_24(uharm24.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
|
abnormalPO.setUharm_25(uharm25.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
|
abnormalPO.setIharm_2(iharm2.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
|
abnormalPO.setIharm_3(iharm3.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
|
abnormalPO.setIharm_4(iharm4.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
|
abnormalPO.setIharm_5(iharm5.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
|
abnormalPO.setIharm_6(iharm6.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
|
abnormalPO.setIharm_7(iharm7.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
|
abnormalPO.setIharm_8(iharm8.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
|
abnormalPO.setIharm_9(iharm9.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
|
abnormalPO.setIharm_10(iharm10.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
|
abnormalPO.setIharm_11(iharm11.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
|
abnormalPO.setIharm_12(iharm12.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
|
abnormalPO.setIharm_13(iharm13.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
|
abnormalPO.setIharm_14(iharm14.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
|
abnormalPO.setIharm_15(iharm15.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
|
abnormalPO.setIharm_16(iharm16.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
|
abnormalPO.setIharm_17(iharm17.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
|
abnormalPO.setIharm_18(iharm18.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
|
abnormalPO.setIharm_19(iharm19.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
|
abnormalPO.setIharm_20(iharm20.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
|
abnormalPO.setIharm_21(iharm21.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
|
abnormalPO.setIharm_22(iharm22.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
|
abnormalPO.setIharm_23(iharm23.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
|
abnormalPO.setIharm_24(iharm24.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
|
abnormalPO.setIharm_25(iharm25.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
|
abnormalPO.setInuharm_1(inharm.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
|
abnormalPO.setInuharm_2(inharm1.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
|
abnormalPO.setInuharm_3(inharm2.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
|
abnormalPO.setInuharm_4(inharm3.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
|
abnormalPO.setInuharm_5(inharm4.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
|
abnormalPO.setInuharm_6(inharm5.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
|
abnormalPO.setInuharm_7(inharm6.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
|
abnormalPO.setInuharm_8(inharm7.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
|
abnormalPO.setInuharm_9(inharm8.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
|
abnormalPO.setInuharm_10(inharm9.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
|
abnormalPO.setInuharm_11(inharm10.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
|
abnormalPO.setInuharm_12(inharm11.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
|
abnormalPO.setInuharm_13(inharm12.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
|
abnormalPO.setInuharm_14(inharm13.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
|
abnormalPO.setInuharm_15(inharm14.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
|
abnormalPO.setInuharm_16(inharm15.get(0).getNormValue());
|
||||||
} else {
|
} else {
|
||||||
abnormalPO.setFreqDev(freq.get(j).getNormValue());
|
abnormalPO.setFreq(freq.get(0).getNormValue());
|
||||||
abnormalPO.setValueType("CP95");
|
abnormalPO.setValueType("CP95");
|
||||||
abnormalPO.setVoltageDev(voDev.get(j).getNormValue());
|
abnormalPO.setVoltageDev(voDev.get(0).getNormValue());
|
||||||
abnormalPO.setUvoltageDev(uoDev.get(j).getNormValue());
|
abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue());
|
||||||
abnormalPO.setFlickerAllTime(flicker.get(j).getNormValue());
|
abnormalPO.setFlicker(flicker.get(0).getNormValue());
|
||||||
abnormalPO.setUAberrance(uab.get(j).getNormValue());
|
abnormalPO.setUaberrance(uab.get(0).getNormValue());
|
||||||
abnormalPO.setUBalance(uba.get(j).getNormValue());
|
abnormalPO.setUbalance(uba.get(0).getNormValue());
|
||||||
abnormalPO.setINeg(ing.get(j).getNormValue());
|
abnormalPO.setINeg(ing.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm2(uharm2.get(j).getNormValue());
|
abnormalPO.setUharm_2(uharm2.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm3(uharm3.get(j).getNormValue());
|
abnormalPO.setUharm_3(uharm3.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm4(uharm4.get(j).getNormValue());
|
abnormalPO.setUharm_4(uharm4.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm5(uharm5.get(j).getNormValue());
|
abnormalPO.setUharm_5(uharm5.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm6(uharm6.get(j).getNormValue());
|
abnormalPO.setUharm_6(uharm6.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm7(uharm7.get(j).getNormValue());
|
abnormalPO.setUharm_7(uharm7.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm8(uharm8.get(j).getNormValue());
|
abnormalPO.setUharm_8(uharm8.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm9(uharm9.get(j).getNormValue());
|
abnormalPO.setUharm_9(uharm9.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm10(uharm10.get(j).getNormValue());
|
abnormalPO.setUharm_10(uharm10.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm11(uharm11.get(j).getNormValue());
|
abnormalPO.setUharm_11(uharm11.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm12(uharm12.get(j).getNormValue());
|
abnormalPO.setUharm_12(uharm12.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm13(uharm13.get(j).getNormValue());
|
abnormalPO.setUharm_13(uharm13.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm14(uharm14.get(j).getNormValue());
|
abnormalPO.setUharm_14(uharm14.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm15(uharm15.get(j).getNormValue());
|
abnormalPO.setUharm_15(uharm15.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm16(uharm16.get(j).getNormValue());
|
abnormalPO.setUharm_16(uharm16.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm17(uharm17.get(j).getNormValue());
|
abnormalPO.setUharm_17(uharm17.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm18(uharm18.get(j).getNormValue());
|
abnormalPO.setUharm_18(uharm18.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm19(uharm19.get(j).getNormValue());
|
abnormalPO.setUharm_19(uharm19.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm20(uharm20.get(j).getNormValue());
|
abnormalPO.setUharm_20(uharm20.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm21(uharm21.get(j).getNormValue());
|
abnormalPO.setUharm_21(uharm21.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm22(uharm22.get(j).getNormValue());
|
abnormalPO.setUharm_22(uharm22.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm23(uharm23.get(j).getNormValue());
|
abnormalPO.setUharm_23(uharm23.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm24(uharm24.get(j).getNormValue());
|
abnormalPO.setUharm_24(uharm24.get(0).getNormValue());
|
||||||
abnormalPO.setUHarm25(uharm25.get(j).getNormValue());
|
abnormalPO.setUharm_25(uharm25.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm2(iharm2.get(j).getNormValue());
|
abnormalPO.setIharm_2(iharm2.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm3(iharm3.get(j).getNormValue());
|
abnormalPO.setIharm_3(iharm3.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm4(iharm4.get(j).getNormValue());
|
abnormalPO.setIharm_4(iharm4.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm5(iharm5.get(j).getNormValue());
|
abnormalPO.setIharm_5(iharm5.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm6(iharm6.get(j).getNormValue());
|
abnormalPO.setIharm_6(iharm6.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm7(iharm7.get(j).getNormValue());
|
abnormalPO.setIharm_7(iharm7.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm8(iharm8.get(j).getNormValue());
|
abnormalPO.setIharm_8(iharm8.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm9(iharm9.get(j).getNormValue());
|
abnormalPO.setIharm_9(iharm9.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm10(iharm10.get(j).getNormValue());
|
abnormalPO.setIharm_10(iharm10.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm11(iharm11.get(j).getNormValue());
|
abnormalPO.setIharm_11(iharm11.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm12(iharm12.get(j).getNormValue());
|
abnormalPO.setIharm_12(iharm12.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm13(iharm13.get(j).getNormValue());
|
abnormalPO.setIharm_13(iharm13.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm14(iharm14.get(j).getNormValue());
|
abnormalPO.setIharm_14(iharm14.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm15(iharm15.get(j).getNormValue());
|
abnormalPO.setIharm_15(iharm15.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm16(iharm16.get(j).getNormValue());
|
abnormalPO.setIharm_16(iharm16.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm17(iharm17.get(j).getNormValue());
|
abnormalPO.setIharm_17(iharm17.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm18(iharm18.get(j).getNormValue());
|
abnormalPO.setIharm_18(iharm18.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm19(iharm19.get(j).getNormValue());
|
abnormalPO.setIharm_19(iharm19.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm20(iharm20.get(j).getNormValue());
|
abnormalPO.setIharm_20(iharm20.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm21(iharm21.get(j).getNormValue());
|
abnormalPO.setIharm_21(iharm21.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm22(iharm22.get(j).getNormValue());
|
abnormalPO.setIharm_22(iharm22.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm23(iharm23.get(j).getNormValue());
|
abnormalPO.setIharm_23(iharm23.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm24(iharm24.get(j).getNormValue());
|
abnormalPO.setIharm_24(iharm24.get(0).getNormValue());
|
||||||
abnormalPO.setIHarm25(iharm25.get(j).getNormValue());
|
abnormalPO.setIharm_25(iharm25.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm1(inharm.get(j).getNormValue());
|
abnormalPO.setInuharm_1(inharm.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm2(inharm1.get(j).getNormValue());
|
abnormalPO.setInuharm_2(inharm1.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm3(inharm2.get(j).getNormValue());
|
abnormalPO.setInuharm_3(inharm2.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm4(inharm3.get(j).getNormValue());
|
abnormalPO.setInuharm_4(inharm3.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm5(inharm4.get(j).getNormValue());
|
abnormalPO.setInuharm_5(inharm4.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm6(inharm5.get(j).getNormValue());
|
abnormalPO.setInuharm_6(inharm5.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm7(inharm6.get(j).getNormValue());
|
abnormalPO.setInuharm_7(inharm6.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm8(inharm7.get(j).getNormValue());
|
abnormalPO.setInuharm_8(inharm7.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm9(inharm8.get(j).getNormValue());
|
abnormalPO.setInuharm_9(inharm8.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm10(inharm9.get(j).getNormValue());
|
abnormalPO.setInuharm_10(inharm9.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm11(inharm10.get(j).getNormValue());
|
abnormalPO.setInuharm_11(inharm10.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm12(inharm11.get(j).getNormValue());
|
abnormalPO.setInuharm_12(inharm11.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm13(inharm12.get(j).getNormValue());
|
abnormalPO.setInuharm_13(inharm12.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm14(inharm13.get(j).getNormValue());
|
abnormalPO.setInuharm_14(inharm13.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm15(inharm14.get(j).getNormValue());
|
abnormalPO.setInuharm_15(inharm14.get(0).getNormValue());
|
||||||
abnormalPO.setInuHarm16(inharm15.get(j).getNormValue());
|
abnormalPO.setInuharm_16(inharm15.get(0).getNormValue());
|
||||||
}
|
}
|
||||||
abnormalMapper.insert(abnormalPO);
|
abnormalMapper.insert(abnormalPO);
|
||||||
return "预处理成功!";
|
|
||||||
}else {
|
|
||||||
return "预处理失败!";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -528,7 +532,7 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
sql = "SELECT v_thd as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_thd as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
sql = "SELECT i_neg as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
|
sql = "SELECT i_neg as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
sql = "SELECT freq as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
|
sql = "SELECT freq as normValue,value_type as valueType FROM day_v WHERE " + stringBuilder.toString();
|
||||||
@@ -606,7 +610,7 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
sql = "SELECT v_25 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_25 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 31:
|
case 31:
|
||||||
sql = "SELECT i_2 as normValue,value_type as valueType FROM day_harmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT i_2 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 32:
|
case 32:
|
||||||
sql = "SELECT i_3 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
sql = "SELECT i_3 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
||||||
@@ -678,52 +682,52 @@ public class NormalLimitServiceImpl implements NormalLimitService {
|
|||||||
sql = "SELECT i_25 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
sql = "SELECT i_25 as normValue,value_type as valueType FROM day_i WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 55:
|
case 55:
|
||||||
sql = "SELECT v_1 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_1 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 56:
|
case 56:
|
||||||
sql = "SELECT v_2 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_2 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 57:
|
case 57:
|
||||||
sql = "SELECT v_3 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_3 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 58:
|
case 58:
|
||||||
sql = "SELECT v_4 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_4 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 59:
|
case 59:
|
||||||
sql = "SELECT v_5 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_5 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 60:
|
case 60:
|
||||||
sql = "SELECT v_6 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_6 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 61:
|
case 61:
|
||||||
sql = "SELECT v_7 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_7 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 62:
|
case 62:
|
||||||
sql = "SELECT v_8 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_8 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 63:
|
case 63:
|
||||||
sql = "SELECT v_9 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_9 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 64:
|
case 64:
|
||||||
sql = "SELECT v_10 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_10 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 65:
|
case 65:
|
||||||
sql = "SELECT v_11 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_11 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 66:
|
case 66:
|
||||||
sql = "SELECT v_12 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_12 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 67:
|
case 67:
|
||||||
sql = "SELECT v_13 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_13 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 68:
|
case 68:
|
||||||
sql = "SELECT v_14 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_14 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 69:
|
case 69:
|
||||||
sql = "SELECT v_15 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_15 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 70:
|
case 70:
|
||||||
sql = "SELECT v_16 as normValue,value_type as valueType FROM day_inharmrate_v WHERE " + stringBuilder.toString();
|
sql = "SELECT v_16 as normValue,value_type as valueType FROM day_inharm_v WHERE " + stringBuilder.toString();
|
||||||
break;
|
break;
|
||||||
case 71:
|
case 71:
|
||||||
sql = "SELECT plt as normValue,value_type as valueType FROM day_plt WHERE " + stringBuilder.toString();
|
sql = "SELECT plt as normValue,value_type as valueType FROM day_plt WHERE " + stringBuilder.toString();
|
||||||
|
|||||||
Reference in New Issue
Block a user