monitorIds = deptLineService.getLineByDeptIds(ids,Stream.of(RunFlagEnum.RUNNING.getStatus()).collect(Collectors.toList()),Stream.of(0,1,2).collect(Collectors.toList()),monitorBaseParam.getObjType());
return monitorIds;
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java
index 719a06da0..089ac3545 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java
@@ -5,10 +5,13 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.dataProcess.enums.DataCleanEnum;
+import com.njcn.device.pq.constant.Param;
import com.njcn.device.pq.mapper.DataVerifyMapper;
import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
import com.njcn.device.pq.pojo.po.DataVerify;
+import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO;
import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
import com.njcn.device.pq.service.CommTerminalService;
import com.njcn.device.pq.service.IDataVerifyService;
@@ -19,8 +22,11 @@ import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static com.njcn.device.pq.constant.Param.freq;
+
/**
*
* 服务实现类
@@ -37,32 +43,31 @@ public class DataVerifyServiceImpl extends ServiceImpl monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam.getDeptId());
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.select(DataVerify::getLineId).between(DataVerify::getTime, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
- .in(DataVerify::getLineId,monitorIds).groupBy(DataVerify::getLineId);
- List list = this.list(lambdaQueryWrapper);
- VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO();
- verifyMonitorVO.setRunNum(monitorIds.size());
- verifyMonitorVO.setAbnormalNum(list.size());
- return verifyMonitorVO;
- }
-
- @Override
- public List> getRangeAbnormalMonitor(MonitorBaseParam monitorBaseParam) {
- List> result = new ArrayList<>();
-
- List monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam.getDeptId());
+ List monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(DataVerify::getTime, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(DataVerify::getLineId,monitorIds);
List dataVerifyList = this.list(lambdaQueryWrapper);
+ VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO();
+ verifyMonitorVO.setRunNum(monitorIds.size());
+ int count = dataVerifyList.stream().collect(Collectors.groupingBy(DataVerify::getLineId)).size();
+ verifyMonitorVO.setAbnormalNum(count);
+ List> mapList = getRangeAbnormalMonitor(monitorBaseParam,dataVerifyList);
+ verifyMonitorVO.setMapList(mapList);
+ getAbnormalTarget(dataVerifyList,verifyMonitorVO);
+ return verifyMonitorVO;
+ }
+
+ /**
+ * 时间范围异常测点数量
+ */
+ private List> getRangeAbnormalMonitor(MonitorBaseParam monitorBaseParam,List dataVerifyList) {
+ List> result = new ArrayList<>();
DateTime startTime = DateUtil.parse(monitorBaseParam.getSearchBeginTime());
DateTime endTime = DateUtil.parse(monitorBaseParam.getSearchEndTime());
if(startTime.year() == endTime.year() && startTime.month() == endTime.month()){
DateRange ranged = DateUtil.range(DateUtil.parse(monitorBaseParam.getSearchBeginTime()),DateUtil.parse(monitorBaseParam.getSearchEndTime()), DateField.DAY_OF_MONTH);
-
Map map = dataVerifyList.stream().collect(Collectors.groupingBy(it->it.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)),
Collectors.mapping(DataVerify::getLineId, Collectors.collectingAndThen(Collectors.toSet(), Set::size))));
for (DateTime dateTime : ranged) {
@@ -72,7 +77,6 @@ public class DataVerifyServiceImpl extends ServiceImpl dataVerifyList,VerifyMonitorVO powerQualityIndicatorsVO) {
+ Map> map = dataVerifyList.stream().collect(Collectors.groupingBy(it->it.getIndexCode()+"$"+it.getIndexTable(),Collectors.mapping(DataVerify::getLineId, Collectors.toSet())));
+ Pattern patternPhasic = Pattern.compile("v_(2|[3-9]|[1-4][0-9]|50)\\$data_harmphasic_v");
+ Pattern patternRate = Pattern.compile("v_(2|[3-9]|[1-4][0-9]|50)\\$data_harmrate_v");
+ Pattern patternInRate = Pattern.compile("v_(2|[3-9]|[1-4][0-9]|50)\\$data_inharmrate_v");
+
+ Set harmPhasicSet = new HashSet<>();
+ Set harmVSet = new HashSet<>();
+ Set inHarmVSet = new HashSet<>();
+
+ //正序、负序和零序电压
+ Set posVSet = new HashSet<>();
+ map.forEach((key,num)->{
+ if(patternPhasic.matcher(key).matches()){
+ key = Param.phasic_rate_$;
+ }else if(patternRate.matcher(key).matches()){
+ key = Param.v_rate;
+ }else if(patternInRate.matcher(key).matches()){
+ key = Param.in_v_rate;
+ }
+
+ switch (key){
+ case freq:
+ powerQualityIndicatorsVO.setFrequency(num.size());
+ break;
+ case Param.freq_dev:
+ powerQualityIndicatorsVO.setFrequencyDeviation(num.size());
+ break;
+ case Param.rms_v:
+ powerQualityIndicatorsVO.setPhaseOrLineVoltageRms(powerQualityIndicatorsVO.getPhaseOrLineVoltageRms()+num.size());
+ break;
+ case Param.rms_lvr:
+ powerQualityIndicatorsVO.setPhaseOrLineVoltageRms(powerQualityIndicatorsVO.getPhaseOrLineVoltageRms()+num.size());
+ break;
+ case Param.vu_dev:
+ powerQualityIndicatorsVO.setVoltageDeviation(num.size());
+ break;
+ case Param.rms_i:
+ powerQualityIndicatorsVO.setCurrentRms(num.size());
+ break;
+ case Param.v_thd:
+ powerQualityIndicatorsVO.setVoltageTotalHarmonicDistortion(num.size());
+ break;
+ case Param.v_1_v:
+ powerQualityIndicatorsVO.setPhaseOrLineVoltageFundamentalRms(num.size());
+ break;
+ case Param.phasic_v_1:
+ powerQualityIndicatorsVO.setPhaseOrLineVoltageFundamentalPhaseAngle(num.size());
+ break;
+ case Param.phasic_rate_$:
+ harmPhasicSet.addAll(num);
+ break;
+ case Param.v_rate:
+ harmVSet.addAll(num);
+ break;
+ case Param.in_v_rate:
+ inHarmVSet.addAll(num);
+ break;
+ case Param.v_zero:
+ case Param.v_neg:
+ case Param.v_pos:
+ posVSet.addAll(num);
+ break;
+ case Param.v_unbalance:
+ powerQualityIndicatorsVO.setBalanceV(num.size());
+ break;
+ case Param.fluc:
+ powerQualityIndicatorsVO.setVoltageFluctuation(num.size());
+ break;
+ case Param.plt:
+ powerQualityIndicatorsVO.setShortTermFlickerValue(num.size());
+ break;
+ case Param.pst:
+ powerQualityIndicatorsVO.setLongTermFlickerValue(num.size());
+ break;
+ default:
+ System.out.println("存在未知指标:"+key);
+ break;
+ }
+ });
+
+ powerQualityIndicatorsVO.setHarmonicVoltagePhaseAngle(harmPhasicSet.size());
+ powerQualityIndicatorsVO.setHarmonicVoltageContentRate(harmVSet.size());
+ powerQualityIndicatorsVO.setInterHarmonicVoltageContentRate(inHarmVSet.size());
+ powerQualityIndicatorsVO.setPositiveNegativeZeroSequenceVoltage(posVSet.size());
+ }
+
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
index 23086b8c2..e1c352aff 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
@@ -80,8 +80,8 @@ public class DeptLineServiceImpl extends ServiceImpl i
}
@Override
- public List getLineByDeptIds(List ids,List runFlag,List dataType) {
- return this.baseMapper.getLineIdByDeptIds(ids,runFlag,dataType);
+ public List getLineByDeptIds(List ids,List runFlag,List dataType,String objType) {
+ return this.baseMapper.getLineIdByDeptIds(ids,runFlag,dataType,objType);
}
@Override
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
index 22214b934..3826f6e3c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
@@ -767,8 +767,7 @@ public class GeneralDeviceService {
List deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, Stream.of(0, 1).collect(Collectors.toList())).getData();
if (CollUtil.isNotEmpty(deptDTOList)) {
List deptIds = deptDTOList.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList());
-
- return deptLineService.getLineByDeptIds(deptIds,runFlag,dataType);
+ return deptLineService.getLineByDeptIds(deptIds,runFlag,dataType,null);
}
return new ArrayList<>();
}
diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml
index bfe81fef6..dde044e19 100644
--- a/pqs-system/system-boot/pom.xml
+++ b/pqs-system/system-boot/pom.xml
@@ -92,6 +92,18 @@
1.0.0
+
+
+ com.njcn
+ cs-device-api
+ 1.0.0
+
+
+
+ com.njcn
+ algorithm-api
+ 1.0.0
+
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
index 31e0c13a9..7512e1616 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MeasurementTaskRunner.java
@@ -3,8 +3,9 @@ package com.njcn.system.timer.tasks;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
-import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
import com.njcn.system.timer.TimerTaskRunner;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@@ -22,6 +23,8 @@ public class MeasurementTaskRunner implements TimerTaskRunner {
private final LiteFlowFeignClient liteFlowFeignClient;
+ private final LiteFlowAlgorithmFeignClient liteFlowAlgorithmFeignClient;
+
@Override
public void action(String date) {
BaseParam baseParam = new BaseParam();
@@ -32,7 +35,7 @@ public class MeasurementTaskRunner implements TimerTaskRunner {
}else {
baseParam.setDataDate(date);
}
- liteFlowFeignClient.measurementPointExecutor(baseParam);
+ liteFlowAlgorithmFeignClient.measurementPointExecutor(baseParam);
}