异常数据功能重写

This commit is contained in:
2025-06-12 15:14:24 +08:00
parent e062edd913
commit 3b7991b5d7
8 changed files with 888 additions and 34 deletions

View File

@@ -21,45 +21,42 @@ public interface Param {
String freq = "freq$DataV"; String freq = "DataV-freq";
String freq_dev = "freq_dev$DataV"; String freq_dev = "DataV-freq_dev";
String rms_v = "DataV-rms";
String rms_lvr ="DataV-rms_lvr";
String vu_dev ="DataV-vu_dev";
String vl_dev="DataV-vl_dev";
String rms_i ="DataI-rms";
String v_thd = "DataV-v_thd";
String rms_v = "rms$DataV";
String rms_lvr ="rms_lvr$DataV";
String vu_dev ="vu_dev$DataV";
String rms_i ="rms$DataI";
String v_thd = "v_thd$DataV";
//相(线)电压基波有效值 //相(线)电压基波有效值
String v_1_v = "v_1$DataV"; String v_1_v = "DataV-v_1";
//相(线)电压基波相角 //相(线)电压基波相角
String phasic_v_1 = "v_1$DataHarmPhasicV"; String phasic_v_1 = "DataHarmPhasicV-v_1";
//谐波电压相角 //谐波电压相角
String phasic_rate_$ = "v_?$DataHarmPhasicV"; String phasic_rate_x = "DataHarmPhasicV-v";
//谐波电压含有率 //谐波电压含有率
String v_rate = "v_?$DataHarmRateV"; String v_rate = "DataHarmRateV-v";
//间谐波电压含有率 //间谐波电压含有率
String in_v_rate = "v_?$DataInHarmV"; String in_v_rate = "DataInHarmV-v";
//正序、负序和零序电压 //正序、负序和零序电压
String v_zero = "v_zero$DataV"; String v_zero = "DataV-v_zero";
String v_pos = "v_pos$DataV"; String v_pos = "DataV-v_pos";
String v_neg = "v_neg$DataV"; String v_neg = "DataV-v_neg";
//三相电压不平衡度 //三相电压不平衡度
String v_unbalance ="v_unbalance$DataV"; String v_unbalance ="DataV-v_unbalance";
//电压波动 //电压波动
String fluc = "fluc$DataFluc"; String fluc = "DataFluc-fluc";
//短时间闪变值 //短时间闪变值
String plt = "plt$DataPlt"; String plt = "DataPlt-plt";
//长时间闪变值 //长时间闪变值
String pst = "pst$DataPlt"; String pst = "DataFlicker-pst";
String Voltage_Rise = "r_mp_event_detail-Voltage_Rise";
String pf = "DataHarmPowerP-pf";
String ADD ="add"; String ADD ="add";

View File

@@ -0,0 +1,151 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
*
* </p>
*
* @author cdf
* @since 2025-06-10
*/
@Getter
@Setter
@TableName("pq_data_verify_bak")
public class PqDataVerifyBak {
private static final long serialVersionUID = 1L;
/**
* 监测点id
*/
private String lineId;
/**
* 异常数据时间
*/
private LocalDate timeId;
/**
* 频率(0:正常 1:异常)
*/
private Integer freq;
/**
* 频率偏差(0:正常 1:异常)
*/
private Integer freqDev;
/**
* 相电压有效值(0:正常 1:异常)
*/
private Integer vRms;
/**
* 正序电压(0:正常 1:异常)
*/
private Integer vPos;
/**
* 负序电压(0:正常 1:异常)
*/
private Integer vNeg;
/**
* 零序电压(0:正常 1:异常)
*/
private Integer vZero;
/**
* 电压不平衡度(0:正常 1:异常)
*/
private Integer vUnbalance;
/**
* 线电压有效值(0:正常 1:异常)
*/
private Integer rmsLvr;
/**
* 电压正偏差(0:正常 1:异常)
*/
private Integer vuDev;
/**
* 电压负偏差(0:正常 1:异常)
*/
private Integer vlDev;
/**
* 电压总谐波畸变率(0:正常 1:异常)
*/
private Integer vThd;
/**
* 相电压基波有效值(0:正常 1:异常)
*/
private Integer v;
/**
* 电流有效值(0:正常 1:异常)
*/
private Integer iRms;
/**
* 长时闪变(0:正常 1:异常)
*/
private Integer plt;
/**
* 间谐波电压含有率(0:正常 1:异常)
*/
private Integer vInharm;
/**
* 谐波电压含有率(0:正常 1:异常)
*/
private Integer vHarm;
/**
* 功率因数(0:正常 1:异常)
*/
private Integer pf;
/**
* 谐波电压相角(0:正常 1:异常)
*/
private Integer vPhasic;
/**
* 谐波电压基波相角(0:正常 1:异常)
*/
private Integer v1Phasic;
/**
* 电压波动(0:正常 1:异常)
*/
private Integer fluc;
/**
* 短时闪变(0:正常 1:异常)
*/
private Integer pst;
/**
* 判断所有指标 0:无异常 1:有异常
*/
private Integer state;
/**
* 文件路径
*/
private String path;
}

View File

@@ -20,12 +20,13 @@ public class VerifyMonitorVO {
@ApiModelProperty(value = "异常测点数量",name = "abnormalNum") @ApiModelProperty(value = "异常测点数量",name = "abnormalNum")
private Integer abnormalNum; private Integer abnormalNum;
@ApiModelProperty(value = "异常指标分类",name = "targetList")
private List<VerifyTargetVO> targetList; private List<VerifyTargetVO> targetList;
@ApiModelProperty(value = "时间范围异常测点数量",name = "mapList") @ApiModelProperty(value = "时间范围异常测点数量",name = "mapList")
private List<Map<String,Object>> mapList; private List<Map<String,Object>> mapList;
@ApiModelProperty(value = "异常装置信息",name = "monitorAlarmInfo")
private List<PowerQualityIndicatorsVO> monitorAlarmInfo; private List<PowerQualityIndicatorsVO> monitorAlarmInfo;

View File

@@ -13,6 +13,7 @@ import com.njcn.device.pq.pojo.vo.dataClean.DetailAbnormalVO;
import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO; import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO;
import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO; import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
import com.njcn.device.pq.service.IDataVerifyService; import com.njcn.device.pq.service.IDataVerifyService;
import com.njcn.device.pq.service.IPqDataVerifyBakService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -42,6 +43,8 @@ public class DataVerifyController extends BaseController {
private final IDataVerifyService iDataVerifyService; private final IDataVerifyService iDataVerifyService;
private final IPqDataVerifyBakService iPqDataVerifyBakService;
/** /**
* 获取异常监测点相关信息 * 获取异常监测点相关信息
@@ -51,7 +54,7 @@ public class DataVerifyController extends BaseController {
@ApiOperation("异常-获取异常数据主页面") @ApiOperation("异常-获取异常数据主页面")
public HttpResult<VerifyMonitorVO> getMonitorVerifyData(@RequestBody MonitorBaseParam monitorBaseParam){ public HttpResult<VerifyMonitorVO> getMonitorVerifyData(@RequestBody MonitorBaseParam monitorBaseParam){
String methodDescribe = getMethodDescribe("getMonitorVerifyData"); String methodDescribe = getMethodDescribe("getMonitorVerifyData");
VerifyMonitorVO verifyMonitorVO = iDataVerifyService.getMonitorVerifyData(monitorBaseParam); VerifyMonitorVO verifyMonitorVO = iPqDataVerifyBakService.getMonitorVerifyData(monitorBaseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, verifyMonitorVO, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, verifyMonitorVO, methodDescribe);
} }
@@ -60,7 +63,7 @@ public class DataVerifyController extends BaseController {
@ApiOperation("异常-更新按钮-获取异常数据列表") @ApiOperation("异常-更新按钮-获取异常数据列表")
public HttpResult<List<PowerQualityIndicatorsVO>> getMonitorVerifyDay(@RequestBody MonitorBaseParam monitorBaseParam){ public HttpResult<List<PowerQualityIndicatorsVO>> getMonitorVerifyDay(@RequestBody MonitorBaseParam monitorBaseParam){
String methodDescribe = getMethodDescribe("getMonitorVerifyDay"); String methodDescribe = getMethodDescribe("getMonitorVerifyDay");
List<PowerQualityIndicatorsVO> list = iDataVerifyService.getMonitorVerifyDay(monitorBaseParam); List<PowerQualityIndicatorsVO> list = iPqDataVerifyBakService.getMonitorVerifyDay(monitorBaseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
} }
@@ -73,7 +76,7 @@ public class DataVerifyController extends BaseController {
@ApiOperation("异常-弹框-获取异常监测点列表") @ApiOperation("异常-弹框-获取异常监测点列表")
public HttpResult<List<DetailAbnormalVO>> monitorAbnormalTable(@RequestBody MonitorBaseParam monitorBaseParam){ public HttpResult<List<DetailAbnormalVO>> monitorAbnormalTable(@RequestBody MonitorBaseParam monitorBaseParam){
String methodDescribe = getMethodDescribe("monitorAbnormalDetail"); String methodDescribe = getMethodDescribe("monitorAbnormalDetail");
List<DetailAbnormalVO> page = iDataVerifyService.monitorAbnormalTable(monitorBaseParam); List<DetailAbnormalVO> page = iPqDataVerifyBakService.monitorAbnormalTable(monitorBaseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
} }
@@ -87,7 +90,7 @@ public class DataVerifyController extends BaseController {
@ApiOperation("弹框-获取异常监测点列表详情") @ApiOperation("弹框-获取异常监测点列表详情")
public HttpResult<List<DetailAbnormalVO.DetailAbnormalInnerVO>> monitorAbnormalTableDetail(@RequestBody MonitorBaseParam monitorBaseParam){ public HttpResult<List<DetailAbnormalVO.DetailAbnormalInnerVO>> monitorAbnormalTableDetail(@RequestBody MonitorBaseParam monitorBaseParam){
String methodDescribe = getMethodDescribe("monitorAbnormalTableDetail"); String methodDescribe = getMethodDescribe("monitorAbnormalTableDetail");
List<DetailAbnormalVO.DetailAbnormalInnerVO> list = iDataVerifyService.monitorAbnormalTableDetail(monitorBaseParam); List<DetailAbnormalVO.DetailAbnormalInnerVO> list = iPqDataVerifyBakService.monitorAbnormalTableDetail(monitorBaseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
} }

View File

@@ -0,0 +1,16 @@
package com.njcn.device.pq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cdf
* @since 2025-06-10
*/
public interface PqDataVerifyBakMapper extends BaseMapper<PqDataVerifyBak> {
}

View File

@@ -0,0 +1,36 @@
package com.njcn.device.pq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
import com.njcn.device.pq.pojo.vo.dataClean.DetailAbnormalVO;
import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO;
import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author cdf
* @since 2025-06-10
*/
public interface IPqDataVerifyBakService extends IService<PqDataVerifyBak> {
VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam);
List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam);
List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam);
List<DetailAbnormalVO.DetailAbnormalInnerVO> monitorAbnormalTableDetail(MonitorBaseParam monitorBaseParam);
}

