From 421bc0cbc4c4426b237eb62340d02e3439bc2e83 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Mon, 24 Feb 2025 18:08:24 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=BF=94=E5=9B=9E=E5=B9=82?=
 =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nanopart/ess/server/ess/EssService.java   | 25 +++++-------
 .../ess/server/mq/NanopartEssListener.java    | 38 -------------------
 2 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mq/NanopartEssListener.java

diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
index 4dfbc5ef..4b990c1d 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
@@ -197,30 +197,25 @@ public class EssService {
 
     @BizTransactional
     public void downloadContractPDF(EssContract contract, boolean retryDownload) {
-        EssContract reload = essContractDao.findForUpdateOrNull(contract.getEssContractId());
-        if (reload == null) {
-            log.warn("合同不存在, essContractId={}", contract.getEssContractId());
+        if (StringUtils.isNotBlank(contract.getOssFileKey()) && !retryDownload) {
+            log.info("合同已下载PDF, contract={}", contract);
             return;
         }
-        if (StringUtils.isNotBlank(reload.getOssFileKey()) && !retryDownload) {
-            log.info("合同已下载PDF, contract={}", reload);
-            return;
-        }
-        if (!shouldDownloadContractPDF(reload)) {
-            log.info("合同不需要下载PDF, contract={}", reload);
+        if (!shouldDownloadContractPDF(contract)) {
+            log.info("合同不需要下载PDF, contract={}", contract);
             return;
         }
         try {
-            String pdfUrl = getContractPDFUrlFromEss(reload);
-            String fileName = String.format("%s.pdf", reload.getContractName());
+            String pdfUrl = getContractPDFUrlFromEss(contract);
+            String fileName = String.format("%s.pdf", contract.getContractName());
             String fileKey = ossService.uploadToOss(pdfUrl, fileName);
-            essContractDao.setOssFileKey(reload, fileKey);
-            essLogDao.log("uploadContractToOss", reload.getEssContractId(),
+            essContractDao.setOssFileKey(contract, fileKey);
+            essLogDao.log("uploadContractToOss", contract.getEssContractId(),
                     "ossFileKey", fileKey, "forceDownload", retryDownload);
-            log.info("上传合同到OSS成功, essContractId={}", reload.getEssContractId());
+            log.info("上传合同到OSS成功, essContractId={}", contract.getEssContractId());
         } catch (Exception e) {
             log.warn("上传合同到OSS失败", e);
-            essLogDao.log(e, "uploadContractToOss", reload.getEssContractId());
+            essLogDao.log(e, "uploadContractToOss", contract.getEssContractId());
         }
     }
 
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mq/NanopartEssListener.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mq/NanopartEssListener.java
deleted file mode 100644
index 45e9ad6e..00000000
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mq/NanopartEssListener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.axzo.nanopart.ess.server.mq;
-
-import cn.axzo.framework.rocketmq.BaseListener;
-import cn.axzo.framework.rocketmq.EventConsumer;
-import com.alibaba.fastjson.JSON;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.spring.annotation.ConsumeMode;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @author yanglin
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-@RocketMQMessageListener(
-        maxReconsumeTimes = 3,
-        consumeMode = ConsumeMode.ORDERLY,
-        nameServer = "${rocketmq.name-server}",
-        topic = "topic_nanopart_${spring.profiles.active}",
-        consumerGroup = "ess_download_contract_pdf_${spring.application.name}_${spring.profiles.active}"
-)
-public class NanopartEssListener extends BaseListener
-        implements RocketMQListener<MessageExt> {
-
-    private final EventConsumer eventConsumer;
-
-    @Override
-    public void onMessage(MessageExt message) {
-        log.info("receive mq message: {}", JSON.toJSONString(message));
-        super.onEvent(message, eventConsumer);
-    }
-
-}
\ No newline at end of file