Merge remote-tracking branch 'origin/master'

cpp-admin/src/main/java/com/cpp/web/controller/reportData/ReportDataController.java

@@ -67,91 +67,13 @@ public class ReportDataController {
             } else {
                 fileTypeEnumList = FileTypeEnum.getWindFileType();
             }
-        }
-        if (fileTypeEnumList.size() > 0 && null != fileTypeEnumList){
-            // 获取应上报文件名
-            List<String> shouldFileName = reportDataService.shouldFileName(fileType, startTime, endTime, stationCode);
-            List<ParsingLog> parsingLogList = parsingLogService.findByTimeBetweenAndFileTypeAndStationCode(new Date(startTime), new Date(endTime), fileType, stationCode);
-            if (parsingLogList.size() > 0) {
+            List<ParsingLog> parsingLogList = new ArrayList<>();
+            for (FileTypeEnum fileTypeEnum : fileTypeEnumList) {
+                parsingLogList = getAllFileName(fileTypeEnum.name(), startTime, endTime, stationCode);
                 resultList.addAll(parsingLogList);
-                for (int i = 0; i < shouldFileName.size(); i++) {
-                    int finalI = i;
-                    List<ParsingLog> collectList = parsingLogList.stream().filter(f -> f.getFileName().contains(shouldFileName.get(finalI))).collect(Collectors.toList());
-                    if (collectList.size() > 0) {
-                        continue;
-                    } else {
-                        ParsingLog parsingLogs = new ParsingLog();
-                        parsingLogs.setDataSources(DataSourcesEnum.E1);
-                        if ("dq".equals(fileType) || "nwp".equals(fileType)) {
-                            parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
-                        }
-                        if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
-                            parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
-                        }
-                        parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
-                        parsingLogs.setParsingFileStatus("失败");
-                        parsingLogs.setStationCode(stationCode);
-                        resultList.add(parsingLogs);
-                    }
-                }
-            } else {
-                for (int i = 0; i < shouldFileName.size(); i++) {
-                    ParsingLog parsingLogs = new ParsingLog();
-                    if ("dq".equals(fileType) || "nwp".equals(fileType)) {
-                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
-                    }
-                    if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
-                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
-                    }
-                    parsingLogs.setParsingFileStatus("失败");
-                    parsingLogs.setStationCode(stationCode);
-                    parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
-                    parsingLogs.setDataSources(DataSourcesEnum.E1);
-                    resultList.add(parsingLogs);
-                }
-            }
-        }else {
-            // 获取应上报文件名
-            List<String> shouldFileName = reportDataService.shouldFileName(fileType, startTime, endTime, stationCode);
-            List<ParsingLog> parsingLogList = parsingLogService.findByTimeBetweenAndFileTypeAndStationCode(new Date(startTime), new Date(endTime), fileType, stationCode);
-            if (parsingLogList.size() > 0) {
-                resultList.addAll(parsingLogList);
-                for (int i = 0; i < shouldFileName.size(); i++) {
-                    int finalI = i;
-                    List<ParsingLog> collectList = parsingLogList.stream().filter(f -> f.getFileName().contains(shouldFileName.get(finalI))).collect(Collectors.toList());
-                    if (collectList.size() > 0) {
-                        continue;
-                    } else {
-                        ParsingLog parsingLogs = new ParsingLog();
-                        parsingLogs.setDataSources(DataSourcesEnum.E1);
-                        if ("dq".equals(fileType) || "nwp".equals(fileType)) {
-                            parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
-                        }
-                        if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
-                            parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
-                        }
-                        parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
-                        parsingLogs.setParsingFileStatus("失败");
-                        parsingLogs.setStationCode(stationCode);
-                        resultList.add(parsingLogs);
-                    }
-                }
-            } else {
-                for (int i = 0; i < shouldFileName.size(); i++) {
-                    ParsingLog parsingLogs = new ParsingLog();
-                    if ("dq".equals(fileType) || "nwp".equals(fileType)) {
-                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
-                    }
-                    if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
-                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
-                    }
-                    parsingLogs.setParsingFileStatus("失败");
-                    parsingLogs.setStationCode(stationCode);
-                    parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
-                    parsingLogs.setDataSources(DataSourcesEnum.E1);
-                    resultList.add(parsingLogs);
-                }
             }
+        } else {
+            resultList = getAllFileName(fileType, startTime, endTime, stationCode);
         }
 
         // 定义比较器
@@ -189,4 +111,70 @@ public class ReportDataController {
 
         return correctTimestampStr;
     }
