|
@@ -386,41 +386,42 @@ public class DashboardService extends BaseService {
|
|
// 拼装解析文件通道状态
|
|
// 拼装解析文件通道状态
|
|
Long time = new Date().getTime();
|
|
Long time = new Date().getTime();
|
|
List<FileAnalysisRecord> fileAnalysisRecordList = fileAnalysisRecordRepository.findByCreateTimeBetween(DateTimeUtil.getDayStartTime(time), DateTimeUtil.getDayLastTime(time));
|
|
List<FileAnalysisRecord> fileAnalysisRecordList = fileAnalysisRecordRepository.findByCreateTimeBetween(DateTimeUtil.getDayStartTime(time), DateTimeUtil.getDayLastTime(time));
|
|
- // 过滤出短期成功的
|
|
|
|
- List<FileAnalysisRecord> dqList = fileAnalysisRecordList.stream().filter(w -> "DQ".equals(w.getFileType())).collect(Collectors.toList());
|
|
|
|
- String dqStatus = "0";
|
|
|
|
- String dqTips = "";
|
|
|
|
- if (dqList.size() > 0) {
|
|
|
|
- dqList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
|
|
- dqStatus = dqList.get(0).getFileStatus();
|
|
|
|
- dqTips = "最后解析短期时间:" + DateFormatUtils.format(dqList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
- } else {
|
|
|
|
- dqTips = "今日未解析过短期文件";
|
|
|
|
- }
|
|
|
|
List<ChannelStatusDto> analysisList = new ArrayList<>();
|
|
List<ChannelStatusDto> analysisList = new ArrayList<>();
|
|
- ChannelStatusDto dqAnalysisDto = new ChannelStatusDto();
|
|
|
|
- dqAnalysisDto.setChannelId("DQ");
|
|
|
|
- dqAnalysisDto.setChannelName("短期文件");
|
|
|
|
- dqAnalysisDto.setChannelStatus(dqStatus);
|
|
|
|
- dqAnalysisDto.setTips(dqTips);
|
|
|
|
- analysisList.add(dqAnalysisDto);
|
|
|
|
-
|
|
|
|
- List<FileAnalysisRecord> nwpList = fileAnalysisRecordList.stream().filter(w -> "NWP".equals(w.getFileType())).collect(Collectors.toList());
|
|
|
|
- String nwpStatus = "0";
|
|
|
|
- String nwpTips = "";
|
|
|
|
- if (nwpList.size() > 0) {
|
|
|
|
- nwpList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
|
|
- nwpStatus = nwpList.get(0).getFileStatus();
|
|
|
|
- nwpTips = "最后解析NWP时间:" + DateFormatUtils.format(nwpList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
- } else {
|
|
|
|
- nwpTips = "今日未解析过NWP文件";
|
|
|
|
- }
|
|
|
|
- ChannelStatusDto nwpAnalysisDto = new ChannelStatusDto();
|
|
|
|
- nwpAnalysisDto.setChannelId("NWP");
|
|
|
|
- nwpAnalysisDto.setChannelName("NWP文件");
|
|
|
|
- nwpAnalysisDto.setChannelStatus(nwpStatus);
|
|
|
|
- nwpAnalysisDto.setTips(nwpTips);
|
|
|
|
- analysisList.add(nwpAnalysisDto);
|
|
|
|
|
|
+ // 过滤出短期成功的
|
|
|
|
+// List<FileAnalysisRecord> dqList = fileAnalysisRecordList.stream().filter(w -> "DQ".equals(w.getFileType())).collect(Collectors.toList());
|
|
|
|
+// String dqStatus = "0";
|
|
|
|
+// String dqTips = "";
|
|
|
|
+// if (dqList.size() > 0) {
|
|
|
|
+// dqList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
|
|
+// dqStatus = dqList.get(0).getFileStatus();
|
|
|
|
+// dqTips = "最后解析短期时间:" + DateFormatUtils.format(dqList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
+// } else {
|
|
|
|
+// dqTips = "今日未解析过短期文件";
|
|
|
|
+// }
|
|
|
|
+// List<ChannelStatusDto> analysisList = new ArrayList<>();
|
|
|
|
+// ChannelStatusDto dqAnalysisDto = new ChannelStatusDto();
|
|
|
|
+// dqAnalysisDto.setChannelId("DQ");
|
|
|
|
+// dqAnalysisDto.setChannelName("短期文件");
|
|
|
|
+// dqAnalysisDto.setChannelStatus(dqStatus);
|
|
|
|
+// dqAnalysisDto.setTips(dqTips);
|
|
|
|
+// analysisList.add(dqAnalysisDto);
|
|
|
|
+//
|
|
|
|
+// List<FileAnalysisRecord> nwpList = fileAnalysisRecordList.stream().filter(w -> "NWP".equals(w.getFileType())).collect(Collectors.toList());
|
|
|
|
+// String nwpStatus = "0";
|
|
|
|
+// String nwpTips = "";
|
|
|
|
+// if (nwpList.size() > 0) {
|
|
|
|
+// nwpList.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
|
|
+// nwpStatus = nwpList.get(0).getFileStatus();
|
|
|
|
+// nwpTips = "最后解析NWP时间:" + DateFormatUtils.format(nwpList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
+// } else {
|
|
|
|
+// nwpTips = "今日未解析过NWP文件";
|
|
|
|
+// }
|
|
|
|
+// ChannelStatusDto nwpAnalysisDto = new ChannelStatusDto();
|
|
|
|
+// nwpAnalysisDto.setChannelId("NWP");
|
|
|
|
+// nwpAnalysisDto.setChannelName("NWP文件");
|
|
|
|
+// nwpAnalysisDto.setChannelStatus(nwpStatus);
|
|
|
|
+// nwpAnalysisDto.setTips(nwpTips);
|
|
|
|
+// analysisList.add(nwpAnalysisDto);
|
|
|
|
|
|
// 短期一期
|
|
// 短期一期
|
|
List<FileAnalysisRecord> dqList1 = fileAnalysisRecordList.stream().filter(w -> "DQ1".equals(w.getFileType())).collect(Collectors.toList());
|
|
List<FileAnalysisRecord> dqList1 = fileAnalysisRecordList.stream().filter(w -> "DQ1".equals(w.getFileType())).collect(Collectors.toList());
|
|
@@ -429,14 +430,14 @@ public class DashboardService extends BaseService {
|
|
if (dqList1.size() > 0) {
|
|
if (dqList1.size() > 0) {
|
|
dqList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
dqList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
dqStatus1 = dqList1.get(0).getFileStatus();
|
|
dqStatus1 = dqList1.get(0).getFileStatus();
|
|
- dqTips1 = "最后解析短期一期时间:" + DateFormatUtils.format(dqList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ dqTips1 = "最后解析光伏短期时间:" + DateFormatUtils.format(dqList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
} else {
|
|
} else {
|
|
- dqTips1 = "今日未解析过短期一期文件";
|
|
|
|
|
|
+ dqTips1 = "今日未解析过光伏短期文件";
|
|
}
|
|
}
|
|
|
|
|
|
ChannelStatusDto dqAnalysisDto1 = new ChannelStatusDto();
|
|
ChannelStatusDto dqAnalysisDto1 = new ChannelStatusDto();
|
|
- dqAnalysisDto1.setChannelId("DQYQ");
|
|
|
|
- dqAnalysisDto1.setChannelName("短期一期文件");
|
|
|
|
|
|
+ dqAnalysisDto1.setChannelId("DQ1");
|
|
|
|
+ dqAnalysisDto1.setChannelName("光伏短期文件");
|
|
dqAnalysisDto1.setChannelStatus(dqStatus1);
|
|
dqAnalysisDto1.setChannelStatus(dqStatus1);
|
|
dqAnalysisDto1.setTips(dqTips1);
|
|
dqAnalysisDto1.setTips(dqTips1);
|
|
analysisList.add(dqAnalysisDto1);
|
|
analysisList.add(dqAnalysisDto1);
|
|
@@ -447,13 +448,13 @@ public class DashboardService extends BaseService {
|
|
if (nwpList1.size() > 0) {
|
|
if (nwpList1.size() > 0) {
|
|
nwpList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
nwpList1.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
nwpStatus1 = nwpList1.get(0).getFileStatus();
|
|
nwpStatus1 = nwpList1.get(0).getFileStatus();
|
|
- nwpTips1 = "最后解析NWP一期时间:" + DateFormatUtils.format(nwpList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ nwpTips1 = "最后解析光伏NWP时间:" + DateFormatUtils.format(nwpList1.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
} else {
|
|
} else {
|
|
- nwpTips1 = "今日未解析过NWP一期文件";
|
|
|
|
|
|
+ nwpTips1 = "今日未解析过光伏NWP文件";
|
|
}
|
|
}
|
|
ChannelStatusDto nwpAnalysisDto1 = new ChannelStatusDto();
|
|
ChannelStatusDto nwpAnalysisDto1 = new ChannelStatusDto();
|
|
- nwpAnalysisDto1.setChannelId("NWPYQ");
|
|
|
|
- nwpAnalysisDto1.setChannelName("NWP一期文件");
|
|
|
|
|
|
+ nwpAnalysisDto1.setChannelId("NWP1");
|
|
|
|
+ nwpAnalysisDto1.setChannelName("光伏NWP文件");
|
|
nwpAnalysisDto1.setChannelStatus(nwpStatus1);
|
|
nwpAnalysisDto1.setChannelStatus(nwpStatus1);
|
|
nwpAnalysisDto1.setTips(nwpTips1);
|
|
nwpAnalysisDto1.setTips(nwpTips1);
|
|
analysisList.add(nwpAnalysisDto1);
|
|
analysisList.add(nwpAnalysisDto1);
|
|
@@ -465,14 +466,14 @@ public class DashboardService extends BaseService {
|
|
if (dqList2.size() > 0) {
|
|
if (dqList2.size() > 0) {
|
|
dqList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
dqList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
dqStatus2 = dqList2.get(0).getFileStatus();
|
|
dqStatus2 = dqList2.get(0).getFileStatus();
|
|
- dqTips2 = "最后解析短期二期时间:" + DateFormatUtils.format(dqList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ dqTips2 = "最后解析风电短期时间:" + DateFormatUtils.format(dqList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
} else {
|
|
} else {
|
|
- dqTips2 = "今日未解析过短期二期文件";
|
|
|
|
|
|
+ dqTips2 = "今日未解析过风电短期文件";
|
|
}
|
|
}
|
|
|
|
|
|
ChannelStatusDto dqAnalysisDto2 = new ChannelStatusDto();
|
|
ChannelStatusDto dqAnalysisDto2 = new ChannelStatusDto();
|
|
- dqAnalysisDto2.setChannelId("DQEQ");
|
|
|
|
- dqAnalysisDto2.setChannelName("短期二期文件");
|
|
|
|
|
|
+ dqAnalysisDto2.setChannelId("DQ2");
|
|
|
|
+ dqAnalysisDto2.setChannelName("风电短期文件");
|
|
dqAnalysisDto2.setChannelStatus(dqStatus2);
|
|
dqAnalysisDto2.setChannelStatus(dqStatus2);
|
|
dqAnalysisDto2.setTips(dqTips2);
|
|
dqAnalysisDto2.setTips(dqTips2);
|
|
analysisList.add(dqAnalysisDto2);
|
|
analysisList.add(dqAnalysisDto2);
|
|
@@ -483,13 +484,13 @@ public class DashboardService extends BaseService {
|
|
if (nwpList2.size() > 0) {
|
|
if (nwpList2.size() > 0) {
|
|
nwpList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
nwpList2.sort(Comparator.comparing(FileAnalysisRecord::getCreateTime).reversed());
|
|
nwpStatus2 = nwpList2.get(0).getFileStatus();
|
|
nwpStatus2 = nwpList2.get(0).getFileStatus();
|
|
- nwpTips2 = "最后解析NWP二期时间:" + DateFormatUtils.format(nwpList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
+ nwpTips2 = "最后解析风电NWP时间:" + DateFormatUtils.format(nwpList2.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
|
|
} else {
|
|
} else {
|
|
- nwpTips2 = "今日未解析过NWP二期文件";
|
|
|
|
|
|
+ nwpTips2 = "今日未解析过风电NWP文件";
|
|
}
|
|
}
|
|
ChannelStatusDto nwpAnalysisDto2 = new ChannelStatusDto();
|
|
ChannelStatusDto nwpAnalysisDto2 = new ChannelStatusDto();
|
|
- nwpAnalysisDto2.setChannelId("NWPEQ");
|
|
|
|
- nwpAnalysisDto2.setChannelName("NWP二期文件");
|
|
|
|
|
|
+ nwpAnalysisDto2.setChannelId("NWP2");
|
|
|
|
+ nwpAnalysisDto2.setChannelName("风电NWP文件");
|
|
nwpAnalysisDto2.setChannelStatus(nwpStatus2);
|
|
nwpAnalysisDto2.setChannelStatus(nwpStatus2);
|
|
nwpAnalysisDto2.setTips(nwpTips2);
|
|
nwpAnalysisDto2.setTips(nwpTips2);
|
|
analysisList.add(nwpAnalysisDto2);
|
|
analysisList.add(nwpAnalysisDto2);
|