From fb81a13b9d9b0caee74b41086e446cef5827adc8 Mon Sep 17 00:00:00 2001
From: liuzongren <15011502566@163.com>
Date: Sun, 29 Sep 2024 17:19:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E7=9A=84=E6=96=B9=E6=B3=95,?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=85=A8=E9=87=8F=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AnalysisTaskServiceImpl.java      | 14 ++++++++++----
 .../composeanalysis/task/PorjectAnalysisTask.java  |  7 +++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java b/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java
index 9fde7bb..f61cd13 100644
--- a/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java
+++ b/src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java
@@ -2,6 +2,7 @@ package com.keyware.composeanalysis.service.impl;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.keyware.common.constant.RedisConst;
 import com.keyware.common.constant.enums.AnalysisStatusEnum;
@@ -69,8 +70,11 @@ public class AnalysisTaskServiceImpl extends ServiceImpl<AnalyzeTaskMapper, Anal
         retryGetDecompressionFlag(analysisTask);
 
         //开始分析前,将成分分析的状态为 进行中
-        analysisTask.setComposeFlag(AnalysisStatusEnum.ANALYSISING.getCode());
-        this.updateById(analysisTask);
+        LambdaUpdateWrapper<AnalysisTask> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(AnalysisTask::getId, analysisTask.getId())
+                .set(AnalysisTask::getComposeFlag, AnalysisStatusEnum.ANALYSISING.getCode());
+        this.update(null,updateWrapper);
+
         MongoTemplate mongoTemplate = new MongoTemplate(mongoClient, MongoDBConst.DB_NAME_PREFIX + analysisTask.getId());
         AnalysisLogUtil.insert(mongoTemplate, "【成分分析】开始:" + analysisTask.getFileName());
 
@@ -85,8 +89,10 @@ public class AnalysisTaskServiceImpl extends ServiceImpl<AnalyzeTaskMapper, Anal
         checkProjectIfOpen(mongoTemplate,analysisTask);
 
         //修改成分分析状态为完成
-        analysisTask.setComposeFlag(AnalysisStatusEnum.ANALYSIS_DONE.getCode());
-        this.updateById(analysisTask);
+        updateWrapper.set(AnalysisTask::getId, analysisTask.getId())
+                .set(AnalysisTask::getComposeFlag, AnalysisStatusEnum.ANALYSIS_DONE.getCode())
+        .set(AnalysisTask::getOpenType, analysisTask.getOpenType());
+        this.update(null,updateWrapper);
 
         //插入分析日志
         AnalysisLogUtil.insert(mongoTemplate,"【成分分析】已完成,耗时:"+ DateUtil.between(analysisTask.getAnalysisStartTime(),DateUtil.date(), DateUnit.SECOND) +"秒");
diff --git a/src/main/java/com/keyware/composeanalysis/task/PorjectAnalysisTask.java b/src/main/java/com/keyware/composeanalysis/task/PorjectAnalysisTask.java
index 8306735..4f72700 100644
--- a/src/main/java/com/keyware/composeanalysis/task/PorjectAnalysisTask.java
+++ b/src/main/java/com/keyware/composeanalysis/task/PorjectAnalysisTask.java
@@ -2,6 +2,7 @@ package com.keyware.composeanalysis.task;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Sets;
 import com.keyware.common.constant.enums.AnalysisStatusEnum;
 import com.keyware.composeanalysis.constant.FixedValue;
@@ -85,8 +86,10 @@ public class PorjectAnalysisTask {
         } catch (Exception e) {
             AnalysisLogUtil.insert(mongoTemplate, "成分分析失败:" + e.getStackTrace());
             log.error("项目级分析失败,项目名称:" + analysisTask.getFileName(), e);
-            analysisTask.setAnalysisStatus(AnalysisStatusEnum.FAIL_ANALYSIS.getCode());
-            analysisService.updateById(analysisTask);
+            LambdaUpdateWrapper<AnalysisTask> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(AnalysisTask::getId, analysisTask.getId())
+                    .set(AnalysisTask::getAnalysisStatus, AnalysisStatusEnum.FAIL_ANALYSIS.getCode());
+            analysisService.update(null,updateWrapper);
         }
     }