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 1/4] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=AD=A3=E6=96=87=E5=9B=BE=E7=89=87=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=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 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(" Date: Tue, 4 Jun 2024 10:52:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=AD=A3=E6=96=87=E5=9B=BE=E7=89=87=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=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 --- .../impl/AgreementPortalServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 d2c5a98..eb44af8 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 @@ -219,12 +219,14 @@ public class AgreementPortalServiceImpl extends DefaultBaseService implements IA params.put("agreementType", agreementType); params.put("sendStatus", "published"); AgreementPortalDTO agreementDTO = agreementDao.getByType(params); - if(null != forPortal) { + if(null != forPortal && null != agreementDTO) { // System.out.println("-----" + newsDTO.getContent()); - String replacedText = agreementDTO.getContent().replaceAll(" Date: Tue, 4 Jun 2024 16:16:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AgreementPortalRouteController.java | 5 + .../templates/agreementportal/list.html | 21 ++++ .../agreementportal/view-agreement.html | 118 ++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 src/main/resources/templates/agreementportal/view-agreement.html diff --git a/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java b/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java index 6bcde9c..7e860eb 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java @@ -35,4 +35,9 @@ public class AgreementPortalRouteController extends DefaultBaseController { return new ModelAndView("agreementportal/list"); } + @GetMapping("view") + public ModelAndView view() { + return new ModelAndView("agreementportal/view-agreement"); + } + } \ No newline at end of file diff --git a/src/main/resources/templates/agreementportal/list.html b/src/main/resources/templates/agreementportal/list.html index 4529eb1..a82b5c7 100644 --- a/src/main/resources/templates/agreementportal/list.html +++ b/src/main/resources/templates/agreementportal/list.html @@ -123,6 +123,14 @@ return rowData; } }, + { + field: 'viewAgreement', fixed: 'right', width: 90, title: '预览', align: 'center', + templet: function (row) { + return '' + + ' 预览' + } + } /*, {field: 'isOpen', width: 180, title: '是否启用', align:'center', templet: function(row) { @@ -146,6 +154,19 @@ }); } + table.on('tool(dataTable)', function (obj) { + var data = obj.data; + // 添加说明 + if ('viewAgreement' == obj.event) { + viewAgreement(data); + } + }); + + function viewAgreement(data) { + var url = 'route/agreementportal/view?agreementId=' + data.agreementId; + window.open(url); + } + form.on('switch(switchEvent)', function () { let agreementportalId = $(this).attr("agreementportalId"); let checked = this.checked; diff --git a/src/main/resources/templates/agreementportal/view-agreement.html b/src/main/resources/templates/agreementportal/view-agreement.html new file mode 100644 index 0000000..493ddf6 --- /dev/null +++ b/src/main/resources/templates/agreementportal/view-agreement.html @@ -0,0 +1,118 @@ + + + + + + + + + + + + + 用户服务协议 + + + + +
+

+
+
+ + + + + + + + \ No newline at end of file From 3507a77e7660db53daa58fb30e57790ba9ac9742 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Tue, 4 Jun 2024 16:17:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/agreementportal/view-agreement.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/templates/agreementportal/view-agreement.html b/src/main/resources/templates/agreementportal/view-agreement.html index 493ddf6..4a5aa81 100644 --- a/src/main/resources/templates/agreementportal/view-agreement.html +++ b/src/main/resources/templates/agreementportal/view-agreement.html @@ -90,7 +90,6 @@ function initData() { var agreementId = getQueryParam('agreementId'); - alert(agreementId) var loadLayerIndex; restAjax.get(restAjax.path('api/agreementportal/get/{agreementId}', [agreementId]), {}, null, function(code, data) { const content = document.querySelector('#content')