fgfdg435435

ipp-ap/src/const/crud/fileanalysisrecord.js

@@ -32,7 +32,33 @@ export const tableOption = {
     , {
       "type": "input",
       "label": "文件类型",
-      "prop": "fileType"
+      "prop": "fileType",
+      formatter: (row, value, label, column) => {
+        if (value == 0) {
+          return label = "短期"
+        }
+        if (value == 1) {
+          return label = "超短期"
+        }
+        if (value == 2) {
+          return label = "测风塔"
+        }
+        if (value == 3) {
+          return label = "气象站"
+        }
+        if (value == 4) {
+          return label = "NWP"
+        }
+        if (value == 5) {
+          return label = "风机"
+        }
+        if (value == 6) {
+          return label = "逆变器"
+        }
+        if (value == 7) {
+          return label = "实际功率"
+        }
+      }
     }
     , {
       "type": "input",

ipp-ap/src/views/idp/control/parsingLog/index.vue

@@ -122,6 +122,9 @@ export default {
       }, {
         value: 6,
         label: '逆变器'
+      }, {
+        value: 7,
+        label: '实际功率'
       }],
       statusList: [{
         value: 0,

ipp-idp/src/main/java/com/jiayue/ipp/idp/dto/FileAnalysisStatusDto.java

@@ -0,0 +1,17 @@
+package com.jiayue.ipp.idp.dto;
+
+import lombok.Data;
+
+/**
+ * 站端文件解析状态dto
+ *
+ * @author jy
+ * @since 2024/09/06
+ */
+@Data
+public class FileAnalysisStatusDto {
+    private String fileType;
+    private String fileName;
+    private String status;
+    private String message;
+}

ipp-idp/src/main/java/com/jiayue/ipp/idp/job/DeleteFjDataJob.java

@@ -5,7 +5,9 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jiayue.ipp.common.data.entity.WindTurbineStatusData;
+import com.jiayue.ipp.common.data.entity.an.ParsingLog;
 import com.jiayue.ipp.idp.service.WindTurbineStatusDataService;
+import com.jiayue.ipp.idp.service.an.ParsingLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -24,6 +26,8 @@ import java.util.Date;
 @Service @EnableScheduling public class DeleteFjDataJob {
   @Autowired
   WindTurbineStatusDataService windTurbineStatusDataService;
+  @Autowired
+  ParsingLogService parsingLogService;
 
   @Scheduled(cron = "0 11 3 * * ?") public void executeFjDataDelete() {
     log.info("-----------------开始执行清理风机数据任务----------------------");
@@ -37,4 +41,17 @@ import java.util.Date;
     windTurbineStatusDataService.remove(lambdaQueryWrapper);
     log.info("-----------------执行清理风机数据任务完成----------------------");
   }
+
+  @Scheduled(cron = "0 22 2 * * ?") public void executeParsingLogDelete() {
+    log.info("-----------------开始执行清理解析站端文件日志任务----------------------");
+    // 日志保留10天
+    int keepDays = -10;
+    // 删除到截止日期
+    DateTime dateTime = DateUtil.offsetDay(new Date(), keepDays);
+    String deleteEndTime = dateTime.toString(DatePattern.NORM_DATE_FORMAT);
+    LambdaQueryWrapper<ParsingLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+    lambdaQueryWrapper.lt(ParsingLog::getCreateTime, DateUtil.parse(deleteEndTime));
+    parsingLogService.remove(lambdaQueryWrapper);
+    log.info("-----------------执行清理解析站端文件日志任务完成----------------------");
+  }
 }

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/an/FTPService.java

@@ -8,6 +8,7 @@ import cn.hutool.extra.ftp.FtpMode;
 import com.jiayue.ipp.common.data.entity.an.ParsingChannel;
 import com.jiayue.ipp.common.data.entity.an.ParsingLog;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.util.FileUtil;
 import lombok.RequiredArgsConstructor;
@@ -136,15 +137,18 @@ public class FTPService {
                                     //下载文件到临时目录
                                     ftp.download(url, fileName, dirFile);
                                     File file = FileUtils.getFile(dirFile, fileName);
+                                    if (file.length()<=0){
+                                        continue;
+                                    }
 
                                     //定义解析的类型，默认为错误（未知），成功后为文件类型，也会作为存储目录名
-                                    String type = parsingFileService.parsingFile(file, ftpParsingUrl);
-                                    parsingLog.setFileType(type);
-                                    if (type.startsWith(ParsingConstant.FAIL)) {
+                                    FileAnalysisStatusDto fileAnalysisStatusDto = parsingFileService.parsingFile(file, ftpParsingUrl);
+                                    parsingLog.setFileType(fileAnalysisStatusDto.getFileType());
+                                    if (!"1".equals(fileAnalysisStatusDto.getStatus())) {
                                         // 解析失败
                                         file.delete();
                                         parsingLog.setParsingFileStatus("0");
-                                        parsingLog.setParsingDescribe("文件解析失败");
+                                        parsingLog.setParsingDescribe(fileAnalysisStatusDto.getMessage());
                                     } else {
                                         // 解析成功，删除ftp上的文件
                                         ftp.delFile(url + "/" + fileName);
@@ -152,7 +156,6 @@ public class FTPService {
                                         parsingLog.setParsingDescribe("文件解析成功");
                                     }
                                     parsingLogService.save(parsingLog);
-
                                 }
                                 catch (Exception e){
                                     log.error(ftpParsingUrl.getStationCode()+"文件解析失败"+fileName,e);

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/an/ParsingFileService.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jiayue.ipp.common.data.entity.an.ChannelStatus;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.entity.an.ReportingRateRecords;
-import com.jiayue.ipp.idp.dto.ChannelStatusDto;
-import com.jiayue.ipp.idp.dto.ParsingConstant;
-import com.jiayue.ipp.idp.dto.ParsingStatusFileDto;
-import com.jiayue.ipp.idp.dto.ReportingRateDto;
+import com.jiayue.ipp.idp.dto.*;
 import com.jiayue.ipp.idp.util.FileUtil;
 import com.jiayue.ipp.idp.util.JsonBeanUtil;
 import lombok.RequiredArgsConstructor;
@@ -52,19 +49,20 @@ public class ParsingFileService {
      *   4-20：取值在4-20行
      *   3：第三列
      * */
-    public String parsingFile(File file, ParsingUrl parsingUrl) {
-
+    public FileAnalysisStatusDto parsingFile(File file, ParsingUrl parsingUrl) {
         log.info("开始尝试解析【{}】的 {}",parsingUrl.getStationCode(),file.getName());
+        FileAnalysisStatusDto fileAnalysisStatusDto=new FileAnalysisStatusDto();
         //因为并不知道当前文件属于哪种类型文件，所以遍历接口实现类来进行对应文件的解析
         for (ParsingInterface parsingInterface : parsingInterfaces) {
-            String parsing = parsingInterface.parsing(file, parsingUrl);
-            if (!parsing.equals(ParsingConstant.FAIL)) {
-                return parsing;
+            fileAnalysisStatusDto = parsingInterface.parsing(file, parsingUrl);
+            if (fileAnalysisStatusDto.getStatus()!=null) {
+                return fileAnalysisStatusDto;
             }
         }
-
-        log.error("无配置符合{}文件解析失败！！！", file.getName());
-        return ParsingConstant.FAIL + "无配置符合{}文件解析失败！！！";
+        if (fileAnalysisStatusDto.getStatus()==null){
+            fileAnalysisStatusDto.setMessage("无配置符合文件解析失败！！！");
+        }
+        return fileAnalysisStatusDto;
     }
 
 
@@ -129,4 +127,4 @@ public class ParsingFileService {
     }
 
 
-}
+}

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/an/ParsingInterface.java

@@ -2,6 +2,7 @@ package com.jiayue.ipp.idp.service.an;
 
 import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.FileParsingConfig;
 import com.jiayue.ipp.idp.util.FieldUtil;
 import com.jiayue.ipp.idp.util.PUtil;
@@ -23,7 +24,7 @@ public interface ParsingInterface {
 
     boolean deleteById(String id);
 
-    String parsing(File file, ParsingUrl parsingUrl);
+    FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl);
 
 
     default Long parsingTime(String sign, List<String> fileContent) {

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingCdqInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
 import com.jiayue.ipp.idp.config.Constant;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.FileParsingConfig;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingCdqInfoMapper;
@@ -64,8 +65,12 @@ public class ParsingCdqInfoServiceImpl extends ServiceImpl<ParsingCdqInfoMapper,
     }
 
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.CDQ.name());
+//
+//        String parsingStatus = ParsingConstant.FAIL;
 
         try {
             // 查询ParsingCdqInfo列表
@@ -116,7 +121,7 @@ public class ParsingCdqInfoServiceImpl extends ServiceImpl<ParsingCdqInfoMapper,
                                     ago++;
                                 }
 
-                                parsingStatus = FileTypeEnum.CDQ.name();
+                                fileAnalysisStatusDto.setStatus("1");
                                 log.info("解析CDQ文件：{} 成功！ O(∩_∩)O", file.getName());
 
                                 // 删除之前的ForecastPowerUltraShortTerm记录
@@ -137,28 +142,31 @@ public class ParsingCdqInfoServiceImpl extends ServiceImpl<ParsingCdqInfoMapper,
                                 // 批量保存新的ForecastPowerUltraShortTermHis记录
                                 forecastPowerUltraShortTermHisService.saveBatch(forecastPowerUltraShortTermHisList);
                             } else {
-                                parsingStatus += "解析CDQ文件时间错误";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("解析超短期文件时间错误");
                                 log.error("解析CDQ文件时间错误");
                             }
                         }
                         else {
-                            parsingStatus += "解析超短期文件无数据";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("解析超短期文件无数据");
                             log.error("解析超短期文件无数据");
                         }
 
                     }else {
-                        parsingStatus += "cdq暂无单行解析方式";
+                        fileAnalysisStatusDto.setStatus("0");
+                        fileAnalysisStatusDto.setMessage("超短期暂无单行解析方式");
                         log.info("cdq暂无单行解析方式");
                     }
                 }
             }
         } catch (Exception e) {
-            parsingStatus += "解析超短期数据失败! /(ㄒoㄒ)/~~";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析超短期数据失败!");
             log.error("解析超短期数据失败", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }
 
 

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingCftInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
 
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingCftInfoMapper;
 import com.jiayue.ipp.idp.service.WindTowerInfoService;
@@ -60,13 +61,12 @@ public class ParsingCftInfoServiceImpl extends ServiceImpl<ParsingCftInfoMapper,
     }
 
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.CFT.name());
 
         try {
-
-
             List<ParsingCftInfo> parsingCftInfos = baseMapper.selectList(Wrappers.lambdaQuery(ParsingCftInfo.class).like(ParsingInfo::getStationCode, parsingUrl.getStationCode()));
             if (parsingCftInfos.size() > 0) {
                 List<WindTowerInfo> windTowerInfoList = windTowerInfoService.list(Wrappers.lambdaQuery(WindTowerInfo.class)
@@ -116,30 +116,33 @@ public class ParsingCftInfoServiceImpl extends ServiceImpl<ParsingCftInfoMapper,
                                     windTowerStatusData.setEquipmentId(windTowerInfoList.get(0).getEquipmentNo());
 
                                     windTowerStatusDataService.save(windTowerStatusData);
-                                    parsingStatus = FileTypeEnum.CFT.name();
+                                    fileAnalysisStatusDto.setStatus("1");
                                     log.info("解析CFT文件：{} 成功！ O(∩_∩)O", file.getName());
                                 } else {
-                                    parsingStatus += "解析CFT文件时间错误";
+                                    fileAnalysisStatusDto.setStatus("0");
+                                    fileAnalysisStatusDto.setMessage("解析测风塔文件时间错误");
                                     log.error("解析CFT文件时间错误");
                                 }
                             } else {
-                                parsingStatus += "cft暂无多行解析方式";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("测风塔暂无多行解析方式");
                                 log.info("cft暂无多行解析方式");
                             }
                         }
                     }
                 } else {
-                    parsingStatus += "cft未配置作为解析使用设备";
+                    fileAnalysisStatusDto.setStatus("0");
+                    fileAnalysisStatusDto.setMessage("测风塔未配置作为解析使用设备");
                     log.info("cft未配置作为解析使用设备");
                 }
 
             }
         } catch (Exception e) {
-            parsingStatus += "解析测风塔数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析测风塔数据失败！");
             log.error("解析测风塔数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }
 }

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingDqInfoServiceImpl.java