+
+    public List<ParsingLog> getAllFileName(String fileType, Long startTime, Long endTime, String stationCode) {
+        List<ParsingLog> resultList = new ArrayList<>();
+
+        // 获取应上报文件名
+        List<String> shouldFileName = reportDataService.shouldFileName(fileType, startTime, endTime, stationCode);
+        List<ParsingLog> parsingLogList = parsingLogService.findByTimeBetweenAndFileTypeAndStationCode(new Date(startTime), new Date(endTime), fileType, stationCode);
+        if (parsingLogList.size() > 0) {
+            resultList.addAll(parsingLogList);
+            for (String s : shouldFileName) {
+                List<ParsingLog> collectList = parsingLogList.stream().filter(f -> f.getFileName().contains(s)).collect(Collectors.toList());
+                if (collectList.size() == 0) {
+                    ParsingLog parsingLogs = new ParsingLog();
+
+                    if ("rdq".equals(fileType) || "dq".equals(fileType) || "nwp".equals(fileType)) {
+                        parsingLogs.setFileName("sign_" + s + "_0000_" + fileType.toUpperCase() + ".WPD");
+                    }
+                    if ("rcdq".equals(fileType) || "cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
+                        parsingLogs.setFileName("sign_" + s + "_" + fileType.toUpperCase() + ".WPD");
+                    }
+                    parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
+                    parsingLogs.setParsingFileStatus("失败");
+                    parsingLogs.setStationCode(stationCode);
+                    parsingLogs.setDataSources(DataSourcesEnum.E1);
+                    resultList.add(parsingLogs);
+
+                }
+            }
+//            for (int i = 0; i < shouldFileName.size(); i++) {
+//                int finalI = i;
+//                List<ParsingLog> collectList = parsingLogList.stream().filter(f -> f.getFileName().contains(shouldFileName.get(finalI))).collect(Collectors.toList());
+//                if (collectList.size() == 0) {
+//                    ParsingLog parsingLogs = new ParsingLog();
+//
+//                    if ("rdq".equals(fileType) || "dq".equals(fileType) || "nwp".equals(fileType)) {
+//                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
+//                    }
+//                    if ("rcdq".equals(fileType) || "cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
+//                        parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
+//                    }
+//                    parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
+//                    parsingLogs.setParsingFileStatus("失败");
+//                    parsingLogs.setStationCode(stationCode);
+//                    parsingLogs.setDataSources(DataSourcesEnum.E1);
+//                    resultList.add(parsingLogs);
+//
+//                }
+//            }
+        } else {
+            for (int i = 0; i < shouldFileName.size(); i++) {
+                ParsingLog parsingLogs = new ParsingLog();
+                if ("dq".equals(fileType) || "nwp".equals(fileType)) {
+                    parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_0000_" + fileType.toUpperCase() + ".WPD");
+                }
+                if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
+                    parsingLogs.setFileName("sign_" + shouldFileName.get(i) + "_" + fileType.toUpperCase() + ".WPD");
+                }
+                parsingLogs.setParsingFileStatus("失败");
+                parsingLogs.setStationCode(stationCode);
+                parsingLogs.setFileType(FileTypeEnum.valueOf(fileType));
+                parsingLogs.setDataSources(DataSourcesEnum.E1);
+                resultList.add(parsingLogs);
+            }
+        }
+        return resultList;
+    }
 }

cpp-admin/src/main/java/com/cpp/web/service/reprtdata/impl/ReportDataServiceImpl.java

@@ -39,10 +39,10 @@ public class ReportDataServiceImpl implements ReportDataService {
     @Override
     public List<String> shouldFileName(String fileType, Long startTime, Long endTime, String stationCode) {
         List<String> list = new ArrayList<>();
-        if ("dq".equals(fileType) || "nwp".equals(fileType)) {
+        if ("rdq".equals(fileType) || "dq".equals(fileType) || "nwp".equals(fileType)) {
             list = getDatesInRange(startTime + 24 * 60 * 60 * 1000L, endTime + 24 * 60 * 60 * 1000L);
         }
-        if ("cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
+        if ("rcdq".equals(fileType) || "cdq".equals(fileType) || "status".equals(fileType) || "nbq".equals(fileType) || "qxz".equals(fileType) || "rp".equals(fileType) || "fj".equals(fileType) || "cft".equals(fileType)) {
             if (new Date(endTime).after(new Date())) {
                 list = getMin(startTime, new Date().getTime(), fileType);
             } else {
@@ -96,7 +96,7 @@ public class ReportDataServiceImpl implements ReportDataService {
         LocalDateTime currentTime = start;
         while (!currentTime.isAfter(end)) {
             String formattedTime = currentTime.format(formatter);
-            if ("cdq".equals(fileType)) {
+            if ("cdq".equals(fileType) || "rcdq".equals(fileType)) {
                 currentTime = currentTime.plusMinutes(15);
             } else {
                 currentTime = currentTime.plusMinutes(5);

cpp-ui/src/views/statistics/analyzeRecords/index.vue

@@ -295,8 +295,8 @@ export default {
         "dataSources": this.dataSources,
         "parsingDescribe": this.fileDescribe,
         "parsingFileStatus": this.fileStatus,
-        "pageSize": this.pageSize,
-        "currentPage": this.currentPage
+        "size": this.pageSize,
+        "page": this.currentPage
       }
       this.$axios.get('/parsingLog/getByStationCodeAndCreateTimeAndFileType', {params: param}).then(response => {
         this.tableData = response.data.records