1.监测点超标信息详情统计

2.终端在线率统计
This commit is contained in:
wr
2025-03-11 19:48:48 +08:00
parent 49daa2cc47
commit be8cf0e03b
23 changed files with 560 additions and 192 deletions

View File

@@ -205,10 +205,10 @@ public class ExecutionCenter extends BaseController {
if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
Dept data = deptFeignClient.getRootDept().getData();
deptGetLineParam.setDeptId(data.getId());
List<DeptGetDeviceDTO> list = commTerminalGeneralClient.deptGetDevice(deptGetLineParam).getData();
List<DeptGetDeviceDTO> list = commTerminalGeneralClient.deptGetDeviceAndMonitor(deptGetLineParam).getData();
DeptGetDeviceDTO dto = list.stream().filter(po -> Objects.equals(po.getUnitId(), data.getId())).collect(Collectors.toList()).get(0);
List<LineDevGetDTO> devList = dto.getDeviceList();
calculatedParam.setIdList(devList.stream().map(LineDevGetDTO::getDevId).distinct().collect(Collectors.toList()));
calculatedParam.setIdList(devList.stream().distinct().collect(Collectors.toList()));
}
LiteflowResponse liteflowResponse;
if (baseParam.isRepair()) {

View File

@@ -8,6 +8,8 @@ import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
import com.yomahub.liteflow.enums.NodeTypeEnum;
import lombok.RequiredArgsConstructor;
import javax.annotation.Resource;
/**
* @author hongawen
@@ -18,14 +20,15 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class DeviceExecutor extends BaseExecutor {
private final IDataOnlineRateService onlineRateService;
@Resource
private IDataOnlineRateService onlineRateService;
/**
* 算法名: 暂无-----终端在线率_日表(r_stat_onlinerate_d)
*
* @author xuyang
* @date 2023年11月30日 10:25
* @param bindCmp
* @return
*/
@LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "deviceOnlineRate", nodeType = NodeTypeEnum.COMMON)
public boolean deviceOnlineRateAccess(NodeComponent bindCmp) {

View File

@@ -16,5 +16,5 @@ public interface IDataOnlineRateService {
* @date 2023/11/09 10:08
* @param calculatedParam 查询条件
*/
void dataOnlineRate(CalculatedParam<String> calculatedParam);
void dataOnlineRate(CalculatedParam calculatedParam);
}

View File

@@ -4,15 +4,19 @@ package com.njcn.algorithm.serviceimpl.line;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.njcn.algorithm.pojo.bo.CalculatedParam;
import com.njcn.algorithm.service.line.IDataCrossingService;
import com.njcn.dataProcess.api.*;
import com.njcn.dataProcess.constant.PhaseType;
import com.njcn.dataProcess.enums.DataCleanEnum;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.*;
import com.njcn.dataProcess.pojo.po.PqDataVerify;
import com.njcn.dataProcess.util.TimeUtils;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.po.Overlimit;
@@ -30,10 +34,7 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -65,7 +66,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
private DataLimitRateFeignClient dataLimitRateFeignClient;
@Resource
private DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient;
@Resource
private PqDataVerifyFeignClient pqDataVerifyFeignClient;
@Override
public void limitRateHandler(CalculatedParam calculatedParam) {
logger.info("{},limitRate表转r_stat_limit_rate_d算法开始=====》", LocalDateTime.now());
@@ -78,8 +80,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
//获取所有监测点的限值
List<Overlimit> overLimitList = commTerminalGeneralClient.getOverLimitDataByIds(lineIds).getData();
Map<String, Overlimit> overLimitMap = overLimitList.stream().collect(Collectors.toMap(Overlimit::getId, Function.identity()));
//添加异常数据时间点
getAbnormalData(lineParam);
//以100个监测点分片处理
List<List<String>> pendingIds = ListUtils.partition(lineIds, NUM);
ArrayList<String> phase = ListUtil.toList(PhaseType.PHASE_A, PhaseType.PHASE_B, PhaseType.PHASE_C);
@@ -188,7 +190,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
.filter(x -> phase.contains(x.getPhasicType()))
.collect(Collectors.groupingBy(DataPltDto::getLineId));
for (String item : lineIds) {
for (String item : list) {
result.addAll(getData(calculatedParam.getDataDate(),
overLimitMap.get(item),
allTime.get(item),
@@ -204,8 +206,6 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
dataPlt.get(item)));
}
});
if (CollUtil.isNotEmpty(result)) {
@@ -288,7 +288,25 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
result.add(t);
return result;
}
/**
* @Description:
* @param lineParam
* @Author: wr
* @Date: 2025/3/11 9:04
*/
private void getAbnormalData(LineCountEvaluateParam lineParam) {
lineParam.setTableName(DataCleanEnum.DataV.getCode());
// 获取异常数据,用于排除异常数据
List<PqDataVerify> pqDataVerifies = pqDataVerifyFeignClient.queryData(lineParam).getData();
if (CollUtil.isNotEmpty(pqDataVerifies)) {
Map<String, List<String>> timeMap = pqDataVerifies.stream()
.collect(Collectors.groupingBy(
PqDataVerify::getLineId,
Collectors.mapping(item->TimeUtils.LocalDateTimeToString(item.getTime()), Collectors.toList())
));
lineParam.setAbnormalTime(timeMap);
}
}
/**
* @Description: limitRateData
@@ -327,8 +345,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
// 获取 Overlimit 类的 getUharmx 方法
Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit && value >= 0.0 && value <= 30.0) {
addAbnormalData(v[i - 2], item.getValueType(), item.getMinTime(), value, limit);
if (value > limit ) {
addAbnormalData(v[i - 2], item.getValueType(),item.getPhasicType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -353,8 +371,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
// 获取 Overlimit 类的 getUharmx 方法
Method getUharmMethod = Overlimit.class.getMethod("getIharm" + j);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit && value >= 0.0 && value <= 30.0) {
addAbnormalData(i[j - 2], item.getValueType(), item.getMinTime(), value, limit);
if (value > limit ) {
addAbnormalData(i[j - 2], item.getValueType(),item.getPhasicType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -378,8 +396,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
// 获取 Overlimit 类的 getUharmx 方法
Method getUharmMethod = Overlimit.class.getMethod("getInuharm" + j);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit && value >= 0.0 && value <= 30.0) {
addAbnormalData(uHarm[j - 1], item.getValueType(), item.getMinTime(), value, limit);
if (value > limit) {
addAbnormalData(uHarm[j - 1],item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -390,8 +408,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
//电压总谐波畸变率
if (!CollectionUtils.isEmpty(dataVPOList)) {
for (DataVDto item : dataVPOList) {
if (item.getVThd() > overlimit.getUaberrance() && item.getVThd() >= 0.0 && item.getVThd() <= 30.0) {
addAbnormalData(thd, item.getMinTime(), item.getValueType(), item.getVThd(), overlimit.getUaberrance());
if (item.getVThd() > overlimit.getUaberrance()) {
addAbnormalData(thd,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVThd(), overlimit.getUaberrance());
}
}
}
@@ -399,12 +417,12 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataVPODevList)) {
for (DataVDto item : dataVPODevList) {
if (item.getVlDev() >= 0) {
if (item.getVlDev() > overlimit.getVoltageDev() && item.getVlDev() >= 0.0 && item.getVlDev() <= 20.0) {
addAbnormalData(uDev, item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getVoltageDev());
if (item.getVlDev() > overlimit.getVoltageDev()) {
addAbnormalData(uDev,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVlDev(), overlimit.getVoltageDev());
}
} else {
if (Math.abs(item.getVuDev()) > Math.abs(overlimit.getUvoltageDev()) && Math.abs(item.getVuDev()) <= 20.0) {
addAbnormalData(uDev, item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getVoltageDev());
if (Math.abs(item.getVuDev()) > Math.abs(overlimit.getUvoltageDev()) ) {
addAbnormalData(uDev,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVlDev(), overlimit.getUvoltageDev());
}
}
}
@@ -412,8 +430,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
//长时间闪变
if (!CollectionUtils.isEmpty(dataPltPOList)) {
for (DataPltDto item : dataPltPOList) {
if (item.getPlt() > overlimit.getFlicker() && item.getPlt() >= 0 && item.getPlt() <= 20) {
addAbnormalData(flicker, item.getValueType(), item.getMinTime(), item.getPlt(), overlimit.getFlicker());
if (item.getPlt() > overlimit.getFlicker() ) {
addAbnormalData(flicker,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getPlt(), overlimit.getFlicker());
}
}
}
@@ -431,87 +449,6 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
limitRate.setVoltageDevOvertime(uDev.size());
dto.setDataLimitRate(getDataLimitRateDto(limitRate, v, i, uHarm));
DataLimitRateDetailDto detail = new DataLimitRateDetailDto();
int detailAllTime = flicker.size() + uAberrance.size() + iNeg.size() + freqDev.size() + thd.size() + uDev.size() +
v[0].size() + v[1].size() + v[2].size() + v[3].size() + v[4].size() + v[5].size() + v[6].size() + v[7].size() + v[8].size() + v[9].size() + v[11].size() + v[12].size() + v[13].size() + v[14].size() + v[15].size() + v[16].size() + v[17].size() + v[18].size() + v[19].size() + v[20].size() + v[21].size() + v[22].size() + v[23].size() +
i[0].size() + i[1].size() + i[2].size() + i[3].size() + i[4].size() + i[5].size() + i[6].size() + i[7].size() + i[8].size() + i[9].size() + i[10].size() + i[11].size() + i[12].size() + i[13].size() + i[14].size() + i[15].size() + i[16].size() + i[17].size() + i[18].size() + i[19].size() + i[20].size() + i[21].size() + i[22].size() + i[23].size() +
uHarm[0].size() + uHarm[1].size() + uHarm[2].size() + uHarm[3].size() + uHarm[4].size() + uHarm[5].size() + uHarm[6].size() + uHarm[7].size() + uHarm[8].size() + uHarm[9].size() + uHarm[10].size() + uHarm[11].size() + uHarm[12].size() + uHarm[13].size() + uHarm[14].size() + uHarm[15].size();
detail.setLineId(lineId);
detail.setPhasicType(phasicType);
detail.setTime(LocalDateTimeUtil.parseDate(dataDate, DatePattern.NORM_DATE_PATTERN));
detail.setAllTime(detailAllTime);
detail.setFlickerAllTime(flicker.size());
detail.setFlickerOvertime(JSON.toJSONString(flicker));
detail.setUaberranceOvertime(JSON.toJSONString(uAberrance));
detail.setINegOvertime(JSON.toJSONString(iNeg));
detail.setFreqDevOvertime(JSON.toJSONString(freqDev));
detail.setUbalanceOvertime(JSON.toJSONString(thd));
detail.setVoltageDevOvertime(JSON.toJSONString(uDev));
detail.setUharm2Overtime(JSON.toJSONString(v[0]));
detail.setUharm3Overtime(JSON.toJSONString(v[1]));
detail.setUharm4Overtime(JSON.toJSONString(v[2]));
detail.setUharm5Overtime(JSON.toJSONString(v[3]));
detail.setUharm6Overtime(JSON.toJSONString(v[4]));
detail.setUharm7Overtime(JSON.toJSONString(v[5]));
detail.setUharm8Overtime(JSON.toJSONString(v[6]));
detail.setUharm9Overtime(JSON.toJSONString(v[7]));
detail.setUharm10Overtime(JSON.toJSONString(v[8]));
detail.setUharm11Overtime(JSON.toJSONString(v[9]));
detail.setUharm12Overtime(JSON.toJSONString(v[10]));
detail.setUharm13Overtime(JSON.toJSONString(v[11]));
detail.setUharm14Overtime(JSON.toJSONString(v[12]));
detail.setUharm15Overtime(JSON.toJSONString(v[13]));
detail.setUharm16Overtime(JSON.toJSONString(v[14]));
detail.setUharm17Overtime(JSON.toJSONString(v[15]));
detail.setUharm18Overtime(JSON.toJSONString(v[16]));
detail.setUharm19Overtime(JSON.toJSONString(v[17]));
detail.setUharm20Overtime(JSON.toJSONString(v[18]));
detail.setUharm21Overtime(JSON.toJSONString(v[19]));
detail.setUharm22Overtime(JSON.toJSONString(v[20]));
detail.setUharm23Overtime(JSON.toJSONString(v[21]));
detail.setUharm24Overtime(JSON.toJSONString(v[22]));
detail.setUharm25Overtime(JSON.toJSONString(v[23]));
detail.setIharm2Overtime(JSON.toJSONString(i[0]));
detail.setIharm3Overtime(JSON.toJSONString(i[1]));
detail.setIharm4Overtime(JSON.toJSONString(i[2]));
detail.setIharm5Overtime(JSON.toJSONString(i[3]));
detail.setIharm6Overtime(JSON.toJSONString(i[4]));
detail.setIharm7Overtime(JSON.toJSONString(i[5]));
detail.setIharm8Overtime(JSON.toJSONString(i[6]));
detail.setIharm9Overtime(JSON.toJSONString(i[7]));
detail.setIharm10Overtime(JSON.toJSONString(i[8]));
detail.setIharm11Overtime(JSON.toJSONString(i[9]));
detail.setIharm12Overtime(JSON.toJSONString(i[10]));
detail.setIharm13Overtime(JSON.toJSONString(i[11]));
detail.setIharm14Overtime(JSON.toJSONString(i[12]));
detail.setIharm15Overtime(JSON.toJSONString(i[13]));
detail.setIharm16Overtime(JSON.toJSONString(i[14]));
detail.setIharm17Overtime(JSON.toJSONString(i[15]));
detail.setIharm18Overtime(JSON.toJSONString(i[16]));
detail.setIharm19Overtime(JSON.toJSONString(i[17]));
detail.setIharm20Overtime(JSON.toJSONString(i[18]));
detail.setIharm21Overtime(JSON.toJSONString(i[19]));
detail.setIharm22Overtime(JSON.toJSONString(i[20]));
detail.setIharm23Overtime(JSON.toJSONString(i[21]));
detail.setIharm24Overtime(JSON.toJSONString(i[22]));
detail.setIharm25Overtime(JSON.toJSONString(i[23]));
detail.setInuharm1Overtime(JSON.toJSONString(uHarm[0]));
detail.setInuharm2Overtime(JSON.toJSONString(uHarm[1]));
detail.setInuharm3Overtime(JSON.toJSONString(uHarm[2]));
detail.setInuharm4Overtime(JSON.toJSONString(uHarm[3]));
detail.setInuharm5Overtime(JSON.toJSONString(uHarm[4]));
detail.setInuharm6Overtime(JSON.toJSONString(uHarm[5]));
detail.setInuharm7Overtime(JSON.toJSONString(uHarm[6]));
detail.setInuharm8Overtime(JSON.toJSONString(uHarm[7]));
detail.setInuharm9Overtime(JSON.toJSONString(uHarm[8]));
detail.setInuharm10Overtime(JSON.toJSONString(uHarm[9]));
detail.setInuharm11Overtime(JSON.toJSONString(uHarm[10]));
detail.setInuharm12Overtime(JSON.toJSONString(uHarm[11]));
detail.setInuharm13Overtime(JSON.toJSONString(uHarm[12]));
detail.setInuharm14Overtime(JSON.toJSONString(uHarm[13]));
detail.setInuharm15Overtime(JSON.toJSONString(uHarm[14]));
detail.setInuharm16Overtime(JSON.toJSONString(uHarm[15]));
dto.setDataLimitRateDetail(detail);
return dto;
}
@@ -551,7 +488,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit) {
addAbnormalData(v[i - 2], item.getValueType(), item.getMinTime(), value, limit);
addAbnormalData(v[i - 2],item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -577,7 +514,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
Method getUharmMethod = Overlimit.class.getMethod("getIharm" + j);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit ) {
addAbnormalData(i[j - 2], item.getValueType(), item.getMinTime(), value, limit);
addAbnormalData(i[j - 2],item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -602,7 +539,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
Method getUharmMethod = Overlimit.class.getMethod("getInuharm" + j);
float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit ) {
addAbnormalData(uHarm[j - 1], item.getValueType(), item.getMinTime(), value, limit);
addAbnormalData(uHarm[j - 1],item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
} catch (Exception e) {
e.printStackTrace();
@@ -614,7 +551,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataVPOList)) {
for (DataVDto item : dataVPOList) {
if (item.getVThd() > overlimit.getUaberrance() ) {
addAbnormalData(thd, item.getMinTime(), item.getValueType(), item.getVThd(), overlimit.getUaberrance());
addAbnormalData(thd,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVThd(), overlimit.getUaberrance());
}
}
}
@@ -622,7 +559,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) {
for (DataVDto item : dataVPOUnbalanceList) {
if (item.getVUnbalance() > overlimit.getUbalance() ) {
addAbnormalData(uAberrance, item.getMinTime(), item.getValueType(), item.getVUnbalance(), overlimit.getUbalance());
addAbnormalData(uAberrance,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), overlimit.getUbalance());
}
}
}
@@ -630,7 +567,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataIPONegList)) {
for (DataIDto item : dataIPONegList) {
if (item.getINeg() > overlimit.getINeg()) {
addAbnormalData(iNeg, item.getMinTime(), item.getValueType(), item.getINeg(), overlimit.getINeg());
addAbnormalData(iNeg,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getINeg(), overlimit.getINeg());
}
}
}
@@ -638,7 +575,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataVPOFreqList)) {
for (DataVDto item : dataVPOFreqList) {
if (item.getFreqDev() > overlimit.getFreqDev() ) {
addAbnormalData(freqDev, item.getMinTime(), item.getValueType(), item.getFreqDev(), overlimit.getFreqDev());
addAbnormalData(freqDev,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getFreqDev(), overlimit.getFreqDev());
}
}
}
@@ -648,11 +585,11 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
for (DataVDto item : dataVPODevList) {
if (item.getVlDev() >= 0) {
if (item.getVlDev() > overlimit.getVoltageDev() ) {
addAbnormalData(uDev, item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getVoltageDev());
addAbnormalData(uDev,item.getPhasicType(), item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getVoltageDev());
}
} else {
if (Math.abs(item.getVuDev()) > Math.abs(overlimit.getUvoltageDev()) ) {
addAbnormalData(uDev, item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getVoltageDev());
addAbnormalData(uDev,item.getPhasicType(), item.getMinTime(), item.getValueType(), item.getVlDev(), overlimit.getUvoltageDev());
}
}
}
@@ -661,7 +598,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
if (!CollectionUtils.isEmpty(dataPltPOList)) {
for (DataPltDto item : dataPltPOList) {
if (item.getPlt() > overlimit.getFlicker() ) {
addAbnormalData(flicker, item.getValueType(), item.getMinTime(), item.getPlt(), overlimit.getFlicker());
addAbnormalData(flicker,item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getPlt(), overlimit.getFlicker());
}
}
}
@@ -741,6 +678,87 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
limitRate.setInuharm15Overtime(uHarm[14].stream().map(AbnormalData::getTime).distinct().collect(Collectors.toList()).size());
limitRate.setInuharm16Overtime(uHarm[15].stream().map(AbnormalData::getTime).distinct().collect(Collectors.toList()).size());
dto.setDataLimitRate(limitRate);
int detailAllTime = flicker.size() + uAberrance.size() + iNeg.size() + freqDev.size() + thd.size() + uDev.size() +
v[0].size() + v[1].size() + v[2].size() + v[3].size() + v[4].size() + v[5].size() + v[6].size() + v[7].size() + v[8].size() + v[9].size() + v[11].size() + v[12].size() + v[13].size() + v[14].size() + v[15].size() + v[16].size() + v[17].size() + v[18].size() + v[19].size() + v[20].size() + v[21].size() + v[22].size() + v[23].size() +
i[0].size() + i[1].size() + i[2].size() + i[3].size() + i[4].size() + i[5].size() + i[6].size() + i[7].size() + i[8].size() + i[9].size() + i[10].size() + i[11].size() + i[12].size() + i[13].size() + i[14].size() + i[15].size() + i[16].size() + i[17].size() + i[18].size() + i[19].size() + i[20].size() + i[21].size() + i[22].size() + i[23].size() +
uHarm[0].size() + uHarm[1].size() + uHarm[2].size() + uHarm[3].size() + uHarm[4].size() + uHarm[5].size() + uHarm[6].size() + uHarm[7].size() + uHarm[8].size() + uHarm[9].size() + uHarm[10].size() + uHarm[11].size() + uHarm[12].size() + uHarm[13].size() + uHarm[14].size() + uHarm[15].size();
if(detailAllTime>0){
DataLimitRateDetailDto detail = new DataLimitRateDetailDto();
detail.setLineId(lineId);
detail.setTime(LocalDateTimeUtil.parseDate(dataDate, DatePattern.NORM_DATE_PATTERN));
detail.setFlickerOvertime(toJson(flicker));
detail.setUaberranceOvertime(toJson(uAberrance));
detail.setINegOvertime(toJson(iNeg));
detail.setFreqDevOvertime(toJson(freqDev));
detail.setUbalanceOvertime(toJson(thd));
detail.setVoltageDevOvertime(toJson(uDev));
detail.setUharm2Overtime(toJson(v[0]));
detail.setUharm3Overtime(toJson(v[1]));
detail.setUharm4Overtime(toJson(v[2]));
detail.setUharm5Overtime(toJson(v[3]));
detail.setUharm6Overtime(toJson(v[4]));
detail.setUharm7Overtime(toJson(v[5]));
detail.setUharm8Overtime(toJson(v[6]));
detail.setUharm9Overtime(toJson(v[7]));
detail.setUharm10Overtime(toJson(v[8]));
detail.setUharm11Overtime(toJson(v[9]));
detail.setUharm12Overtime(toJson(v[10]));
detail.setUharm13Overtime(toJson(v[11]));
detail.setUharm14Overtime(toJson(v[12]));
detail.setUharm15Overtime(toJson(v[13]));
detail.setUharm16Overtime(toJson(v[14]));
detail.setUharm17Overtime(toJson(v[15]));
detail.setUharm18Overtime(toJson(v[16]));
detail.setUharm19Overtime(toJson(v[17]));
detail.setUharm20Overtime(toJson(v[18]));
detail.setUharm21Overtime(toJson(v[19]));
detail.setUharm22Overtime(toJson(v[20]));
detail.setUharm23Overtime(toJson(v[21]));
detail.setUharm24Overtime(toJson(v[22]));
detail.setUharm25Overtime(toJson(v[23]));
detail.setIharm2Overtime(toJson(i[0]));
detail.setIharm3Overtime(toJson(i[1]));
detail.setIharm4Overtime(toJson(i[2]));
detail.setIharm5Overtime(toJson(i[3]));
detail.setIharm6Overtime(toJson(i[4]));
detail.setIharm7Overtime(toJson(i[5]));
detail.setIharm8Overtime(toJson(i[6]));
detail.setIharm9Overtime(toJson(i[7]));
detail.setIharm10Overtime(toJson(i[8]));
detail.setIharm11Overtime(toJson(i[9]));
detail.setIharm12Overtime(toJson(i[10]));
detail.setIharm13Overtime(toJson(i[11]));
detail.setIharm14Overtime(toJson(i[12]));
detail.setIharm15Overtime(toJson(i[13]));
detail.setIharm16Overtime(toJson(i[14]));
detail.setIharm17Overtime(toJson(i[15]));
detail.setIharm18Overtime(toJson(i[16]));
detail.setIharm19Overtime(toJson(i[17]));
detail.setIharm20Overtime(toJson(i[18]));
detail.setIharm21Overtime(toJson(i[19]));
detail.setIharm22Overtime(toJson(i[20]));
detail.setIharm23Overtime(toJson(i[21]));
detail.setIharm24Overtime(toJson(i[22]));
detail.setIharm25Overtime(toJson(i[23]));
detail.setInuharm1Overtime(toJson(uHarm[0]));
detail.setInuharm2Overtime(toJson(uHarm[1]));
detail.setInuharm3Overtime(toJson(uHarm[2]));
detail.setInuharm4Overtime(toJson(uHarm[3]));
detail.setInuharm5Overtime(toJson(uHarm[4]));
detail.setInuharm6Overtime(toJson(uHarm[5]));
detail.setInuharm7Overtime(toJson(uHarm[6]));
detail.setInuharm8Overtime(toJson(uHarm[7]));
detail.setInuharm9Overtime(toJson(uHarm[8]));
detail.setInuharm10Overtime(toJson(uHarm[9]));
detail.setInuharm11Overtime(toJson(uHarm[10]));
detail.setInuharm12Overtime(toJson(uHarm[11]));
detail.setInuharm13Overtime(toJson(uHarm[12]));
detail.setInuharm14Overtime(toJson(uHarm[13]));
detail.setInuharm15Overtime(toJson(uHarm[14]));
detail.setInuharm16Overtime(toJson(uHarm[15]));
dto.setDataLimitRateDetail(detail);
}
return dto;
}
@@ -812,11 +830,34 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
limitRate.setInuharm16Overtime(uHarm[15].size());
return limitRate;
}
private String toJson(List<AbnormalData> list) {
Map<String, List<AbnormalData>> abnormalMap = list.stream().collect(Collectors.groupingBy(x->x.getPhasic()+"_"+x.getValueType()));
List<AbnormalData.Json> info=new ArrayList<>();
abnormalMap.forEach((key,value)->{
String[] split = key.split("_");
AbnormalData.Json json=new AbnormalData.Json();
json.setPhasic(split[0]);
json.setValueType(split[1]);
json.setTime(String.join(",", value.stream()
.map(abnormal -> abnormal.getTime())
.distinct()
.collect(Collectors.toList())));
json.setValue(String.join(",", value.stream()
.map(abnormal -> abnormal.getValue()+"")
.distinct()
.collect(Collectors.toList())));
info.add(json);
});
if(CollUtil.isNotEmpty(info)){
return JSON.toJSONString(info);
}
return null;
}
private void addAbnormalData(List<AbnormalData> list, String valueType, String time, double value, float overLimitValue) {
private void addAbnormalData(List<AbnormalData> list,String phasicType, String valueType, String time, Double value, float overLimitValue) {
AbnormalData data = new AbnormalData();
data.setTime(time);
data.setTime(time.substring(11, time.length()));
data.setPhasic(phasicType);
data.setValueType(valueType);
data.setValue(value);
data.setOverLimitValue(overLimitValue);

View File

@@ -2,30 +2,26 @@ package com.njcn.algorithm.serviceimpl.line;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil;
import com.njcn.algorithm.pojo.bo.CalculatedParam;
import com.njcn.algorithm.service.line.IDataOnlineRateService;
import com.njcn.dataProcess.api.DataOnlineRateFeignClient;
import com.njcn.dataProcess.api.DataVFeignClient;
import com.njcn.dataProcess.api.PqsCommunicateFeignClient;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
import com.njcn.dataProcess.util.TimeUtils;
import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import com.njcn.influx.pojo.po.PqsCommunicate;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.ListUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description:
@@ -37,40 +33,62 @@ import java.util.List;
public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
private final static Integer NUM = 100;
private final Integer online = 1;
private final Integer offline = 0;
@Resource
private PqsCommunicateFeignClient communicateFeignClient;
@Resource
private DataVFeignClient dataVFeignClient;
@Resource
private DataOnlineRateFeignClient onlineRateFeignClient;
@Override
public void dataOnlineRate(CalculatedParam<String> calculatedParam) {
public void dataOnlineRate(CalculatedParam calculatedParam) {
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));
List<String> devList = calculatedParam.getIdList();
List<LineDevGetDTO> devList = calculatedParam.getIdList();
List<List<String>> pendingIds = ListUtils.partition(devList, 1);
List<PqsCommunicateDto> outCommunicateData = new ArrayList<>();
for (List<String> dev : pendingIds) {
lineParam.setLineId(dev);
List<PqsCommunicateDto> data = communicateFeignClient.getRawDataLatest(lineParam).getData();
outCommunicateData.addAll(data);
}
Map<String, List<LineDevGetDTO>> LineDevGetMap = devList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
List<RStatOnlineRateDto.Detail> list = new ArrayList<>();
Date dateOut = DateUtil.parse(calculatedParam.getDataDate());
for (PqsCommunicateDto pqsCommunicate : outCommunicateData) {
RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
Date newDate = DateUtil.parse(pqsCommunicate.getTime());
lineParam.setLineId(Arrays.asList(pqsCommunicate.getDevId()));
RStatOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
onlineRateDpo.setTimeId(calculatedParam.getDataDate());
onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
onlineRateDpo.setOnlineMin(onLineRate.getOnlineMin());
onlineRateDpo.setOfflineMin(onLineRate.getOfflineMin());
list.add(onlineRateDpo);
if(ObjectUtil.isNotNull(calculatedParam.getType())){
LineDevGetMap.forEach((key,value)->{
RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
List<String> collect = value.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
lineParam.setLineId(collect);
Integer data = dataVFeignClient.getCountRawData(lineParam).getData();
onlineRateDpo.setTimeId(calculatedParam.getDataDate());
onlineRateDpo.setDevIndex(key);
if(data>0){
onlineRateDpo.setOnlineMin(InfluxDBPublicParam.DAY_MINUTE);
onlineRateDpo.setOfflineMin(0);
}else{
onlineRateDpo.setOnlineMin(0);
onlineRateDpo.setOfflineMin(InfluxDBPublicParam.DAY_MINUTE);
}
list.add(onlineRateDpo);
});
}else{
List<PqsCommunicateDto> outCommunicateData = new ArrayList<>();
LineDevGetMap.forEach((key,value)->{
lineParam.setLineId(Arrays.asList(key));
List<PqsCommunicateDto> data = communicateFeignClient.getRawDataLatest(lineParam).getData();
outCommunicateData.addAll(data);
});
Date dateOut = DateUtil.parse(calculatedParam.getDataDate());
for (PqsCommunicateDto pqsCommunicate : outCommunicateData) {
RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
Date newDate = DateUtil.parse(pqsCommunicate.getTime());
lineParam.setLineId(Arrays.asList(pqsCommunicate.getDevId()));
RStatOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
onlineRateDpo.setTimeId(calculatedParam.getDataDate());
onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
onlineRateDpo.setOnlineMin(onLineRate.getOnlineMin());
onlineRateDpo.setOfflineMin(onLineRate.getOfflineMin());
list.add(onlineRateDpo);
}
}
if (CollectionUtil.isNotEmpty(list)) {
System.out.println();
onlineRateFeignClient.batchInsertion(list);
}
}