@@ -13,6 +13,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
 import com.jiayue.ipp.idp.config.Constant;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.FileParsingConfig;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingDqInfoMapper;
@@ -64,8 +65,10 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
     }
 
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.DQ.name());
 
         try {
             List<ForecastPowerShortTermHis> forecastPowerShortTermHisList = new ArrayList<>();
@@ -134,23 +137,27 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 
 
                                         log.info("解析DQ文件：{} 成功！ O(∩_∩)O", file.getName());
-                                        parsingStatus = FileTypeEnum.DQ.name();
+                                        fileAnalysisStatusDto.setStatus("1");
                                     } else {
-                                        parsingStatus += "解析DQ文件时间错误";
+                                        fileAnalysisStatusDto.setStatus("0");
+                                        fileAnalysisStatusDto.setMessage("解析短期文件时间错误");
                                         log.error("解析DQ文件时间错误");
                                     }
                                 }
                                 else{
-                                    parsingStatus += "dq文件里日期不对";
+                                    fileAnalysisStatusDto.setStatus("0");
+                                    fileAnalysisStatusDto.setMessage("短期文件里日期不对");
                                     log.info("dq文件里日期不对");
                                 }
 
                             } else {
-                                parsingStatus += "解析短期文件无数据";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("解析短期文件无数据");
                                 log.error("解析短期文件无数据");
                             }
                         } else {
-                            parsingStatus += "dq暂无单行解析方式";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("短期暂无单行解析方式");
                             log.info("dq暂无单行解析方式");
                         }
                     }
