From 89e166f18d6e33efde0dda97f1fb27f29e675660 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 八月 2024 17:57:45 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 43b92ce..d6dd162 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,23 @@
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.domain.SvyLibTemplateVO;
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;
@@ -33,15 +39,37 @@
@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();
- List<SvyLibTemplate> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
- return getDataTable(list);
+ PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize());
+ List<SvyLibTemplateVO> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq);
+
+ 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);
}
//
@@ -70,11 +98,11 @@
@ApiOperation("鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�")
@PreAuthorize("@ss.hasPermi('system:script:list')")
@PostMapping("/saveOrUpdateTemplate")
- public AjaxResult saveOrUpdateTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
- if (ObjectUtils.isEmpty(svyLibTemplate)) {
+ public AjaxResult saveOrUpdateTemplate(@RequestBody SvyLibTemplateVO svyLibTemplateVO) {
+ if (ObjectUtils.isEmpty(svyLibTemplateVO)) {
throw new BaseException("鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
}
- return success(svyLibTemplateService.saveOrUpdateTemplate(svyLibTemplate));
+ return success(svyLibTemplateService.saveOrUpdateTemplate(svyLibTemplateVO));
}
/**
--
Gitblit v1.9.3