From 1c8b2be08e6c7655bab6d8a99f15b883768f0d38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 30 七月 2024 17:15:43 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
index cab5eea..de5a90d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -2,17 +2,22 @@
 
 import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
 import com.aliyun.teaopenapi.models.Config;
+import com.github.pagehelper.ISelect;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
+import com.smartor.domain.SvyLibScriptTag;
 import com.smartor.domain.SvyLibTemplate;
 import com.smartor.domain.SvyLibTemplateReq;
 import com.smartor.service.ISvyLibTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -28,20 +33,42 @@
  */
 @Api(description = "闂嵎妯℃澘")
 @RestController
-@RequestMapping("/smartor/svyTemplate")
+@RequestMapping("/smartor/svyLibTemplate")
 public class SvyLibTemplateController extends BaseController {
     @Autowired
     private ISvyLibTemplateService svyLibTemplateService;
 
+    @ApiOperation("鏌ヨ闂嵎鍒楄〃")
+    @GetMapping("/list")
+    public TableDataInfo selectSvyLibTemplatelist(SvyLibTemplate svyLibTemplate) {
+        startPage();
+        List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplate(svyLibTemplate);
+        return getDataTable(sviLibTemplate);
+    }
+
     /**
      * 鏌ヨ闂嵎鍒楄〃
      */
-    @ApiOperation("鏌ヨ闂嵎鍒楄〃璇︽儏")
+    @ApiOperation("鏌ヨ闂嵎璇︽儏")
     @PostMapping("/selectSvyLibTemplatelist")
     public TableDataInfo selectSvyLibTemplatelist(@RequestBody SvyLibTemplateReq svyLibTemplateReq) {
-        startPage();
+        PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize());
         List<SvyLibTemplate> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
-        return getDataTable(list);
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            //鑾峰彇total
+            long total = PageUtils.count(new ISelect() {
+                @Override
+                public void doSelect() {
+                    svyLibTemplateReq.setPageNum(null);
+                    svyLibTemplateReq.setPageSize(null);
+                    svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
+                }
+            });
+
+            return getDataTable2(total, list);
+        }
+        return getDataTable2(0, list);
     }
 
 //

--
Gitblit v1.9.3