From 0c9ec42a824aa3242fe1e1b8ce372947f2bc9a03 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 17:43:06 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 aad703f..7149c53 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,20 @@
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.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.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,7 +31,7 @@
*/
@Api(description = "闂嵎妯℃澘")
@RestController
-@RequestMapping("/smartor/svyTemplate")
+@RequestMapping("/smartor/svyLibTemplate")
public class SvyLibTemplateController extends BaseController {
@Autowired
private ISvyLibTemplateService svyLibTemplateService;
@@ -39,9 +42,23 @@
@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);
}
//
@@ -55,14 +72,14 @@
// return success(svyLibTemplateService.selectSvyLibTemplateBySvyid(svyid));
// }
- /**
- * 鏂板闂嵎
- */
- @ApiOperation("鏂板闂嵎")
- @PostMapping("/addSvyLibTemplate")
- public AjaxResult addSvyLibTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
- return toAjax(svyLibTemplateService.insertSvyLibTemplate(svyLibTemplate));
- }
+// /**
+// * 鏂板闂嵎
+// */
+// @ApiOperation("鏂板闂嵎")
+// @PostMapping("/addSvyLibTemplate")
+// public AjaxResult addSvyLibTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
+// return toAjax(svyLibTemplateService.insertSvyLibTemplate(svyLibTemplate));
+// }
/**
* 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�
--
Gitblit v1.9.3