From 03ba9069e6f4b5a77b41e85da9aebfc675ca35ec Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Mon, 15 May 2023 10:11:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=96=E8=BE=91=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IReportContentServiceImpl.java   | 10 ++++++++--
 .../report/service/impl/IReportServiceImpl.java   |  3 ---
 .../impl/ITtReportManageActServiceImpl.java       | 15 ++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
index dac4d3f..bd326c1 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
@@ -70,8 +70,14 @@ public class IReportContentServiceImpl extends ServiceImpl<ReportContentDao, Rep
         //解析出内容
         String content = FileContentUtil.readFileContent(file);
         //将内容存入
-        ReportContentEntity reportContentEntity = new ReportContentEntity(UUID.randomUUID10(), reportId, content);
-        save(reportContentEntity);
+        ReportContentEntity reportContent = query().eq("report_id", reportId).one();
+        if (reportContent == null) {
+            ReportContentEntity reportContentEntity = new ReportContentEntity(UUID.randomUUID10(), reportId, content);
+            save(reportContentEntity);
+        } else {
+            reportContent.setReportContent(content);
+            saveOrUpdate(reportContent);
+        }
         //将文件删除
         outputStream.close();
         FileUtil.deleteFile(path);
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
index 5f7d0a4..e557c76 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
@@ -213,9 +213,6 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
                 });
             }
 
-            //插入报表内容表
-            iReportContentService.insertReportContent(entity.getId(), entity.getFileId());
-
             CommonUtils.threadPoolExecutor().execute(() -> {
                 //生成html
                 try {
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
index 0c932f4..31cd257 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
@@ -128,14 +128,6 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
 
     @Override
     public void saveOrUpdataReport(TtReportManageAct ttReportManageAct) {
-        //插入报表内容表
-        try {
-            iReportContentService.insertReportContent(ttReportManageAct.getDataId(), ttReportManageAct.getFileId());
-            log.info("抽取报告内容");
-        } catch (IOException e) {
-            log.error("获取报告内容失败", e);
-        }
-
         ReportEntity reportEntity = reportDao.selectById(ttReportManageAct.getDataId());
         if (reportEntity == null){
             //保存报告
@@ -147,6 +139,11 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
             reportEntity1.setId(ttReportManageAct.getDataId());
             reportDao.updateById(reportEntity);
         }
-
+        try {
+            iReportContentService.insertReportContent(ttReportManageAct.getDataId(), ttReportManageAct.getFileId());
+            log.info("抽取报告内容");
+        } catch (IOException e) {
+            log.error("获取报告内容失败", e);
+        }
     }
 }