暂态事件报告功能下载
This commit is contained in:
@@ -47,7 +47,7 @@ import java.util.List;
|
||||
* angle_diff_cn C相相位负跳变
|
||||
* bph_max_value 不平衡度(单位%)
|
||||
*/
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
@JsonIgnoreProperties(ignoreUnknown = true,value = {"pointer"})
|
||||
public class BackData extends Structure {
|
||||
public int qvvr_cata_cause[] = new int[256];
|
||||
public int qvvr_phasetype[] = new int[256];
|
||||
|
||||
@@ -63,6 +63,9 @@ public class AreaLineInfoVO implements Serializable {
|
||||
@ApiModelProperty(name = "pt2",value = "pt2")
|
||||
private Integer pt2;
|
||||
|
||||
@ApiModelProperty(name = "ptType",value = "接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)")
|
||||
private Integer ptType;
|
||||
|
||||
@ApiModelProperty(name = "objName",value = "对象名称")
|
||||
private String objName;
|
||||
|
||||
|
||||
@@ -557,6 +557,7 @@
|
||||
detail.ct2,
|
||||
detail.pt1,
|
||||
detail.pt2,
|
||||
detail.PT_Type as ptType,
|
||||
detail.obj_name,
|
||||
detail.Dev_Capacity deviceCapacity,
|
||||
detail.Short_Capacity,
|
||||
|
||||
@@ -234,4 +234,10 @@ public class ReportController extends BaseController {
|
||||
reportService.getPmsAreaReport(areaReportParam, response);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/createEventReport")
|
||||
@ApiOperation("暂态事件报告导出")
|
||||
public void createEventReport(@RequestBody @Validated List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException {
|
||||
commMonitorEventReportService.createEventReport(index,response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
package com.njcn.event.common.mapper;
|
||||
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.njcn.event.pojo.dto.EventCount;
|
||||
import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
import com.njcn.event.pojo.vo.RmpEventDetailVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.njcn.event.common.pojo.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: wr
|
||||
* @Date: 2023/11/1 13:17
|
||||
*/
|
||||
@Data
|
||||
public class EventInfoDetailVO implements Serializable {
|
||||
|
||||
@ApiModelProperty("监测点名称")
|
||||
private String lineName;
|
||||
|
||||
@ApiModelProperty("供电公司名称")
|
||||
private String gdName;
|
||||
|
||||
@ApiModelProperty("变电站名称")
|
||||
private String bdzName;
|
||||
|
||||
@ApiModelProperty("终端名称")
|
||||
private String devName;
|
||||
|
||||
@ApiModelProperty("电压等级")
|
||||
private String scale;
|
||||
|
||||
@ApiModelProperty("ip")
|
||||
private String ip;
|
||||
|
||||
@ApiModelProperty("暂降事件id")
|
||||
private String eventDetailIndex;
|
||||
|
||||
@ApiModelProperty("触发时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
|
||||
private LocalDateTime timeID;
|
||||
|
||||
@ApiModelProperty("持续时间")
|
||||
private Double persistTime;
|
||||
|
||||
@ApiModelProperty("处理结果第一条事件发生时间毫秒")
|
||||
private Double ms;
|
||||
|
||||
@ApiModelProperty("特征幅值")
|
||||
private Double eventValue;
|
||||
|
||||
@ApiModelProperty("报告状态")
|
||||
private int report;
|
||||
|
||||
@ApiModelProperty("评价")
|
||||
private int evaluate;
|
||||
|
||||
@ApiModelProperty("报告路径")
|
||||
private String reportPath;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -2,8 +2,11 @@ package com.njcn.event.common.service;
|
||||
|
||||
import com.njcn.event.common.pojo.dto.LineDetailDataCommDTO;
|
||||
import com.njcn.event.pojo.param.ExportParam;
|
||||
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* pqs
|
||||
@@ -16,6 +19,9 @@ public interface CommMonitorEventReportService {
|
||||
void getLineExport(ExportParam exportParam, LineDetailDataCommDTO lineDetailDataCommDTO, HttpServletResponse response);
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 暂态事件报告
|
||||
* @param index
|
||||
*/
|
||||
void createEventReport(List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
package com.njcn.event.common.service;
|
||||
|
||||
import com.njcn.advance.pojo.dto.waveAnalysis.WaveData;
|
||||
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
|
||||
import com.njcn.event.common.pojo.dto.EventEigDetail;
|
||||
import com.njcn.event.file.pojo.dto.WaveDataDTO;
|
||||
import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Author: cdf
|
||||
@@ -9,6 +15,14 @@ import com.njcn.advance.pojo.dto.waveAnalysis.WaveData;
|
||||
*/
|
||||
public interface WaveService {
|
||||
|
||||
//通过优化后的方式获取波形数据
|
||||
WaveData getWavedata(String eventIndex, int flag);
|
||||
/**
|
||||
* 通过优化后的方式获取波形数据
|
||||
* @param
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
WaveDataDTO getWavedata(RmpEventDetailPO eventDetail, AreaLineInfoVO line);
|
||||
|
||||
|
||||
List<EventEigDetail> eventDetailEigenvalue(String eventDetailIndex,Integer ptType);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package com.njcn.event.common.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.njcn.advance.pojo.dto.waveAnalysis.WaveData;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.device.pms.api.MonitorClient;
|
||||
import com.njcn.device.pq.api.LineFeignClient;
|
||||
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
|
||||
import com.njcn.echarts.pojo.constant.PicCommonData;
|
||||
import com.njcn.echarts.util.DrawPicUtil;
|
||||
import com.njcn.event.common.mapper.RmpEventDetailMapper;
|
||||
@@ -18,36 +19,34 @@ import com.njcn.event.common.service.CommMonitorEventReportService;
|
||||
import com.njcn.event.common.service.EventAnalysisService;
|
||||
import com.njcn.event.common.service.EventReportService;
|
||||
import com.njcn.event.common.service.WaveService;
|
||||
import com.njcn.event.common.pojo.dto.EventInfoDetailVO;
|
||||
import com.njcn.event.common.utils.WordUtil;
|
||||
import com.njcn.event.common.utils.WordUtils;
|
||||
import com.njcn.event.file.component.WavePicComponent;
|
||||
import com.njcn.event.file.pojo.bo.WaveDataDetail;
|
||||
import com.njcn.event.file.pojo.dto.WaveDataDTO;
|
||||
import com.njcn.event.file.utils.WaveUtil;
|
||||
import com.njcn.event.pojo.param.ExportParam;
|
||||
import com.njcn.event.pojo.param.StatisticsParam;
|
||||
import com.njcn.event.pojo.po.EventDetail;
|
||||
import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
import com.njcn.event.pojo.vo.*;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import com.njcn.system.api.DicDataFeignClient;
|
||||
import com.njcn.system.enums.DicDataEnum;
|
||||
import com.njcn.system.enums.DicDataTypeEnum;
|
||||
import com.njcn.system.pojo.po.DictData;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.poi.hssf.usermodel.HSSFCell;
|
||||
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
|
||||
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
||||
import org.apache.poi.util.Units;
|
||||
import org.apache.poi.xwpf.usermodel.*;
|
||||
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
|
||||
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import javax.servlet.ServletOutputStream;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.io.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.BigInteger;
|
||||
@@ -57,6 +56,7 @@ import java.text.SimpleDateFormat;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
|
||||
/**
|
||||
@@ -72,16 +72,15 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
|
||||
|
||||
private final DicDataFeignClient dicDataFeignClient;
|
||||
|
||||
private final EventReportService eventReportService;
|
||||
//调用暂降密度接口
|
||||
private final EventAnalysisService eventAnalysisService;
|
||||
|
||||
private final RmpEventDetailMapper rmpEventDetailMapper;
|
||||
|
||||
//private final WaveService waveService;
|
||||
|
||||
private final WaveService waveService;
|
||||
private final DrawPicUtil drawPicUtil;
|
||||
private final WavePicComponent wavePicComponent;
|
||||
private final FileStorageUtil fileStorageUtil;
|
||||
private final LineFeignClient lineFeignClient;
|
||||
|
||||
|
||||
/**
|
||||
* 监测点导出word
|
||||
@@ -226,7 +225,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
EventDetail eventDetail = plot.get(j);
|
||||
String s = eventDetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
|
||||
|
||||
insertRow(doc, table, centerParagraph, false, j + 1 + "", s, BigDecimal.valueOf(eventDetail.getFeatureAmplitude() * 100).setScale(2, RoundingMode.HALF_UP).toString(), eventDetail.getDuration() + "", Objects.isNull(eventDetail.getAdvanceType())?"/":eventDetail.getAdvanceType(), Objects.isNull(eventDetail.getAdvanceReason())?"/":eventDetail.getAdvanceReason(), Objects.isNull(eventDetail.getSeverity())?"/":eventDetail.getSeverity() + "");
|
||||
insertRow(doc, table, centerParagraph, false, j + 1 + "", s, BigDecimal.valueOf(eventDetail.getFeatureAmplitude() * 100).setScale(2, RoundingMode.HALF_UP).toString(), eventDetail.getDuration() + "", Objects.isNull(eventDetail.getAdvanceType()) ? "/" : eventDetail.getAdvanceType(), Objects.isNull(eventDetail.getAdvanceReason()) ? "/" : eventDetail.getAdvanceReason(), Objects.isNull(eventDetail.getSeverity()) ? "/" : eventDetail.getSeverity() + "");
|
||||
}
|
||||
i++;
|
||||
}
|
||||
@@ -369,7 +368,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
} else {
|
||||
for (int j = 0; j < reasonTypeTime.size(); j++) {
|
||||
TimeVO timeVO = reasonTypeTime.get(j);
|
||||
insertRow(doc, table1, centerParagraph, false,timeVO.getFulltime(), timeVO.getTimes());
|
||||
insertRow(doc, table1, centerParagraph, false, timeVO.getFulltime(), timeVO.getTimes());
|
||||
}
|
||||
}
|
||||
two++;
|
||||
@@ -384,7 +383,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
if (fly) {
|
||||
List<DictData> tempDictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
|
||||
List<String> typeIds = tempDictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
|
||||
.map(DictData::getId).collect(Collectors.toList());
|
||||
.map(DictData::getId).collect(Collectors.toList());
|
||||
List<EventDetail> tempInfo = info.stream().filter(temp -> typeIds.contains(temp.getEventType())).collect(Collectors.toList());
|
||||
StatisticVO statistic = eventReportService.getStatistic(tempInfo, reasonData, typeData);
|
||||
if (exportParam.isYybg() || exportParam.isYytx()) {
|
||||
@@ -468,8 +467,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
response.setContentType("application/octet-stream;charset=UTF-8");
|
||||
doc.write(outputStream);
|
||||
outputStream.close();
|
||||
}catch (Exception e){
|
||||
throw new BusinessException(CommonResponseEnum.FAIL,"导出监测点暂降报告异常");
|
||||
} catch (Exception e) {
|
||||
throw new BusinessException(CommonResponseEnum.FAIL, "导出监测点暂降报告异常");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -528,14 +527,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
}
|
||||
|
||||
|
||||
public void setCellStyle(HSSFCell cellname, String value, HSSFCellStyle style) {
|
||||
cellname.setCellValue(value);
|
||||
cellname.setCellStyle(style);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @param document 文档
|
||||
* @param image 图片base64
|
||||
* @param name 图片名
|
||||
@@ -544,16 +537,16 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
*/
|
||||
public void createPic(XWPFDocument document, String image, String name) {
|
||||
try {
|
||||
XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
|
||||
XWPFRun createRun = picParagraph.createRun();
|
||||
if (image.contains(PicCommonData.PNG_PREFIX)) {
|
||||
image = image.replace(PicCommonData.PNG_PREFIX, "");
|
||||
}
|
||||
byte[] bytes = Base64.getDecoder().decode(image);
|
||||
InputStream in = new ByteArrayInputStream(bytes);
|
||||
createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
|
||||
}catch (Exception e){
|
||||
log.error("在word中创建图片异常:",e);
|
||||
XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
|
||||
XWPFRun createRun = picParagraph.createRun();
|
||||
if (image.contains(PicCommonData.PNG_PREFIX)) {
|
||||
image = image.replace(PicCommonData.PNG_PREFIX, "");
|
||||
}
|
||||
byte[] bytes = Base64.getDecoder().decode(image);
|
||||
InputStream in = new ByteArrayInputStream(bytes);
|
||||
createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
|
||||
} catch (Exception e) {
|
||||
log.error("在word中创建图片异常:", e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -589,10 +582,10 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
// .map(DictData::getId).collect(Collectors.toList());
|
||||
//数据暂降查询
|
||||
List<RmpEventDetailPO> info = rmpEventDetailMapper.selectList(new LambdaQueryWrapper<RmpEventDetailPO>()
|
||||
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
|
||||
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
|
||||
// .in(RmpEventDetailPO::getEventType, typeIds)
|
||||
.ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
|
||||
.le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
|
||||
.ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
|
||||
.le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
|
||||
.orderByDesc(RmpEventDetailPO::getStartTime)
|
||||
);
|
||||
|
||||
@@ -600,92 +593,61 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* *//**
|
||||
/**
|
||||
* 生成暂降事件报告
|
||||
*//*
|
||||
public void createEventReport(List<String> index) {
|
||||
try {
|
||||
WordUtil wordUtil = new WordUtil();
|
||||
for (int i = 0; i < index.size(); i++) {
|
||||
WaveData waveData = waveService.getWavedata(index.get(i), 1);
|
||||
//数据筛选,如果是双路电压的话,会存在2个波形数据
|
||||
List<WaveDataDetail> waveDataDetails = waveService.filteWaveData(waveData);
|
||||
if (waveData.getSunData().isEmpty()) {
|
||||
throw new BusinessException(CommonResponseEnum.FAIL,"没有波形数据");
|
||||
} else {
|
||||
String time = waveData.getTime();
|
||||
time = time.replace(" ", "%20");
|
||||
String title = "监测点名称:" + waveData.getLineName() + "%20发生时刻:" + time + "%20特征幅值:" + waveData.getEventValue() + "%25%20持续时间:" + waveData.getPersistTime() + "s";
|
||||
*/
|
||||
public void createEventReport(List<String> eventIndex, HttpServletResponse response) throws IOException, InvalidFormatException {
|
||||
WordUtil wordUtil = new WordUtil();
|
||||
for (String index : eventIndex) {
|
||||
RmpEventDetailPO detail = rmpEventDetailMapper.selectById(index);
|
||||
List<AreaLineInfoVO> lineDetail = lineFeignClient.getBaseLineAreaInfo(Stream.of(detail.getLineId()).collect(Collectors.toList())).getData();
|
||||
AreaLineInfoVO line = lineDetail.get(0);
|
||||
WaveDataDTO waveData = waveService.getWavedata(detail, line);
|
||||
//数据筛选,如果是双路电压的话,会存在2个波形数据
|
||||
List<WaveDataDetail> waveDataDetails = WaveUtil.filterWaveData(waveData);
|
||||
if (ObjUtil.isNull(waveData)) {
|
||||
throw new BusinessException(CommonResponseEnum.FAIL, "没有波形数据");
|
||||
} else {
|
||||
//获取瞬时波形
|
||||
String instantPath = wavePicComponent.generateImageShun(waveData, waveDataDetails);
|
||||
InputStream instantStream = fileStorageUtil.getFileStream(instantPath);
|
||||
String imageShun64 = cn.hutool.core.codec.Base64.encode(instantStream);
|
||||
|
||||
List<String> shun = new ArrayList<>();
|
||||
List<String> rms = new ArrayList<>();
|
||||
if (waveDataDetails.size() == 1) {
|
||||
shun.add(waveService.createShunTitle(title, waveDataDetails.get(0)));
|
||||
rms.add(waveService.createRMSTitle(title, waveDataDetails.get(0)));
|
||||
} else {
|
||||
shun.add(waveService.createShunTitle(title, waveDataDetails.get(0)));
|
||||
rms.add(waveService.createRMSTitle(title, waveDataDetails.get(0)));
|
||||
for (int n = 1; n < waveDataDetails.size(); n++) {
|
||||
shun.add(waveService.createShun(waveDataDetails.get(n)));
|
||||
rms.add(waveService.createRMS(waveDataDetails.get(n)));
|
||||
}
|
||||
}
|
||||
wordUtil.translateShun(i, shun);
|
||||
wordUtil.translateRms(i, rms);
|
||||
List<EventEigDetail> eventDetailEigenvalue = eventDetailService.eventDetailEigenvalue(index.get(i));
|
||||
wordUtil.setEventDetailEigenvalue(i, eventDetailEigenvalue);
|
||||
EventInfoDetail eventInfoList = .eventDetailBaseInfoByIndex(index.get(i));
|
||||
wordUtil.setEventInfoList(i, eventInfoList);
|
||||
}
|
||||
}
|
||||
wordUtil.createReport(index.size());
|
||||
wordUtil.translateShun(index, imageShun64);
|
||||
//获取rms波形
|
||||
String rmsPath = wavePicComponent.generateImageRms(waveData, waveDataDetails);
|
||||
InputStream rmsStream = fileStorageUtil.getFileStream(rmsPath);
|
||||
String rmsShun64 = cn.hutool.core.codec.Base64.encode(rmsStream);
|
||||
wordUtil.translateRms(index, rmsShun64);
|
||||
|
||||
EventInfoDetailVO eventInfoList = new EventInfoDetailVO();
|
||||
eventInfoList.setLineName(line.getLineName());
|
||||
eventInfoList.setGdName(line.getGdName());
|
||||
eventInfoList.setBdzName(line.getSubName());
|
||||
eventInfoList.setDevName(line.getDeviceName());
|
||||
eventInfoList.setScale(line.getVoltageScale());
|
||||
eventInfoList.setIp(line.getIp());
|
||||
eventInfoList.setEventDetailIndex(detail.getEventId());
|
||||
eventInfoList.setTimeID(detail.getStartTime());
|
||||
eventInfoList.setPersistTime(detail.getDuration());
|
||||
eventInfoList.setMs(detail.getFirstMs());
|
||||
eventInfoList.setEventValue(detail.getFeatureAmplitude());
|
||||
wordUtil.setEventInfoList(index, eventInfoList);
|
||||
List<EventEigDetail> eventDetailEigenvalue = waveService.eventDetailEigenvalue(index,line.getPtType());
|
||||
wordUtil.setEventDetailEigenvalue(index, eventDetailEigenvalue);
|
||||
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");// 报告时分秒格式
|
||||
String fileName = "暂降事件报告_" + formatter.format(new Date()) + ".docx";
|
||||
//读取配置文件
|
||||
Properties pros = PubUtils.readProperties(getClass().getClassLoader(), "java.properties");
|
||||
String tmpPath = pros.get("TMP_PATH").toString() + File.separator + "eventreoprt";
|
||||
tmpPath = ClearPathUtil.cleanString(tmpPath);
|
||||
OutputStream os = null;
|
||||
File tmpfile = new File(tmpPath);
|
||||
if (!tmpfile.exists()) {
|
||||
tmpfile.mkdir();
|
||||
}
|
||||
tmpPath = tmpPath + File.separator + fileName;
|
||||
tmpPath = ClearPathUtil.cleanString(tmpPath);
|
||||
File tmp = new File(tmpPath);
|
||||
if (tmp.exists()) {
|
||||
tmp.delete();
|
||||
}
|
||||
PubUtils.createFile(tmpPath);
|
||||
try {
|
||||
os = new FileOutputStream(tmpPath);
|
||||
if (null != wordUtil.getDocument()) {
|
||||
wordUtil.getDocument().write(os);
|
||||
session.setAttribute("eventFilePath", tmpPath);
|
||||
session.setAttribute("eventFileName", fileName);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
session.setAttribute("eventFilePath", "");
|
||||
session.setAttribute("eventFileName", "");
|
||||
logger.error("输出暂态事件报告异常,原因为:" + e.toString());
|
||||
} finally {
|
||||
try {
|
||||
if (os != null) {
|
||||
os.close();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("关闭流异常,原因为:" + e.toString());
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error("生成事件报告失败,方法名为:getEventReport,异常为:" + e.toString());
|
||||
result = PubUtils.assignmentResult(null, 500, "生成事件报告出错,请联系管理员");
|
||||
}
|
||||
|
||||
return result;
|
||||
}*/
|
||||
|
||||
wordUtil.createReport(eventIndex);
|
||||
try {
|
||||
ServletOutputStream outputStream = response.getOutputStream();
|
||||
String fileName = URLEncoder.encode("暂降事件报告_" + DateUtil.format(new Date(),DatePattern.NORM_DATE_PATTERN)+ ".docx", "UTF-8");
|
||||
response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
|
||||
response.setContentType("application/octet-stream;charset=UTF-8");
|
||||
wordUtil.getDocument().write(outputStream);
|
||||
outputStream.close();
|
||||
} catch (Exception e) {
|
||||
throw new BusinessException(CommonResponseEnum.FAIL, "导出暂降事件报告异常");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,213 +1,125 @@
|
||||
//package com.njcn.event.common.service.impl;
|
||||
//
|
||||
//import cn.hutool.core.util.StrUtil;
|
||||
//import com.njcn.advance.pojo.dto.waveAnalysis.AnalyWave;
|
||||
//import com.njcn.advance.pojo.dto.waveAnalysis.WaveData;
|
||||
//import com.njcn.common.config.GeneralInfo;
|
||||
//import com.njcn.common.pojo.exception.BusinessException;
|
||||
//import com.njcn.device.pq.api.LineFeignClient;
|
||||
//import com.njcn.device.pq.pojo.po.line.LineInfoVO;
|
||||
//import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
|
||||
//import com.njcn.event.common.mapper.RmpEventDetailMapper;
|
||||
//import com.njcn.event.common.service.WaveService;
|
||||
//import com.njcn.event.file.component.WaveFileComponent;
|
||||
//import com.njcn.event.file.pojo.dto.WaveDataDTO;
|
||||
//import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
|
||||
//import com.njcn.event.file.utils.WaveUtil;
|
||||
//import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
//import com.njcn.oss.constant.GeneralConstant;
|
||||
//import com.njcn.oss.constant.OssPath;
|
||||
//import com.njcn.oss.utils.FileStorageUtil;
|
||||
//import lombok.RequiredArgsConstructor;
|
||||
//import lombok.extern.slf4j.Slf4j;
|
||||
//import org.apache.commons.lang3.StringUtils;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import java.io.File;
|
||||
//import java.io.InputStream;
|
||||
//import java.math.BigDecimal;
|
||||
//import java.math.RoundingMode;
|
||||
//import java.text.SimpleDateFormat;
|
||||
//import java.util.List;
|
||||
//import java.util.Objects;
|
||||
//import java.util.stream.Collectors;
|
||||
//import java.util.stream.Stream;
|
||||
//
|
||||
///**
|
||||
// * @Author: cdf
|
||||
// * @CreateTime: 2026-02-26
|
||||
// * @Description:
|
||||
// */
|
||||
//@Service
|
||||
//@RequiredArgsConstructor
|
||||
//@Slf4j
|
||||
//public class WaveServiceImpl implements WaveService {
|
||||
//
|
||||
// private final RmpEventDetailMapper rmpEventDetailMapper;
|
||||
//
|
||||
// private final WaveFileComponent waveFileComponent;
|
||||
//
|
||||
// private final GeneralInfo generalInfo;
|
||||
//
|
||||
// private final FileStorageUtil fileStorageUtil;
|
||||
// private final LineFeignClient lineFeignClient;
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 根据暂降事件索引获取波形数据
|
||||
// * 注:当前只考虑本地的波形文件
|
||||
// *
|
||||
// * @param eventIndex 事件索引
|
||||
// * @param flag 抽点方式
|
||||
// */
|
||||
// @Override
|
||||
// public WaveData getWavedata(String eventIndex, int flag) {
|
||||
// WaveData waveData = new WaveData();
|
||||
// RmpEventDetailPO eventDetail = rmpEventDetailMapper.selectById(eventIndex);
|
||||
// if (Objects.nonNull(eventDetail)) {
|
||||
// //获取PT变比
|
||||
// List<AreaLineInfoVO> lineInfoVOList = lineFeignClient.getBaseLineAreaInfo(Stream.of(eventDetail.getLineId()).collect(Collectors.toList())).getData();
|
||||
// AreaLineInfoVO line = lineInfoVOList.get(0);
|
||||
// waveData.setLineName(line.getLineName());
|
||||
// /*********** Modify by xuyang 添加变电站名称---Start **************/
|
||||
// waveData.setSubName(line.getSubName());
|
||||
// /*********** Modify by xuyang ---End **************/
|
||||
// waveData.setEventValue(BigDecimal.valueOf(eventDetail.getFeatureAmplitude()*100).setScale(2, RoundingMode.HALF_UP).floatValue());
|
||||
// waveData.setPersistTime(BigDecimal.valueOf(eventDetail.getDuration()*100).setScale(3, RoundingMode.HALF_UP).floatValue());
|
||||
// waveData.setTrigeTime(AnalyWave.getTimeWave());
|
||||
// if (Objects.nonNull(line)) {
|
||||
// float pt1 = line.getPt1();
|
||||
// float pt2 = line.getPt2();
|
||||
// float pt = (pt1) / (pt2);
|
||||
// waveData.setPt(pt);
|
||||
// float ct1 = line.getCt1();
|
||||
// float ct2 = line.getCt2();
|
||||
// float ct = (ct1) / (ct2);
|
||||
// waveData.setCt(ct);
|
||||
// //获取接线方式
|
||||
// if (line.getVHarmonicValue() != 0) {
|
||||
// //赋值abc三相名称
|
||||
// if (lineDetail.getPtType() == 2) {
|
||||
// waveData.setOpen(true);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// //严重度
|
||||
// Float yzd = eventDetail.getSeverity();
|
||||
// if (null == yzd || yzd == 0.0) {
|
||||
// // 前去计算严重度
|
||||
// yzd = Float.parseFloat(getYzd(eventDetail.getPersistTime(), eventDetail.getEventValue()));
|
||||
// eventDetail.setSeverity(yzd);
|
||||
// //回填严重度到数据库中
|
||||
// updateEventDeatilYzd(eventDetail);
|
||||
// }
|
||||
// waveData.setYzd(yzd);
|
||||
// //暂降发生时间
|
||||
// String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(eventDetail.getTimeId()) + "." + PubUtils.getMs(eventDetail.getMs());
|
||||
// waveData.setTime(time);
|
||||
// //暂降类型
|
||||
// // 获取暂降类型的数据字典 暂降类型
|
||||
// List<DicData> voltageType = redisCacheUtil.getVoltageType();
|
||||
// for (DicData dicData : voltageType) {
|
||||
// if (dicData.getDicIndex().equals(eventDetail.getEventType())) {
|
||||
// waveData.setWaveType(dicData.getDicName());
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if (Integer.parseInt(eventDetail.getFileFlag()) == 1) {
|
||||
// //根据暂降事件,返回波形文件名
|
||||
// LineInfoVO ip = lineFeignClient.getLineInfoVO(eventIndex);
|
||||
// if (StringUtils.isBlank(ip)) {
|
||||
// return waveData;
|
||||
// }
|
||||
// String path = appConfig.getWavePath();
|
||||
// path = path + File.separator + ip;
|
||||
// String waveName = getWaveName(eventDetail, path);
|
||||
// String pathTemp = path + File.separator + waveName;
|
||||
// File file = new File(pathTemp);
|
||||
// // 判断文件是否存在
|
||||
// if (file.isFile() && file.exists()) {
|
||||
// System.out.println(pathTemp + "路径下,文件找到了");
|
||||
// //CFG文件路径 pathTemp
|
||||
// //获取波形的瞬时值、RMS值数据
|
||||
// AnalyWave analyWave = new AnalyWave();
|
||||
// WaveDataDTO tagDataValue = waveRead(eventDetail.getWavePath(),ip);
|
||||
// List<List<Float>> shunWave = tagDataValue.getListWaveData();//获取瞬时波形值
|
||||
// List<List<Float>> rmsWave = tagDataValue.getListRmsData();//RMS值波形
|
||||
// waveData.setnOneWaveNum(analyWave.getnOneWaveNum());
|
||||
// waveData.setSunData(shunWave);
|
||||
// waveData.setTmpWaveTitle(tagDataValue.getWaveTitle());
|
||||
// waveData.setFirstMs(analyWave.getFirstMs());
|
||||
// waveData.setFirstTime(analyWave.getFirstTime());
|
||||
// waveData.setRmsData(rmsWave);
|
||||
// waveData.setRatesCfg(analyWave.getRatesCfg());
|
||||
// /*********** Modify by yexibao ---Start **************/
|
||||
// waveData.setiPhasic(tagDataValue.getIPhasic());
|
||||
// /*********** Modify by yexibao ---End **************/
|
||||
// List<String> tmpWaveTitle = tagDataValue.getWaveTitle();
|
||||
// /*********** Modify by yexibao ---Start **************/
|
||||
// for (int i = 0; i < tagDataValue.getIPhasic(); i++) {
|
||||
// if (tmpWaveTitle.get(i + 1).substring(1).indexOf("A") > -1)
|
||||
// waveData.setA(tmpWaveTitle.get(i + 1).substring(1));
|
||||
// if (tmpWaveTitle.get(i + 1).substring(1).indexOf("B") > -1)
|
||||
// waveData.setB(tmpWaveTitle.get(i + 1).substring(1));
|
||||
// if (tmpWaveTitle.get(i + 1).substring(1).indexOf("C") > -1)
|
||||
// waveData.setC(tmpWaveTitle.get(i + 1).substring(1));
|
||||
// }
|
||||
// /*********** Modify by yexibao ---End **************/
|
||||
//
|
||||
// } else {
|
||||
// System.out.println(pathTemp + "路径下,文件找不到了");
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return waveData;
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public WaveDataDTO waveRead(String waveName,String ip){
|
||||
// WaveDataDTO waveDataDTO;
|
||||
// String cfgPath, datPath, cfgPath2, datPath2;
|
||||
// if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) {
|
||||
// cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG;
|
||||
// datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT;
|
||||
// log.info("本地磁盘波形文件路径----" + cfgPath);
|
||||
// InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath);
|
||||
// InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath);
|
||||
// if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
|
||||
// throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
// }
|
||||
// waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
|
||||
// } else {
|
||||
// cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG;
|
||||
// datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT;
|
||||
// //适配文件后缀小写
|
||||
// cfgPath2 = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG.toLowerCase();
|
||||
// datPath2 = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT.toLowerCase();
|
||||
// log.info("文件服务器波形文件路径----" + cfgPath);
|
||||
// try (
|
||||
// InputStream cfgStream = fileStorageUtil.getFileStream(cfgPath);
|
||||
// InputStream datStream = fileStorageUtil.getFileStream(datPath)
|
||||
// ) {
|
||||
// if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
|
||||
// throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
// }
|
||||
// waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 0);
|
||||
// } catch (Exception e) {
|
||||
// try {
|
||||
// InputStream cfgStream = fileStorageUtil.getFileStream(cfgPath2);
|
||||
// InputStream datStream = fileStorageUtil.getFileStream(datPath2);
|
||||
// if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
|
||||
// throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
// }
|
||||
// waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 0);
|
||||
// } catch (Exception e1) {
|
||||
// throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// return waveDataDTO;
|
||||
// }
|
||||
//}
|
||||
package com.njcn.event.common.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.njcn.advance.api.EventWaveAnalysisFeignClient;
|
||||
import com.njcn.advance.pojo.dto.waveAnalysis.EntityAdvancedData;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.utils.PubUtils;
|
||||
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
|
||||
import com.njcn.event.common.pojo.dto.EventEigDetail;
|
||||
import com.njcn.event.common.service.WaveService;
|
||||
import com.njcn.event.file.component.WaveFileComponent;
|
||||
import com.njcn.event.file.pojo.dto.WaveDataDTO;
|
||||
import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
|
||||
import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
import com.njcn.oss.constant.GeneralConstant;
|
||||
import com.njcn.oss.constant.OssPath;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import com.njcn.system.api.DicDataFeignClient;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
|
||||
|
||||
/**
|
||||
* @Author: cdf
|
||||
* @CreateTime: 2026-02-26
|
||||
* @Description:
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class WaveServiceImpl implements WaveService {
|
||||
|
||||
private final WaveFileComponent waveFileComponent;
|
||||
private final FileStorageUtil fileStorageUtil;
|
||||
private final EventWaveAnalysisFeignClient eventWaveAnalysisFeignClient;
|
||||
|
||||
/**
|
||||
* 根据暂降事件索引获取波形数据
|
||||
* 注:当前只考虑本地的波形文件
|
||||
*
|
||||
* @param eventDetail 暂态事件
|
||||
* @param line 监测点
|
||||
*/
|
||||
@Override
|
||||
public WaveDataDTO getWavedata(RmpEventDetailPO eventDetail, AreaLineInfoVO line) {
|
||||
WaveDataDTO waveDataDTO = null;
|
||||
if (ObjectUtil.isNotEmpty(line)) {
|
||||
String waveName = eventDetail.getWavePath();
|
||||
if (StrUtil.isBlank(waveName)) {
|
||||
throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
}
|
||||
String wavePath = OssPath.WAVE_DIR + line.getIp() + StrUtil.SLASH + waveName;
|
||||
try (
|
||||
InputStream cfgStream = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG);
|
||||
InputStream datStream = fileStorageUtil.getFileStream(wavePath + GeneralConstant.DAT)
|
||||
) {
|
||||
if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
|
||||
throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
}
|
||||
waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
InputStream cfgStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG_LOWER);
|
||||
InputStream datStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.DAT_LOWER);
|
||||
if (Objects.isNull(cfgStreamLower) || Objects.isNull(datStreamLower)) {
|
||||
throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||
}
|
||||
waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 1);
|
||||
} catch (Exception e1) {
|
||||
throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID);
|
||||
}
|
||||
}
|
||||
waveDataDTO = waveFileComponent.getValidData(waveDataDTO);
|
||||
waveDataDTO.setPtType(line.getPtType());
|
||||
waveDataDTO.setPt(line.getPt1() * 1.0 / line.getPt2());
|
||||
waveDataDTO.setCt(line.getCt1() * 1.0 / line.getCt2());
|
||||
waveDataDTO.setMonitorName(line.getLineName());
|
||||
}
|
||||
return waveDataDTO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EventEigDetail> eventDetailEigenvalue(String eventDetailIndex,Integer ptType) {
|
||||
List<EventEigDetail> eventInfoDetails = new ArrayList<>();
|
||||
EntityAdvancedData entityAdvancedData = eventWaveAnalysisFeignClient.analysis(eventDetailIndex).getData() ;
|
||||
if (entityAdvancedData.backNumber != -1) {
|
||||
for (int i = 0; i < entityAdvancedData.backNumber; i++) {
|
||||
EventEigDetail eventEigDetail = new EventEigDetail();
|
||||
eventEigDetail.setHold_time_dq(entityAdvancedData.evt_buf[i].hold_time_dq * 1000);
|
||||
eventEigDetail.setPow_a(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_a));
|
||||
eventEigDetail.setPow_b(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_b));
|
||||
eventEigDetail.setPow_c(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_c));
|
||||
|
||||
eventEigDetail.setVoltagechange_Va(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Va / 1000));
|
||||
eventEigDetail.setVoltagechange_Vb(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Vb / 1000));
|
||||
eventEigDetail.setVoltagechange_Vc(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Vc / 1000));
|
||||
|
||||
|
||||
eventEigDetail.setUa_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ua_min[0]));
|
||||
eventEigDetail.setUb_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ub_min[0]));
|
||||
eventEigDetail.setUc_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ua_min[0]));
|
||||
|
||||
eventEigDetail.setAngle_diff_ap(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_ap[0]));
|
||||
eventEigDetail.setAngle_diff_bp(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_bp[0]));
|
||||
eventEigDetail.setAngle_diff_cp(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_cp[0]));
|
||||
|
||||
eventEigDetail.setBph_max_value(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].bph_max_value[0]));
|
||||
eventEigDetail.setSagReason(entityAdvancedData.sagReason[0]);//暂降原因,暂降原因都一样
|
||||
eventEigDetail.setSagType(entityAdvancedData.sagType[i]);//暂降类型
|
||||
eventInfoDetails.add(eventEigDetail);
|
||||
eventEigDetail.setPttype(ptType);
|
||||
}
|
||||
} else {
|
||||
eventInfoDetails = null;
|
||||
}
|
||||
return eventInfoDetails;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user