@@ -161,12 +168,12 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 //                }
             }
         } catch (Exception e) {
-            parsingStatus += "解析短期数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析短期数据失败!");
             log.error("解析短期数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }
 
 

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingFjInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingFjInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingFjInfoMapper;
 import com.jiayue.ipp.idp.service.WindTurbineInfoService;
@@ -61,8 +62,10 @@ public class ParsingFjInfoServiceImpl extends ServiceImpl<ParsingFjInfoMapper, P
     }
 
     @Override
-    public String parsing(File file, ParsingUrl ftpParsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl ftpParsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.FJ.name());
 
         try {
 
@@ -110,30 +113,32 @@ public class ParsingFjInfoServiceImpl extends ServiceImpl<ParsingFjInfoMapper, P
 
                                     windTurbineStatusDataService.save(windTurbineStatusData);
                                     log.info("解析FJ文件：" + file.getName() + " 成功！ O(∩_∩)O");
-                                    parsingStatus = FileTypeEnum.FJXX.name();
+                                    fileAnalysisStatusDto.setStatus("1");
                                 } else {
-                                    parsingStatus += "解析FJ文件时间错误";
+                                    fileAnalysisStatusDto.setStatus("0");
+                                    fileAnalysisStatusDto.setMessage("解析风机文件时间错误");
                                     log.error("解析FJ文件时间错误");
                                 }
                             } else {
-                                parsingStatus += "fj {" + fjName + "} 在本地无配置无法解析";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("风机在本地无配置无法解析");
                                 log.info("fj {} 在本地无配置无法解析", fjName);
                             }
                         } else {
-                            parsingStatus += "fj暂无多行解析方式";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("风机暂无多行解析方式");
                             log.info("fj暂无多行解析方式");
                         }
