fix:优化掉一些字段

mo-daq/src/main/java/com/smppw/modaq/application/components/report/parser/ai/AbstractAIReportParser.java

@@ -30,7 +30,7 @@ public abstract class AbstractAIReportParser<T extends ReportData> extends Abstr
     @Value("${email.report.ai-parser-url}")
     private String aiParserUrl;
 
-    protected String aiFileId;
+//    protected String aiFileId;
 
     protected Map<String, Object> allInfoMap;
 
@@ -50,7 +50,6 @@ public abstract class AbstractAIReportParser<T extends ReportData> extends Abstr
         // 解构话返回解析数据
         T reportData = this.buildReportData(params, params.getFilename());
         if (reportData != null) {
-            reportData.setAiFileId(this.aiFileId);
             reportData.setAiParse(true);
         }
         return reportData;
@@ -112,7 +111,7 @@ public abstract class AbstractAIReportParser<T extends ReportData> extends Abstr
     protected void init() {
         super.init();
         // 先初始化为null
-        this.aiFileId = null;
+//        this.aiFileId = null;
         this.allInfoMap = MapUtil.newHashMap(128);
     }
 
@@ -144,7 +143,7 @@ public abstract class AbstractAIReportParser<T extends ReportData> extends Abstr
         try {
             body = HttpUtil.get(this.aiParserUrl, paramsMap);
             JSONObject jsonResult = JSONUtil.parseObj(body);
-            this.aiFileId = MapUtil.getStr(jsonResult, "file_id");
+//            this.aiFileId = MapUtil.getStr(jsonResult, "file_id");
             String content = StrUtil.split(jsonResult.getStr("content"), "```").get(1);
             String aiParserContent = "{" + StrUtil.subAfter(content, "{", false) + "}";
             if (StrUtil.isNotBlank(aiParserContent)) {

mo-daq/src/main/java/com/smppw/modaq/application/service/EmailParseApiServiceImpl.java

@@ -253,49 +253,49 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
 //        return contentInfoDTO;
 //    }
 
-    private List<EmailContentInfoDTO> buildEmailContentInfoDTO(Integer emailId,
-                                                               EmailParseInfoDO emailParseInfoDO,
-                                                               List<EmailFileInfoDO> emailFileInfoDOList) {
-        List<EmailContentInfoDTO> emailContentInfoDTOList = CollUtil.newArrayList();
-        String emailDate = DateUtil.format(emailParseInfoDO.getEmailDate(), DateConst.YYYY_MM_DD_HH_MM_SS);
-        String parseDate = DateUtil.format(new Date(), DateConst.YYYY_MM_DD_HH_MM_SS);
-        for (EmailFileInfoDO fileInfoDO : emailFileInfoDOList) {
-            EmailContentInfoDTO contentInfoDTO = new EmailContentInfoDTO();
-            contentInfoDTO.setEmailId(emailId);
-            contentInfoDTO.setFileId(fileInfoDO.getId());
-            contentInfoDTO.setSenderEmail(emailParseInfoDO.getSenderEmail());
-            contentInfoDTO.setEmailAddress(emailParseInfoDO.getEmail());
-            contentInfoDTO.setEmailDate(emailDate);
-            contentInfoDTO.setEmailTitle(emailParseInfoDO.getEmailTitle());
-            contentInfoDTO.setParseDate(parseDate);
-            contentInfoDTO.setFileName(fileInfoDO.getFileName());
-            contentInfoDTO.setFilePath(fileInfoDO.getFilePath());
-            Integer emailType = EmailUtil.getEmailTypeBySubject(emailParseInfoDO.getEmailTitle());
-            contentInfoDTO.setEmailType(emailType);
-            String emailContent = readHtmlFileContent(fileInfoDO.getFilePath());
-            contentInfoDTO.setEmailContent(emailContent);
-            contentInfoDTO.setAiFileId(fileInfoDO.getAiFileId());
-            emailContentInfoDTOList.add(contentInfoDTO);
-        }
-        return emailContentInfoDTOList;
-    }
+//    private List<EmailContentInfoDTO> buildEmailContentInfoDTO(Integer emailId,
+//                                                               EmailParseInfoDO emailParseInfoDO,
+//                                                               List<EmailFileInfoDO> emailFileInfoDOList) {
+//        List<EmailContentInfoDTO> emailContentInfoDTOList = CollUtil.newArrayList();
+//        String emailDate = DateUtil.format(emailParseInfoDO.getEmailDate(), DateConst.YYYY_MM_DD_HH_MM_SS);
+//        String parseDate = DateUtil.format(new Date(), DateConst.YYYY_MM_DD_HH_MM_SS);
+//        for (EmailFileInfoDO fileInfoDO : emailFileInfoDOList) {
+//            EmailContentInfoDTO contentInfoDTO = new EmailContentInfoDTO();
+//            contentInfoDTO.setEmailId(emailId);
+//            contentInfoDTO.setFileId(fileInfoDO.getId());
+//            contentInfoDTO.setSenderEmail(emailParseInfoDO.getSenderEmail());
+//            contentInfoDTO.setEmailAddress(emailParseInfoDO.getEmail());
+//            contentInfoDTO.setEmailDate(emailDate);
+//            contentInfoDTO.setEmailTitle(emailParseInfoDO.getEmailTitle());
+//            contentInfoDTO.setParseDate(parseDate);
+//            contentInfoDTO.setFileName(fileInfoDO.getFileName());
+//            contentInfoDTO.setFilePath(fileInfoDO.getFilePath());
+//            Integer emailType = EmailUtil.getEmailTypeBySubject(emailParseInfoDO.getEmailTitle());
+//            contentInfoDTO.setEmailType(emailType);
+//            String emailContent = readHtmlFileContent(fileInfoDO.getFilePath());
+//            contentInfoDTO.setEmailContent(emailContent);
+////            contentInfoDTO.setAiFileId(fileInfoDO.getAiFileId());
+//            emailContentInfoDTOList.add(contentInfoDTO);
+//        }
+//        return emailContentInfoDTOList;
+//    }
 
-    public static String readHtmlFileContent(String filePath) {
-        if (StrUtil.isNotBlank(filePath) && filePath.endsWith("html")) {
-            StringBuilder content = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    // 追加每一行到StringBuilder中
-                    content.append(line).append("\n");
-                }
-            } catch (IOException e) {
-                System.err.println("Error reading the file: " + e.getMessage());
-                return null;
-            }
-            return content.toString();
-        }
-        return null;
-    }
+//    public static String readHtmlFileContent(String filePath) {
+//        if (StrUtil.isNotBlank(filePath) && filePath.endsWith("html")) {
+//            StringBuilder content = new StringBuilder();
+//            try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
+//                String line;
+//                while ((line = reader.readLine()) != null) {
+//                    // 追加每一行到StringBuilder中
+//                    content.append(line).append("\n");
+//                }
+//            } catch (IOException e) {
+//                System.err.println("Error reading the file: " + e.getMessage());
+//                return null;
+//            }
+//            return content.toString();
+//        }
+//        return null;
+//    }
 
 }

mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/ReportData.java

@@ -18,11 +18,6 @@ public abstract class ReportData implements Serializable {
     @Serial
     private static final long serialVersionUID = Constants.DEFAULT_SERIAL_ID;
     /**
-     * 报告路径
-     */
-    @Setter
-    private String reportPath;
-    /**
      * 报告基本信息
      */
     private final ReportBaseInfoDTO baseInfo;
@@ -35,11 +30,6 @@ public abstract class ReportData implements Serializable {
      */
     @Setter
     private Boolean aiParse;
-    /**
-     * ai解析时上传的文件的id（方便重复使用）
-     */
-    @Setter
-    private String aiFileId;
 
     public ReportData(ReportBaseInfoDTO baseInfo, ReportFundInfoDTO fundInfo) {
         this.baseInfo = baseInfo;

mo-daq/src/main/java/com/smppw/modaq/domain/entity/EmailFileInfoDO.java

@@ -35,10 +35,10 @@ public class EmailFileInfoDO {
      * 是否ai解析
      */
     private Boolean aiParse;
-    /**
-     * ai解析时上传的文件的id（方便重复使用）
-     */
-    private String aiFileId;
+//    /**
+//     * ai解析时上传的文件的id（方便重复使用）
+//     */
+//    private String aiFileId;
     /**
      * 当前报告解析状态
      */

mo-daq/src/main/java/com/smppw/modaq/domain/service/EmailParseService.java

@@ -343,7 +343,6 @@ public class EmailParseService {
             entity.setParseStatus(result.getStatus());
             entity.setFailReason(result.getMsg());
             entity.setAiParse(result.getData().getAiParse());
-            entity.setAiFileId(result.getData().getAiFileId());
             entityList.add(entity);
         }
         return entityList;
@@ -368,7 +367,6 @@ public class EmailParseService {
                 } catch (Exception ex) {
                     log.warn("报告{} 压缩包解压失败：{}", reportPath, ExceptionUtil.stacktraceToString(ex));
                     ReportData reportData = new ReportData.DefaultReportData();
-                    reportData.setReportPath(reportPath);
                     dataList.add(new ParseResult<>(ReportParseStatus.ARCHIVE_FAIL, reportData));
                 }
             } else {
@@ -525,7 +523,6 @@ public class EmailParseService {
             if (parseResult.getData() == null) {
                 parseResult.setData(new ReportData.DefaultReportData());
             }
-            parseResult.getData().setReportPath(zipFile.getFilepath());
             resultList.add(parseResult);
         }
     }
@@ -901,7 +898,7 @@ public class EmailParseService {
 
     private EmailFileInfoDO saveEmailFileInfo(Integer emailId, String fileName, String filePath) {
         EmailFileInfoDO emailFileInfoDO = buildEmailFileInfoDO(emailId, fileName, filePath);
-        emailFileInfoDO.setAiFileId(null);
+//        emailFileInfoDO.setAiFileId(null);
         if (emailFileInfoDO.getId() != null) {
             this.emailFileInfoMapper.updateTimeById(emailFileInfoDO.getId(), new Date());
             return emailFileInfoDO;