From fc6802f9cbc4766e6a5e9af8dcb4bee29d2b427c Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Tue, 1 Apr 2025 16:58:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=8B=E5=8A=A1=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/bgts/service/BgtsServiceImpl.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java b/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java index e04d57f..88470f7 100644 --- a/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/BgtsServiceImpl.java @@ -5,7 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.docus.bgts.entity.*; +import com.docus.bgts.entity.AfCollectAdd; +import com.docus.bgts.entity.AfCollectTask; +import com.docus.bgts.entity.MrReportError; +import com.docus.bgts.entity.TBasic; +import com.docus.bgts.entity.TSeal; import com.docus.bgts.enums.Codes; import com.docus.bgts.facade.IAfCollectTaskService; import com.docus.bgts.facade.IBgtsService; @@ -33,14 +37,21 @@ import org.dom4j.Element; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.io.ByteArrayInputStream; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadPoolExecutor; @@ -82,7 +93,6 @@ public class BgtsServiceImpl implements IBgtsService { private DownloadPlatformRpc downloadPlatformRpc; @Override - @Transactional(rollbackFor = Exception.class) public void collectSealIcu(String sealId) throws Exception { TSeal seal = getSealAndCheckBySealId(sealId); String jzh = seal.getJzh(); @@ -244,7 +254,6 @@ public class BgtsServiceImpl implements IBgtsService { } @Override - @Transactional(rollbackFor = Exception.class) public void collectSealEndoscopy(String sealId) throws Exception { String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid")); TSeal seal = getSealAndCheckBySealId(sealId); @@ -300,7 +309,6 @@ public class BgtsServiceImpl implements IBgtsService { } @Override - @Transactional(rollbackFor = Exception.class) public void collectSealPacs(String sealId) throws Exception{ TSeal seal = getSealAndCheckBySealId(sealId); @@ -345,7 +353,6 @@ public class BgtsServiceImpl implements IBgtsService { } @Override - @Transactional(rollbackFor = Exception.class) public void collectSealEcg(String sealId) throws Exception{ TSeal seal = getSealAndCheckBySealId(sealId); String jzh = seal.getJzh();