-
-
                     }
                 }
             }
 
         } catch (Exception e) {
-            parsingStatus += "解析风机数据错误！ /(ㄒoㄒ)/~~";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析风机数据错误！");
             log.error("解析风机数据错误",e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
 
     }

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingNbqInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingNbqInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingNbqInfoMapper;
 import com.jiayue.ipp.idp.service.InverterInfoService;
@@ -55,8 +56,10 @@ public class ParsingNbqInfoServiceImpl extends ServiceImpl<ParsingNbqInfoMapper,
     }
 
     @Override
-    public String parsing(File file, ParsingUrl ftpParsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl ftpParsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.NBQ.name());
 
         try {
 
@@ -103,29 +106,31 @@ public class ParsingNbqInfoServiceImpl extends ServiceImpl<ParsingNbqInfoMapper,
                                     inverterStatusData.setStationCode(ftpParsingUrl.getStationCode());
                                     inverterStatusDataService.save(inverterStatusData);
                                     log.info("解析NBQ文件：{} 成功！ O(∩_∩)O", file.getName());
-                                    parsingStatus = FileTypeEnum.NBQ.name();
+                                    fileAnalysisStatusDto.setStatus("1");
                                 } else {
-                                    parsingStatus += "nbq {" + nbqName + "} 在本地无配置无法解析";
+                                    fileAnalysisStatusDto.setStatus("0");
+                                    fileAnalysisStatusDto.setMessage("逆变器在本地无配置无法解析");
                                     log.info("nbq {} 在本地无配置无法解析", nbqName);
                                 }
                             } else {
-                                parsingStatus += "解析NBQ文件时间错误";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("解析逆变器文件时间错误");
                                 log.error("解析NBQ文件时间错误");
                             }
                         } else {
-                            parsingStatus += "nbq暂无多行解析方式";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("逆变器暂无多行解析方式");
                             log.info("nbq暂无多行解析方式");
                         }
                     }
                 }
             }
         } catch (Exception e) {
-            parsingStatus += "解析逆变器数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析逆变器数据失败！");
             log.error("解析逆变器数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }
-
 }

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingNwpInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingNwpInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
 import com.jiayue.ipp.idp.config.Constant;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.FileParsingConfig;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingNwpInfoMapper;
