From 97ea70f589c077a669bfe42355bc734a56834542 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Tue, 4 Jun 2024 10:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=AD=A3=E6=96=87=E5=9B=BE=E7=89=87=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/agreementportal/AgreementPortalController.java   | 2 +-
 .../agreementportal/AgreementPortalAppController.java    | 2 +-
 .../AgreementPortalResourceController.java               | 2 +-
 .../service/agreementportal/IAgreementPortalService.java | 2 +-
 .../agreementportal/impl/AgreementPortalServiceImpl.java | 9 ++++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java b/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java
index 28ec0a1..fc93ce5 100644
--- a/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java
+++ b/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java
@@ -109,7 +109,7 @@ public class AgreementPortalController extends DefaultBaseController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("getByType/{agreementType}")
     public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) {
-        return agreementService.getByType(agreementType);
+        return agreementService.getByType(agreementType, null);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java b/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java
index e461f00..9e6a422 100644
--- a/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java
+++ b/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java
@@ -123,7 +123,7 @@ public class AgreementPortalAppController extends DefaultBaseController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("getrelease/{agreementType}")
     public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) {
-        return agreementService.getByType(agreementType);
+        return agreementService.getByType(agreementType, "yes");
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java b/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java
index 27d3c75..71fd4df 100644
--- a/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java
+++ b/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java
@@ -123,7 +123,7 @@ public class AgreementPortalResourceController extends DefaultBaseController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("getByType/{agreementType}")
     public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) {
-        return agreementService.getByType(agreementType);
+        return agreementService.getByType(agreementType, null);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java b/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java
index 639d97f..ab3baa0 100644
--- a/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java
+++ b/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java
@@ -193,5 +193,5 @@ public interface IAgreementPortalService {
      * @param agreementType
      * @return
      */
-    AgreementPortalDTO getByType(String agreementType);
+    AgreementPortalDTO getByType(String agreementType, String forPortal);
 }
\ No newline at end of file
diff --git a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
index 22c6b86..d2c5a98 100644
--- a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
@@ -214,11 +214,18 @@ public class AgreementPortalServiceImpl extends DefaultBaseService implements IA
     }
 
     @Override
-    public AgreementPortalDTO getByType(String agreementType) {
+    public AgreementPortalDTO getByType(String agreementType, String forPortal) {
         Map<String, Object> params = new HashMap<>();
         params.put("agreementType", agreementType);
         params.put("sendStatus", "published");
         AgreementPortalDTO agreementDTO = agreementDao.getByType(params);
+        if(null != forPortal) {
+            // System.out.println("-----" + newsDTO.getContent());
+            String replacedText = agreementDTO.getContent().replaceAll("<img src=\"route/file(.*?)\"",
+                    "<img src=\"https://www.aimzhu.com/operator/route/file$1\"");
+            agreementDTO.setContent(replacedText);
+            // System.out.println("*****" + newsDTO.getContent());
+        }
         return agreementDTO;
     }