From afb277a81e060c6275f11e9f9f102b5dcfd80a72 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 27 六月 2024 09:46:05 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java index f5e8108..f72d878 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java @@ -7,11 +7,11 @@ import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.smartor.domain.IvrTaskVO; -import com.smartor.domain.SvyTaskSingle; -import com.smartor.domain.SvyTaskVO; +import com.smartor.domain.*; import com.smartor.service.ISvyTaskSingleService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -26,6 +26,7 @@ * @author ruoyi * @date 2024-06-12 */ +@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級") @RestController @RequestMapping("/smartor/svysingle") public class SvyTaskSingleController extends BaseController { @@ -35,6 +36,7 @@ /** * 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃 */ + @ApiOperation("鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃") @PreAuthorize("@ss.hasPermi('system:single:list')") @GetMapping("/list") public TableDataInfo list(SvyTaskSingle svyTaskSingle) { @@ -46,6 +48,7 @@ /** * 瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃 */ + @ApiOperation("瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃") @PreAuthorize("@ss.hasPermi('system:single:export')") @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -58,8 +61,9 @@ /** * 鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅 */ + @ApiOperation("鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅") @PreAuthorize("@ss.hasPermi('system:single:query')") - @GetMapping(value = "/{id}") + @GetMapping(value = "/getInfo/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(svyTaskSingleService.selectSvyTaskSingleById(id)); } @@ -67,9 +71,10 @@ /** * 鏂板鍗曚竴浠诲姟锛堥棶鍗凤級 */ + @ApiOperation("鏂板鍗曚竴浠诲姟锛堥棶鍗凤級") @PreAuthorize("@ss.hasPermi('system:single:add')") @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody SvyTaskSingle svyTaskSingle) { return toAjax(svyTaskSingleService.insertSvyTaskSingle(svyTaskSingle)); } @@ -77,9 +82,10 @@ /** * 淇敼鍗曚竴浠诲姟锛堥棶鍗凤級 */ + @ApiOperation("淇敼鍗曚竴浠诲姟锛堥棶鍗凤級") @PreAuthorize("@ss.hasPermi('system:single:edit')") @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.UPDATE) - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@RequestBody SvyTaskSingle svyTaskSingle) { return toAjax(svyTaskSingleService.updateSvyTaskSingle(svyTaskSingle)); } @@ -87,9 +93,10 @@ /** * 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級 */ + @ApiOperation(" 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級") @PreAuthorize("@ss.hasPermi('system:single:remove')") @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @GetMapping("/remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(svyTaskSingleService.deleteSvyTaskSingleByIds(ids)); } @@ -101,10 +108,21 @@ @PreAuthorize("@ss.hasPermi('system:task:add')") @PostMapping("/insertOrUpdateSvyTask") public AjaxResult insertOrUpdateSvyTask(@RequestBody SvyTaskVO svyTaskVO) { - LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); svyTaskVO.setCreateBy(user.getNickName()); return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(svyTaskVO)); } + + /** + * 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅 + */ + @ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅") + @PostMapping("/queryTaskByCondition") + public AjaxResult queryTaskByCondition(@RequestBody SvyTaskSingleVO svyTaskSingleVO) { + //鏍规嵁鍏ュ弬鏌ヨ淇℃伅 + SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, SvyTaskSingle.class); + SvyTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(svyTaskSingle); + return success(svyTaskVO); + } } -- Gitblit v1.9.3