@@ -74,9 +75,10 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
      *   3：第三列
      * */
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.NWP.name());
 
         try {
 
@@ -207,26 +209,28 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
 //
                                 nwpService.saveBatch(nwpList);
 
-                                parsingStatus = FileTypeEnum.NWP72.name();
+                                fileAnalysisStatusDto.setStatus("1");
                                 log.info("解析Nwp文件：{} 成功！ O(∩_∩)O", file.getName());
                             } else {
-                                parsingStatus += "解析Nwp文件时间错误";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("解析Nwp文件时间错误");
                                 log.error("解析Nwp文件时间错误");
                             }
                         } else {
-                            parsingStatus += "nwp暂无单行解析方式";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("Nwp暂无单行解析方式");
                             log.info("nwp暂无单行解析方式");
                         }
                     }
                 }
             }
         } catch (Exception e) {
-            parsingStatus += "解析Nwp数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析Nwp数据失败");
             log.error("解析Nwp数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }
 
 

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingQxzInfoServiceImpl.java

@@ -8,7 +8,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingQxzInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
-import com.jiayue.ipp.idp.dto.ParsingConstant;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.mapper.an.ParsingQxzInfoMapper;
 import com.jiayue.ipp.idp.service.WeatherStationInfoService;
 import com.jiayue.ipp.idp.service.WeatherStationStatusDataService;
@@ -22,9 +22,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -58,9 +55,10 @@ public class ParsingQxzInfoServiceImpl extends ServiceImpl<ParsingQxzInfoMapper,
     }
 
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
-
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.QXZ.name());
         try {
 
             List<ParsingQxzInfo> parsingQxzInfos = baseMapper.selectList(Wrappers.lambdaQuery(ParsingQxzInfo.class).like(ParsingInfo::getStationCode, parsingUrl.getStationCode()));
@@ -96,28 +94,32 @@ public class ParsingQxzInfoServiceImpl extends ServiceImpl<ParsingQxzInfoMapper,
                                     w.setStationCode(parsingQxzInfo.getStationCode());
                                     w.setEquipmentId(weatherStationInfoList.get(0).getEquipmentNo());
                                     weatherStationStatusDataService.save(w);
-                                    parsingStatus = FileTypeEnum.QXZ.name();
+                                    fileAnalysisStatusDto.setStatus("1");
                                     log.info("解析QXZ文件：{} 成功！ O(∩_∩)O", file.getName());
                                 } else {
-                                    parsingStatus += "解析QXZ文件时间错误";
+                                    fileAnalysisStatusDto.setStatus("0");
+                                    fileAnalysisStatusDto.setMessage("解析气象站文件时间错误");
                                     log.error("解析QXZ文件时间错误");
                                 }
                             } else {
-                                parsingStatus += "qxz暂无多行解析方式";
+                                fileAnalysisStatusDto.setStatus("0");
+                                fileAnalysisStatusDto.setMessage("气象站暂无多行解析方式");
                                 log.info("qxz暂无多行解析方式");
                             }
                         }
                     }
                 } else {
-                    parsingStatus += "qxz未配置作为解析使用设备";
+                    fileAnalysisStatusDto.setStatus("0");
+                    fileAnalysisStatusDto.setMessage("气象站未配置作为解析使用设备");
                     log.info("qxz未配置作为解析使用设备");
                 }
             }
         } catch (Exception e) {
-            parsingStatus += "解析气象站数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析气象站数据失败！");
             log.error("解析气象站数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
     }
 }

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/an/ParsingRpInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingRpInfo;
 import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
 import com.jiayue.ipp.common.data.enums.FileTypeEnum;
