From a0bcee3aa22b79f592c44cdb3dcdbd681490f265 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 一月 2024 10:34:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
index d309d69..7a8f5b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
@@ -5,11 +5,12 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.smartor.domain.PatImportInfoVO;
-import com.smartor.domain.SvyLibTopicRes;
-import com.smartor.domain.SvyTopicReq;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
+import com.smartor.domain.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +25,6 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.smartor.domain.SvyLibTopic;
import com.smartor.service.ISvyLibTopicService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -36,7 +36,7 @@
* @author ruoyi
* @date 2023-03-03
*/
-@Api("闂嵎棰樼洰")
+@Api(description = "闂嵎棰樼洰")
@RestController
@RequestMapping("/smartor/svytopic")
public class SvyLibTopicController extends BaseController {
@@ -46,10 +46,11 @@
/**
* 鏌ヨ闂嵎棰樼洰鍒楄〃
*/
+ @ApiOperation("鏌ヨ闂嵎棰樼洰鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyLibTopic svyLibTopic) {
- startPage();
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody SvyLibTopic svyLibTopic) {
+ PageUtils.startPageByPost(svyLibTopic.getPageNum(), svyLibTopic.getPageSize());
List<SvyLibTopic> list = svyLibTopicService.selectSvyLibTopicList(svyLibTopic);
return getDataTable(list);
}
@@ -67,15 +68,15 @@
util.exportExcel(response, list, "闂嵎棰樼洰鏁版嵁");
}
- /**
- * 鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:svytopic:query')")
- @GetMapping(value = "/{topicid}")
- public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
- return success(svyLibTopicService.selectSvyLibTopicByTopicid(topicid));
- }
+// /**
+// * 鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅
+// */
+// @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅")
+// @PreAuthorize("@ss.hasPermi('smartor:svytopic:query')")
+// @GetMapping(value = "/getInfo/{topicid}")
+// public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
+// return success(svyLibTopicService.selectSvyLibTopicByTopicid(topicid));
+// }
/**
* 鏂板闂嵎棰樼洰
@@ -83,9 +84,22 @@
@ApiOperation("鏂板闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:add')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@RequestBody SvyLibTopic svyLibTopic) {
return toAjax(svyLibTopicService.insertSvyLibTopic(svyLibTopic));
+ }
+
+ /**
+ * 鏂板鎴栦慨鏀归棶鍗疯鎯呬俊鎭�
+ */
+ @ApiOperation("鏂板鎴栦慨鏀归棶鍗疯鎯呬俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:script:list')")
+ @PostMapping("/saveOrUpdateTopic")
+ public AjaxResult saveOrUpdateTopic(@RequestBody SvyLibTopic svyLibTopic) {
+ if (ObjectUtils.isEmpty(svyLibTopic)) {
+ throw new BaseException("鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+ }
+ return success(svyLibTopicService.saveOrUpdateTopic(svyLibTopic));
}
/**
@@ -94,7 +108,7 @@
@ApiOperation("淇敼闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:edit')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@RequestBody SvyLibTopic svyLibTopic) {
return toAjax(svyLibTopicService.updateSvyLibTopic(svyLibTopic));
}
@@ -105,43 +119,10 @@
@ApiOperation("鍒犻櫎闂嵎棰樼洰")
@PreAuthorize("@ss.hasPermi('smartor:svytopic:remove')")
@Log(title = "闂嵎棰樼洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{topicids}")
+ @GetMapping("/remove/{topicids}")
public AjaxResult remove(@PathVariable Long[] topicids) {
return toAjax(svyLibTopicService.deleteSvyLibTopicByTopicids(topicids));
}
-
- /**
- * 鎵归噺瀵煎叆闂鐩�
- */
- @ApiOperation("鎵归噺瀵煎叆闂棶棰樼洰")
- @PostMapping("/importLitTopic")
- public AjaxResult importLitTopic(MultipartFile multipartFile) {
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- return success(svyLibTopicService.importLitTopic(user, multipartFile));
- }
-
-
- /**
- * 瀵煎叆棰樼洰妯℃澘
- *
- * @param response
- */
- @ApiOperation("瀵煎叆棰樼洰妯℃澘")
- @PostMapping("/importLitTopicTemplate")
- public void importLitTopicTemplate(HttpServletResponse response) {
- ExcelUtil<SvyLibTopicRes> util = new ExcelUtil<SvyLibTopicRes>(SvyLibTopicRes.class);
- util.importTemplateExcel(response, "瀵煎叆棰樼洰");
- }
-
- /**
- * 鑾峰彇棰樼洰
- */
- @ApiOperation("鑾峰彇棰樼洰")
- @PostMapping("/showTopic")
- public AjaxResult showTopic(@RequestBody SvyTopicReq svyTopicReq) {
- return success(svyLibTopicService.showTopic(svyTopicReq));
- }
}
--
Gitblit v1.9.3