From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 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..e23a3d9 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;
@@ -28,20 +34,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();
- 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);
}
//
@@ -49,39 +77,39 @@
// * 鑾峰彇闂嵎璇︾粏淇℃伅(鍗曡〃)
// */
// @ApiOperation("鑾峰彇闂嵎璇︾粏淇℃伅")
-// @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:query')")
+// //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:query')")
// @GetMapping(value = "/{svyid}")
// public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
// 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));
+// }
/**
* 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�
*/
@ApiOperation("鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:script:list')")
+ //@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));
}
/**
* 淇敼闂嵎
*/
@ApiOperation("淇敼闂嵎")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:edit')")
@Log(title = "闂嵎", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTemplate svyLibTemplate) {
@@ -92,7 +120,7 @@
* 鍒犻櫎闂嵎
*/
@ApiOperation("鍒犻櫎闂嵎")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
@Log(title = "闂嵎", businessType = BusinessType.DELETE)
@GetMapping("/remove/{svyids}")
public AjaxResult remove(@PathVariable Long[] svyids) {
@@ -103,7 +131,7 @@
* 鍙戦�佺煭淇�
*/
@ApiOperation("鍙戦�佺煭淇�")
- @PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:svyTemplate:remove')")
@Log(title = "闂嵎", businessType = BusinessType.DELETE)
@PostMapping("/sendMessage")
public AjaxResult sendMessage(@PathVariable Long[] svyids) {
--
Gitblit v1.9.3