上报数据查询增加调控短期、调控超短期

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

@@ -139,33 +139,13 @@ public class ReportDataController {
 
                 }
             }
-//            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)) {
+                if ("rdq".equals(fileType) || "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)) {
+                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.setParsingFileStatus("失败");