+import com.jiayue.ipp.idp.dto.FileAnalysisStatusDto;
 import com.jiayue.ipp.idp.dto.FileParsingConfig;
 import com.jiayue.ipp.idp.dto.ParsingConstant;
 import com.jiayue.ipp.idp.mapper.an.ParsingRpInfoMapper;
@@ -55,8 +56,10 @@ public class ParsingRpInfoServiceImpl extends ServiceImpl<ParsingRpInfoMapper, P
     }
 
     @Override
-    public String parsing(File file, ParsingUrl parsingUrl) {
-        String parsingStatus = ParsingConstant.FAIL;
+    public FileAnalysisStatusDto parsing(File file, ParsingUrl parsingUrl) {
+        FileAnalysisStatusDto fileAnalysisStatusDto = new FileAnalysisStatusDto();
+        fileAnalysisStatusDto.setFileName(file.getName());
+        fileAnalysisStatusDto.setFileType(FileTypeEnum.RP.name());
 
         try {
             List<ParsingRpInfo> parsingRpInfos = baseMapper.selectList(Wrappers.lambdaQuery(ParsingRpInfo.class).like(ParsingInfo::getStationCode, parsingUrl.getStationCode()));
@@ -86,26 +89,26 @@ public class ParsingRpInfoServiceImpl extends ServiceImpl<ParsingRpInfoMapper, P
                             powerStationStatusDataService.save(powerStationStatusData);
 
                             log.info("解析RP文件：{} 成功！ O(∩_∩)O", file.getName());
-                            parsingStatus = FileTypeEnum.RP.name();
+                            fileAnalysisStatusDto.setStatus("1");
                         } else {
-                            parsingStatus += "解析RP文件时间错误";
+                            fileAnalysisStatusDto.setStatus("0");
+                            fileAnalysisStatusDto.setMessage("解析实际功率文件时间错误");
                             log.error("解析RP文件时间错误");
                         }
-
-
                     } else {
-                        parsingStatus += "RP暂无单行解析方式";
+                        fileAnalysisStatusDto.setStatus("0");
+                        fileAnalysisStatusDto.setMessage("实际功率暂无单行解析方式");
                         log.info("RP暂无单行解析方式");
                     }
                 }
             }
         } catch (Exception e) {
-            parsingStatus += "解析实际功率数据失败";
+            fileAnalysisStatusDto.setStatus("0");
+            fileAnalysisStatusDto.setMessage("解析实际功率数据失败！");
             log.error("解析实际功率数据失败！ /(ㄒoㄒ)/~~", e);
         } finally {
-            return parsingStatus;
+            return fileAnalysisStatusDto;
         }
-
     }