View File

@@ -30,6 +30,7 @@ import com.njcn.device.pq.constant.Param;
import com.njcn.device.pq.mapper.DataVerifyMapper; import com.njcn.device.pq.mapper.DataVerifyMapper;
import com.njcn.device.pq.mapper.LineDetailMapper; import com.njcn.device.pq.mapper.LineDetailMapper;
import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.mapper.PqDataVerifyBakMapper;
import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam; import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
import com.njcn.device.pq.pojo.po.DataVerify; import com.njcn.device.pq.pojo.po.DataVerify;
@@ -66,7 +67,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.njcn.device.pq.constant.Param.freq;
/** /**
@@ -103,6 +103,8 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
private final DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient; private final DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient;
private final DicDataFeignClient dicDataFeignClient; private final DicDataFeignClient dicDataFeignClient;
private final PqDataVerifyBakMapper pqDataVerifyBakMapper;
@Override @Override
public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) { public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) {
@@ -174,7 +176,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
} }
List<DataVerify> dataVerifyList = this.list(lambdaQueryWrapper); List<DataVerify> dataVerifyList = this.list(lambdaQueryWrapper);
Map<LocalDateTime, List<DataVerify>> listMap = dataVerifyList.stream().collect(Collectors.groupingBy(DataVerify::getTime, TreeMap::new, Map<LocalDateTime, List<DataVerify>> listMap = dataVerifyList.stream().collect(Collectors.groupingBy(DataVerify::getTime, TreeMap::new,
Collectors.toList())); Collectors.toList()));
listMap.forEach((time, timeList) -> { listMap.forEach((time, timeList) -> {
@@ -217,7 +218,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
}); });
}); });
}); });
return result; return result;
} }

View File

@@ -0,0 +1,650 @@
package com.njcn.device.pq.service.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.*;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONConfig;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONTokener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
import com.njcn.dataProcess.enums.DataCleanEnum;
import com.njcn.dataProcess.param.DataCleanParam;
import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.device.pq.constant.Param;
import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.mapper.PqDataVerifyBakMapper;
import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
import com.njcn.device.pq.pojo.po.DataVerify;
import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.pojo.vo.dataClean.DetailAbnormalVO;
import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO;
import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
import com.njcn.device.pq.pojo.vo.dataClean.VerifyTargetVO;
import com.njcn.device.pq.service.CommTerminalService;
import com.njcn.device.pq.service.IPqDataVerifyBakService;
import com.njcn.harmonic.enums.HarmonicResponseEnum;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.supervision.api.UserLedgerFeignClient;
import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
import com.njcn.system.api.DictTreeFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.po.SysDicTreePO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.io.InputStream;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* <p>
* 服务实现类
* </p>
*
* @author cdf
* @since 2025-06-10
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMapper, PqDataVerifyBak> implements IPqDataVerifyBakService {
private static final String SEPARATOR = "-";
private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN);
private final CommTerminalService commTerminalService;
private final PqReasonableRangeFeignClient pqReasonableRangeFeignClient;
private final LineMapper lineMapper;
private final DictTreeFeignClient dictTreeFeignClient;
private final UserLedgerFeignClient userLedgerFeignClient;
private final FileStorageUtil fileStorageUtil;
@Override
public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) {
List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
if (CollUtil.isEmpty(monitorIds)) {
throw new BusinessException(DeviceResponseEnum.QUERY_LINE_DATA_EMPTY);
}
List<PqDataVerifyBak> dataVerifyList = baseDataVerifyQuery(monitorIds, monitorBaseParam);
VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO();
verifyMonitorVO.setRunNum(monitorIds.size());
verifyMonitorVO.setAbnormalNum(dataVerifyList.stream().collect(Collectors.groupingBy(PqDataVerifyBak::getLineId)).size());
List<PqDataVerifyBak> dataSumVerifyList = baseDataSumVerifyQuery(monitorIds, monitorBaseParam);
verifyMonitorVO.setMapList(getRangeAbnormalMonitor(monitorBaseParam, dataVerifyList));
verifyMonitorVO.setTargetList(getAbnormalTarget(dataSumVerifyList));
verifyMonitorVO.setMonitorAlarmInfo(getAbnormalTable(dataVerifyList, monitorBaseParam));
return verifyMonitorVO;
}
public List<PowerQualityIndicatorsVO> getAbnormalTable(List<PqDataVerifyBak> dataVerifyList, MonitorBaseParam monitorBaseParam) {
List<PowerQualityIndicatorsVO> result = new ArrayList<>();
Map<String, List<PqDataVerifyBak>> dataMap = dataVerifyList.stream().collect(Collectors.groupingBy(PqDataVerifyBak::getLineId));
dataMap.forEach((key, list) -> {
List<LocalDate> dateList = list.stream().map(PqDataVerifyBak::getTimeId).sorted(Comparator.comparing(Function.identity())).collect(Collectors.toList());
processTable(monitorBaseParam, dateList, result, key);
});
dealTableResult(result);
return result;
}
/**
* 判断测点是否存在连续异常数据
*/
private void processTable(MonitorBaseParam monitorBaseParam, List<LocalDate> dateList, List<PowerQualityIndicatorsVO> result, String lineId) {
Integer warnDay = monitorBaseParam.getWarnDayLimit();
Integer alarmDay = monitorBaseParam.getAlarmDayLimit();
//检查是否有连续指定天数的告警
boolean warnFlag = verData(dateList, warnDay);
boolean alarmFlag = verData(dateList, alarmDay);
if (warnFlag) {
PowerQualityIndicatorsVO vo = new PowerQualityIndicatorsVO();
vo.setMonitorId(lineId);
if (alarmFlag) {
vo.setSeverity(1);
} else {
vo.setSeverity(0);
}
vo.setAbnormalDay(dateList.size());
result.add(vo);
}
}
private void dealTableResult(List<PowerQualityIndicatorsVO> result) {
if (CollUtil.isNotEmpty(result)) {
List<SysDicTreePO> dicTreePOList = dictTreeFeignClient.queryAllByType(Integer.valueOf(DicDataEnum.Obj_Type.getCode())).getData();
Map<String, SysDicTreePO> sysDicTreePOMap = dicTreePOList.stream().collect(Collectors.toMap(SysDicTreePO::getId, Function.identity()));
List<String> ids = result.stream().map(PowerQualityIndicatorsVO::getMonitorId).distinct().collect(Collectors.toList());
List<AreaLineInfoVO> areaLineInfoVOList = lineMapper.getBaseLineAreaInfo(ids, null, null);
Map<String, AreaLineInfoVO> areaMap = areaLineInfoVOList.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity()));
List<String> objIds = areaLineInfoVOList.stream().map(AreaLineInfoVO::getObjId).distinct().collect(Collectors.toList());
List<NewUserReportVO> userLedgerVOList = userLedgerFeignClient.getUserReportByIds(objIds).getData();
Map<String, NewUserReportVO> userMap = userLedgerVOList.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity()));
result.forEach(it -> {
if (areaMap.containsKey(it.getMonitorId())) {
AreaLineInfoVO areaLineInfoVO = areaMap.get(it.getMonitorId());
it.setMonitorName(areaLineInfoVO.getLineName());
it.setStationName(areaLineInfoVO.getSubName());
it.setDevName(areaLineInfoVO.getDeviceName());
it.setVoltageLevel(areaLineInfoVO.getVoltageScale());
it.setIp(Base64.encode(areaLineInfoVO.getIp()));
it.setManufacturer(areaLineInfoVO.getManufacturer());
if (sysDicTreePOMap.containsKey(areaLineInfoVO.getSmallObjType())) {
it.setObjType(sysDicTreePOMap.get(areaLineInfoVO.getSmallObjType()).getName());
}
if (userMap.containsKey(areaLineInfoVO.getObjId())) {
it.setObjName(userMap.get(areaLineInfoVO.getObjId()).getProjectName());
}
}
});
}
}
@Override
public List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam) {
List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
List<PqDataVerifyBak> dataVerifyList = baseDataVerifyQuery(monitorIds, monitorBaseParam);
return getAbnormalTable(dataVerifyList, monitorBaseParam);
}
@Override
public List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam) {
List<DetailAbnormalVO> result = new ArrayList<>();
Map<String, PqReasonableRangeDto> rangeMap= getStandRange();
if(StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
if (!rangeMap.containsKey(monitorBaseParam.getTargetKey())) {
throw new BusinessException("targetKey异常参数!");
}
}
List<LineDevGetDTO> lineDetailList = lineMapper.getMonitorListDetail(monitorBaseParam.getMonitorIds());
Map<String, LineDevGetDTO> lineDetailMap = lineDetailList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, Function.identity()));
LambdaQueryWrapper<PqDataVerifyBak> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(PqDataVerifyBak::getLineId, monitorBaseParam.getMonitorIds())
.eq(PqDataVerifyBak::getState, 1)
.orderByAsc(PqDataVerifyBak::getTimeId);
if(StrUtil.isNotBlank(monitorBaseParam.getTargetKey())){
switch (monitorBaseParam.getTargetKey()) {
case Param.freq:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFreq,1);
break;
case Param.freq_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFreqDev,1);
break;
case Param.rms_v:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVRms,1);
break;
case Param.rms_lvr:
lambdaQueryWrapper.eq(PqDataVerifyBak::getRmsLvr,1);
break;
case Param.vu_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVuDev,1);
break;
case Param.vl_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVlDev,1);
break;
case Param.rms_i:
lambdaQueryWrapper.eq(PqDataVerifyBak::getIRms,1);
break;
case Param.v_thd:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVThd,1);
break;
case Param.v_1_v:
lambdaQueryWrapper.eq(PqDataVerifyBak::getV,1);
break;
case Param.phasic_v_1:
lambdaQueryWrapper.eq(PqDataVerifyBak::getV1Phasic,1);
break;
case Param.phasic_rate_x:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVPhasic,1);
break;
case Param.v_rate:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVHarm,1);
break;
case Param.in_v_rate:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVInharm,1);
break;
case Param.v_zero:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVZero,1);
break;
case Param.v_neg:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVNeg,1);
break;
case Param.v_pos:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVPos,1);
break;
case Param.v_unbalance:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVUnbalance,1);
break;
case Param.fluc:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFluc,1);
break;
case Param.pst:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPst,1);
break;
case Param.plt:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPlt,1);
break;
case Param.pf:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPf,1);
break;
default:
log.error("未匹配到异常数据指标");
break;
}
}
List<PqDataVerifyBak> dataVerifyList = this.list(lambdaQueryWrapper);
for (PqDataVerifyBak pqDataVerifyBak : dataVerifyList) {
Set<String> set = new HashSet<>();
try (InputStream fileStream = fileStorageUtil.getFileStream(pqDataVerifyBak.getPath())) {
JSONArray jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig()));
jsonArray.forEach(it -> {
JSONObject targetJson = (JSONObject) it;
if (StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
if (targetJson.containsKey(monitorBaseParam.getTargetKey())) {
JSONArray innerJson = targetJson.getJSONArray(monitorBaseParam.getTargetKey());
JSONObject jsonObjectTem = (JSONObject) innerJson.get(0);
JSONArray list = jsonObjectTem.getJSONArray("list");
list.forEach(listItem -> {
JSONObject object = (JSONObject) listItem;
JSONArray timeArr = object.getJSONArray("time");
timeArr.forEach(timeJson -> set.add((String) timeJson));
});
DetailAbnormalVO detailAbnormalVO = new DetailAbnormalVO();
LineDevGetDTO lineDevGetDTO = lineDetailMap.get(pqDataVerifyBak.getLineId());
detailAbnormalVO.setTimeSum((long) lineDevGetDTO.getTimeInterval() * set.size());
detailAbnormalVO.setDate(pqDataVerifyBak.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
detailAbnormalVO.setMonitorName(lineDevGetDTO.getPointName());
detailAbnormalVO.setMonitorId(lineDevGetDTO.getPointId());
detailAbnormalVO.setTargetKey(monitorBaseParam.getTargetKey());
result.add(detailAbnormalVO);
}
} else {
rangeMap.forEach((rangeKey, val) -> {
if (targetJson.containsKey(rangeKey)) {
JSONArray innerJson = targetJson.getJSONArray(rangeKey);
JSONObject jsonObjectTem = (JSONObject) innerJson.get(0);
JSONArray list = jsonObjectTem.getJSONArray("list");
list.forEach(listItem -> {
JSONObject object = (JSONObject) listItem;
JSONArray timeArr = object.getJSONArray("time");
timeArr.forEach(timeJson -> set.add((String) timeJson));
});
DetailAbnormalVO detailAbnormalVO = new DetailAbnormalVO();
LineDevGetDTO lineDevGetDTO = lineDetailMap.get(pqDataVerifyBak.getLineId());
detailAbnormalVO.setTimeSum((long) lineDevGetDTO.getTimeInterval() * set.size());
detailAbnormalVO.setDate(pqDataVerifyBak.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
detailAbnormalVO.setMonitorName(lineDevGetDTO.getPointName());
detailAbnormalVO.setMonitorId(lineDevGetDTO.getPointId());
detailAbnormalVO.setTargetKey(rangeKey);
result.add(detailAbnormalVO);
}
});
}
});
} catch (Exception e) {
throw new BusinessException("数据异常");
}
}
return result;
}
@Override
public List<DetailAbnormalVO.DetailAbnormalInnerVO> monitorAbnormalTableDetail(MonitorBaseParam monitorBaseParam) {
Map<String, PqReasonableRangeDto> dtoMap = getStandRange();
if(StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
if (!dtoMap.containsKey(monitorBaseParam.getTargetKey())) {
throw new BusinessException("targetKey异常参数!");
}
}
List<DetailAbnormalVO.DetailAbnormalInnerVO> result = new ArrayList<>();
LambdaQueryWrapper<PqDataVerifyBak> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())))
.in(PqDataVerifyBak::getLineId, monitorBaseParam.getMonitorIds()).orderByAsc(PqDataVerifyBak::getTimeId);
PqDataVerifyBak pqDataVerifyBak = this.getOne(lambdaQueryWrapper);
try (InputStream fileStream = fileStorageUtil.getFileStream(pqDataVerifyBak.getPath())) {
JSONArray jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig()));
for (Object it : jsonArray) {
JSONObject targetJson = (JSONObject) it;
if (StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
if (targetJson.containsKey(monitorBaseParam.getTargetKey())) {
resultDeal(dtoMap, monitorBaseParam.getTargetKey(), targetJson, result);
break;
}
} else {
String tarKey = "";
for (Map.Entry<String, PqReasonableRangeDto> entry : dtoMap.entrySet()) {
String key = entry.getKey();
if (targetJson.containsKey(key)) {
tarKey = key;
break;
}
}
resultDeal(dtoMap, tarKey, targetJson, result);
}
}
} catch (Exception e) {
throw new BusinessException("数据异常");
}
return result;
}
private void resultDeal(Map<String, PqReasonableRangeDto> dtoMap, String targetKey, JSONObject targetJson, List<DetailAbnormalVO.DetailAbnormalInnerVO> result) {
PqReasonableRangeDto pqReasonableRangeDto = dtoMap.get(targetKey);
JSONArray innerJson = targetJson.getJSONArray(targetKey);
JSONObject jsonObjectTem = (JSONObject) innerJson.get(0);
String targetName = jsonObjectTem.get("targetName").toString();
JSONArray list = jsonObjectTem.getJSONArray("list");
List<DetailAbnormalVO.DetailLimitInnerVO> temList = new ArrayList<>();
list.forEach(listItem -> {
JSONObject object = (JSONObject) listItem;
JSONArray timeArr = object.getJSONArray("time");
JSONArray valueArr = object.getJSONArray("value");
String phase = object.get("phasic").toString();
String valueType = object.get("valueType").toString();
for (int i = 0; i < timeArr.size(); i++) {
DetailAbnormalVO.DetailLimitInnerVO temData = new DetailAbnormalVO.DetailLimitInnerVO();
temData.setTime(timeArr.get(i).toString());
temData.setVal(valueArr.get(i).toString());
temData.setTargetName(targetName);
temData.setTargetKey(targetKey);
temData.setPhaseType(phase);
temData.setType(valueType);
temList.add(temData);
}
});
Map<String, List<DetailAbnormalVO.DetailLimitInnerVO>> listMap = temList.stream().collect(Collectors.groupingBy(DetailAbnormalVO.DetailLimitInnerVO::getTime, TreeMap::new, Collectors.toList()));
listMap.forEach((time, timeList) -> {
Map<String, List<DetailAbnormalVO.DetailLimitInnerVO>> indexMap = timeList.stream().collect(Collectors.groupingBy(DetailAbnormalVO.DetailLimitInnerVO::getTargetKey));
indexMap.forEach((target, targetList) -> {
String unit;
if (StrUtil.isNotBlank(pqReasonableRangeDto.getUnit())) {
unit = pqReasonableRangeDto.getUnit();
} else {
unit = "";
}
Map<String, List<DetailAbnormalVO.DetailLimitInnerVO>> phaseMap = timeList.stream().collect(Collectors.groupingBy(DetailAbnormalVO.DetailLimitInnerVO::getPhaseType));
phaseMap.forEach((phaseKey, valueList) -> {
DetailAbnormalVO.DetailAbnormalInnerVO vo = new DetailAbnormalVO.DetailAbnormalInnerVO();
vo.setTime(time);
vo.setTargetName(timeList.get(0).getTargetName());
vo.setTargetKey(targetKey);
vo.setPhaseType(phaseKey);
vo.setRangeDesc(pqReasonableRangeDto.getMinValue() + unit + " ~ " + pqReasonableRangeDto.getMaxValue() + unit);
valueList.forEach(ites -> {
switch (ites.getType()) {
case "AVG":
vo.setAvg(ites.getVal());
break;
case "MAX":
vo.setMax(ites.getVal());
break;
case "MIN":
vo.setMin(ites.getVal());
break;
case "CP95":
vo.setCp95(ites.getVal());
break;
}
});
result.add(vo);
});
});
});
}
private List<PqDataVerifyBak> baseDataVerifyQuery(List<String> monitorIds, MonitorBaseParam monitorBaseParam) {
LambdaQueryWrapper<PqDataVerifyBak> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(PqDataVerifyBak::getLineId, monitorIds)
.eq(PqDataVerifyBak::getState, 1)
.orderByAsc(PqDataVerifyBak::getTimeId);
return this.list(lambdaQueryWrapper);
}
private List<PqDataVerifyBak> baseDataSumVerifyQuery(List<String> monitorIds, MonitorBaseParam monitorBaseParam) {
QueryWrapper<PqDataVerifyBak> queryWrapper = new QueryWrapper<>();
queryWrapper.select("line_id as lineId,sum(freq) as freq,sum(freq_Dev) as freqDev,sum(v_Rms) as vRms,sum(v_Pos) as vPos,sum(v_Neg) as vNeg," +
"sum(v_Zero) as vZero,sum(v_Unbalance) as vUnbalance,sum(rms_Lvr) as rmsLvr,sum(vu_Dev) as vuDev,sum(vl_Dev) as vlDev," +
"sum(v_Thd) as vThd,sum(v) as v,sum(i_Rms) as iRms,sum(plt) as plt,sum(v_Inharm) as vInharm,sum(v_Harm) as vHarm,sum(pf) as pf," +
"sum(v_Phasic) as vPhasic,sum(v1_Phasic) as v1Phasic,sum(fluc) as fluc,sum(pst) as pst,sum(state) as state")
.lambda().between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(PqDataVerifyBak::getLineId, monitorIds)
.eq(PqDataVerifyBak::getState, 1)
.groupBy(PqDataVerifyBak::getLineId);
return this.list(queryWrapper);
}
/**
* 时间范围异常测点数量
*/
private List<Map<String, Object>> getRangeAbnormalMonitor(MonitorBaseParam monitorBaseParam, List<PqDataVerifyBak> dataVerifyList) {
List<Map<String, Object>> 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<String, Integer> map = dataVerifyList.stream().collect(Collectors.groupingBy(its -> its.getTimeId().format(DATE_FORMAT),
Collectors.mapping(PqDataVerifyBak::getLineId, Collectors.collectingAndThen(Collectors.toSet(), Set::size))));
for (DateTime dateTime : ranged) {
Map<String, Object> rangeMap = new HashMap<>();
String time = DateUtil.format(dateTime, DATE_FORMAT);
rangeMap.put("time", time);
rangeMap.put("val", map.getOrDefault(time, 0));
result.add(rangeMap);
}
} else {
//不在一个月则展示月数据
DateRange ranged = DateUtil.range(DateUtil.parse(monitorBaseParam.getSearchBeginTime()), DateUtil.parse(monitorBaseParam.getSearchEndTime()), DateField.MONTH);
if (CollUtil.isNotEmpty(dataVerifyList)) {
Map<String, Integer> map = dataVerifyList.stream().collect(Collectors.groupingBy(it -> it.getTimeId().format(DateTimeFormatter.ofPattern(DatePattern.NORM_MONTH_PATTERN)),
Collectors.mapping(PqDataVerifyBak::getLineId, Collectors.collectingAndThen(Collectors.toSet(), Set::size))));
for (DateTime dateTime : ranged) {
Map<String, Object> rangeMap = new HashMap<>();
String time = DateUtil.format(dateTime, DateTimeFormatter.ofPattern(DatePattern.NORM_MONTH_PATTERN));
rangeMap.put("time", time);
rangeMap.put("val", map.getOrDefault(time, 0));
result.add(rangeMap);
}
}
}
return result;
}
/**
* 指标异常测点数量
*/
public List<VerifyTargetVO> getAbnormalTarget(List<PqDataVerifyBak> dataVerifyList) {
List<VerifyTargetVO> result = new ArrayList<>();
Map<String, PqReasonableRangeDto> rangeMap = getStandRange();
rangeMap.forEach((key, dto) -> {
Set<String> ids;
switch (key) {
case Param.freq:
ids = dataVerifyList.stream().filter(it -> it.getFreq() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.freq_dev:
ids = dataVerifyList.stream().filter(it -> it.getFreqDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_v:
ids = dataVerifyList.stream().filter(it -> it.getVRms() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_lvr:
ids = dataVerifyList.stream().filter(it -> it.getRmsLvr() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.vu_dev:
ids = dataVerifyList.stream().filter(it -> it.getVuDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.vl_dev:
ids = dataVerifyList.stream().filter(it -> it.getVlDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_i:
ids = dataVerifyList.stream().filter(it -> it.getIRms() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_thd:
ids = dataVerifyList.stream().filter(it -> it.getVThd() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_1_v:
ids = dataVerifyList.stream().filter(it -> it.getV() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.phasic_v_1:
ids = dataVerifyList.stream().filter(it -> it.getV1Phasic() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.phasic_rate_x:
ids = dataVerifyList.stream().filter(it -> it.getVPhasic() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_rate:
ids = dataVerifyList.stream().filter(it -> it.getVHarm() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.in_v_rate:
ids = dataVerifyList.stream().filter(it -> it.getVInharm() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_zero:
ids = dataVerifyList.stream().filter(it -> it.getVZero() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_neg:
ids = dataVerifyList.stream().filter(it -> it.getVNeg() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_pos:
ids = dataVerifyList.stream().filter(it -> it.getVPos() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_unbalance:
ids = dataVerifyList.stream().filter(it -> it.getVUnbalance() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.fluc:
ids = dataVerifyList.stream().filter(it -> it.getFluc() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.pst:
ids = dataVerifyList.stream().filter(it -> it.getPst() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.plt:
ids = dataVerifyList.stream().filter(it -> it.getPlt() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.pf:
ids = dataVerifyList.stream().filter(it -> it.getPf() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
default:
log.error("未匹配到异常数据指标");
break;
}
});
return result.stream().sorted(Comparator.comparing(VerifyTargetVO::getSort)).collect(Collectors.toList());
}
/**
* 组装实体
*/
private void assembleEntity(Set<String> ids, PqReasonableRangeDto dto, List<VerifyTargetVO> result) {
VerifyTargetVO verifyTargetVO = new VerifyTargetVO();
verifyTargetVO.setKey(dto.getInfluxdbTableName() + SEPARATOR + dto.getIndexCode());
verifyTargetVO.setTargetName(dto.getIndexName().replace("", ""));
verifyTargetVO.setIds(ids);
verifyTargetVO.setRemark(dto.getRemark());
verifyTargetVO.setSort(dto.getSort());
String unit = "";
if (StrUtil.isNotBlank(dto.getUnit())) {
unit = dto.getUnit();
}
verifyTargetVO.setRangeDesc(dto.getMinValue() + unit + " ~ " + dto.getMaxValue() + unit);
result.add(verifyTargetVO);
}
/**
* 获取异常范围标准
*/
private Map<String, PqReasonableRangeDto> getStandRange() {
DataCleanParam dataCleanParam = new DataCleanParam();
dataCleanParam.setSystemType(DataCleanEnum.Pqs.getCode());
List<PqReasonableRangeDto> pqReasonableRangeDtoList = pqReasonableRangeFeignClient.getData(dataCleanParam).getData();
return pqReasonableRangeDtoList.stream().collect(Collectors.toMap(it -> it.getInfluxdbTableName() + SEPARATOR + it.getIndexCode(), Function.identity()));
}
/**
* 检查日期列表中是否存在连续指定天数的异常
*
* @param dateList 日期列表(已排序)
* @param day 连续天数阈值
* @return 是否存在连续异常
*/
private Boolean verData(List<LocalDate> dateList, Integer day) {
for (int i = 0; i <= dateList.size() - day; i++) {
boolean isConsecutive = true;
for (int j = 1; j < day; j++) {
if (!dateList.get(i).plusDays(j).equals(dateList.get(i + j))) {
isConsecutive = false;
break;
}
}
if (isConsecutive) {
return true;
}
}
return false;
}
}