Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
xy
2024-11-12 14:42:44 +08:00
parent 5022aff834
commit c72882d023
2 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/OfflineDataUploadController.java
View File

@@ -82,7 +82,7 @@ public class OfflineDataUploadController extends BaseController {
if (result) { if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "文件补召中,请稍后", methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "文件补召中,请稍后", methodDescribe);
} else { } else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召中失败", methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召失败", methodDescribe);
} }
} }

117
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java
View File

@@ -220,70 +220,67 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
@Override @Override
public boolean startMakeUpData(MakeUpParam param) { public boolean startMakeUpData(MakeUpParam param) {
boolean result = true; boolean result = false;
try { List<String> fileList = new ArrayList<>();
List<String> fileList = new ArrayList<>(); //fixme 这边补召暂不支持多工程补召，防止下载文件时间过长，会出问题。
//fixme 这边补召暂不支持多工程补召，防止下载文件时间过长，会出问题。 String s = param.getProList().get(0);
String s = param.getProList().get(0); //稳态补招
//稳态补招 if (param.getDataTypeList().contains(0)) {
if (param.getDataTypeList().contains(0)) { String minPath = s + "/min";
String minPath = s + "/min"; List<FileDto.DirInfo> projectInfoList = getFileList(param.getLineId(),param.getNDid(),minPath);
List<FileDto.DirInfo> projectInfoList = getFileList(param.getLineId(),param.getNDid(),minPath); if (CollectionUtil.isNotEmpty(projectInfoList)) {
if (CollectionUtil.isNotEmpty(projectInfoList)) { projectInfoList.forEach(item->{
projectInfoList.forEach(item->{ String linePath = item.getName();
String linePath = item.getName(); if (timeRange(param.getStartTime(),param.getEndTime(),linePath,"min")) {
if (timeRange(param.getStartTime(),param.getEndTime(),linePath,"min")) { List<FileDto.DirInfo> lineDataList = getFileList(param.getLineId(),param.getNDid(),linePath);
List<FileDto.DirInfo> lineDataList = getFileList(param.getLineId(),param.getNDid(),linePath); if (CollectionUtil.isNotEmpty(lineDataList)) {
if (CollectionUtil.isNotEmpty(lineDataList)) { fileList.addAll(lineDataList.stream().map(FileDto.DirInfo::getName).collect(Collectors.toList()));
fileList.addAll(lineDataList.stream().map(FileDto.DirInfo::getName).collect(Collectors.toList()));
}
} }
}); }
} });
} }
//暂态补招 }
if (param.getDataTypeList().contains(1)) { //暂态补招
//事件 if (param.getDataTypeList().contains(1)) {
String logPath = s + "/log"; //事件
List<FileDto.DirInfo> logList = getFileList(param.getLineId(),param.getNDid(),logPath); String logPath = s + "/log";
if (CollectionUtil.isNotEmpty(logList)) { List<FileDto.DirInfo> logList = getFileList(param.getLineId(),param.getNDid(),logPath);
logList.forEach(item->{ if (CollectionUtil.isNotEmpty(logList)) {
if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"log")) { logList.forEach(item->{
fileList.add(item.getName()); if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"log")) {
} fileList.add(item.getName());
}); }
} });
//录波文件
String comtradePath = s + "/comtrade";
List<FileDto.DirInfo> comtradeList = getFileList(param.getLineId(),param.getNDid(),comtradePath);
if (CollectionUtil.isNotEmpty(comtradeList)) {
comtradeList.forEach(item->{
if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"comtrade")) {
fileList.add(item.getName());
}
});
}
} }
if (CollectionUtil.isNotEmpty(fileList)) { //录波文件
//添加record.bin文件 String comtradePath = s + "/comtrade";
fileList.add(s + "/record.bin"); List<FileDto.DirInfo> comtradeList = getFileList(param.getLineId(),param.getNDid(),comtradePath);
redisUtil.delete(AppRedisKey.MAKE_UP_FILES + param.getNDid()); if (CollectionUtil.isNotEmpty(comtradeList)) {
CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData(); comtradeList.forEach(item->{
DownloadMakeUpDto downloadMakeUpDto = new DownloadMakeUpDto(); if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"comtrade")) {
downloadMakeUpDto.setFileList(fileList); fileList.add(item.getName());
downloadMakeUpDto.setLineId(param.getLineId()); }
downloadMakeUpDto.setDevId(vo.getId()); });
downloadMakeUpDto.setAllStep(fileList.size());
String proName = s.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
downloadMakeUpDto.setEngineeringName(proName);
redisUtil.saveByKey(AppRedisKey.MAKE_UP_FILES + param.getNDid(),downloadMakeUpDto);
publisher.send("/makeUpData/" + param.getNDid() +"/" + param.getLineId(), "makeUpData", 1, false);
log.info("下载的文件列表,{}",fileList);
} else {
throw new BusinessException("装置内未找到原始文件!");
} }
} catch (Exception e) { }
result = false; if (CollectionUtil.isNotEmpty(fileList)) {
//添加record.bin文件
fileList.add(s + "/record.bin");
redisUtil.delete(AppRedisKey.MAKE_UP_FILES + param.getNDid());
CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData();
DownloadMakeUpDto downloadMakeUpDto = new DownloadMakeUpDto();
downloadMakeUpDto.setFileList(fileList);
downloadMakeUpDto.setLineId(param.getLineId());
downloadMakeUpDto.setDevId(vo.getId());
downloadMakeUpDto.setAllStep(fileList.size());
String proName = s.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
downloadMakeUpDto.setEngineeringName(proName);
redisUtil.saveByKey(AppRedisKey.MAKE_UP_FILES + param.getNDid(),downloadMakeUpDto);
publisher.send("/makeUpData/" + param.getNDid() +"/" + param.getLineId(), "makeUpData", 1, false);
log.info("下载的文件列表,{}",fileList);
result = true;
} else {
throw new BusinessException("装置内未找到原始文件!");
} }
return result; return result;
} }