From ac79f032745c975eb77d6fb148ed390f2373559e Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 28 十二月 2023 17:58:52 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 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 f4cf9ec..0d3bc93 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,8 +5,11 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.base.BaseException; +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; @@ -21,7 +24,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; @@ -33,7 +35,7 @@ * @author ruoyi * @date 2023-03-03 */ -@Api("闂嵎棰樼洰") +@Api(description = "闂嵎棰樼洰") @RestController @RequestMapping("/smartor/svytopic") public class SvyLibTopicController extends BaseController { @@ -43,9 +45,10 @@ /** * 鏌ヨ闂嵎棰樼洰鍒楄〃 */ + @ApiOperation("鏌ヨ闂嵎棰樼洰鍒楄〃") @PreAuthorize("@ss.hasPermi('smartor:svytopic:list')") - @GetMapping("/list") - public TableDataInfo list(SvyLibTopic svyLibTopic) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody SvyLibTopic svyLibTopic) { startPage(); List<SvyLibTopic> list = svyLibTopicService.selectSvyLibTopicList(svyLibTopic); return getDataTable(list); @@ -69,7 +72,7 @@ */ @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅") @PreAuthorize("@ss.hasPermi('smartor:svytopic:query')") - @GetMapping(value = "/{topicid}") + @GetMapping(value = "/getInfo/{topicid}") public AjaxResult getInfo(@PathVariable("topicid") Long topicid) { return success(svyLibTopicService.selectSvyLibTopicByTopicid(topicid)); } @@ -80,9 +83,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)); } /** @@ -91,7 +107,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)); } @@ -102,22 +118,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)); - } } -- Gitblit v1.9.3