From 52a0bf7637b725f0b6bf18a03962b0636f7074fb Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 22 十二月 2023 18:14:40 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 63 ++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java index c0ebcae..c0f7605 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java @@ -1,7 +1,8 @@ package com.ruoyi.web.controller.smartor; -import cn.hutool.db.Page; +import com.github.pagehelper.PageInfo; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -9,7 +10,11 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.domain.IvrLibaTarget; +import com.smartor.domain.IvrLibaTargetAssort; +import com.smartor.domain.IvrLibaTargetVO; import com.smartor.service.IIvrLibaTargetService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -23,6 +28,7 @@ * @author ruoyi * @date 2023-12-14 */ +@Api(description = "鎸囨爣搴�") @RestController @RequestMapping("/smartor/target") public class IvrLibaTargetController extends BaseController { @@ -32,19 +38,21 @@ /** * 鏌ヨ鎸囨爣閫夐」搴撳垪琛� */ + @ApiOperation("鏌ヨ鎸囨爣鍒楄〃") @PreAuthorize("@ss.hasPermi('system:target:list')") @PostMapping("/list") - public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) { - PageUtils.startPageByPost(ivrLibaTarget.getPageNum(),ivrLibaTarget.getPageSize()); + public TableDataInfo list(@RequestBody IvrLibaTarget ivrLibaTarget) { + PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize()); List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget); return getDataTable(list); } /** - * 瀵煎嚭鎸囨爣閫夐」搴撳垪琛� + * 瀵煎嚭鎸囨爣鍒楄〃 */ @PreAuthorize("@ss.hasPermi('system:target:export')") - @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT) + @Log(title = "鎸囨爣搴�", businessType = BusinessType.EXPORT) + @ApiOperation("瀵煎嚭鎸囨爣鍒楄〃") @PostMapping("/export") public void export(HttpServletResponse response, IvrLibaTarget ivrLibaTarget) { List<IvrLibaTarget> list = ivrLibaTargetService.selectIvrLibaTargetList(ivrLibaTarget); @@ -53,8 +61,9 @@ } /** - * 鑾峰彇鎸囨爣閫夐」搴撹缁嗕俊鎭� + * 鑾峰彇鎸囨爣淇℃伅閫氳繃targetID */ + @ApiOperation("鑾峰彇鎸囨爣淇℃伅閫氳繃targetID") @PreAuthorize("@ss.hasPermi('system:target:query')") @GetMapping(value = "/getInfo/{targetID}") public AjaxResult getInfo(@PathVariable("targetID") Long targetID) { @@ -62,32 +71,58 @@ } /** - * 鏂板鎸囨爣閫夐」搴� + * 鏂板鎸囨爣 */ @PreAuthorize("@ss.hasPermi('system:target:add')") @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT) + @ApiOperation("鏂板鎸囨爣锛堣繖涓帴鍙f病鍟ョ敤浜嗭紝鐢ㄢ�濇柊澧炴垨淇敼鎸囨爣淇℃伅鈥滆繖涓帴鍙eソ涓�浜涳級") @PostMapping("/add") - public AjaxResult add(@RequestBody IvrLibaTarget ivrLibaTarget) { - return toAjax(ivrLibaTargetService.insertIvrLibaTarget(ivrLibaTarget)); + public AjaxResult add(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) { + return toAjax(ivrLibaTargetService.insertIvrLibaTarget(ivrLibaTargetVO)); } /** - * 淇敼鎸囨爣閫夐」搴� + * 鏂板鎴栦慨鏀规寚鏍囦俊鎭� */ + @ApiOperation("鏂板鎴栦慨鏀规寚鏍囦俊鎭�") @PreAuthorize("@ss.hasPermi('system:target:edit')") @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - public AjaxResult edit(@RequestBody IvrLibaTarget ivrLibaTarget) { - return toAjax(ivrLibaTargetService.updateIvrLibaTarget(ivrLibaTarget)); + @PostMapping("/saveOrupdateIvrLibaTarget") + public AjaxResult saveOrupdateIvrLibaTarget(@RequestBody IvrLibaTargetVO ivrLibaTargetVO) { + return toAjax(ivrLibaTargetService.saveOrupdateIvrLibaTarget(ivrLibaTargetVO)); } /** - * 鍒犻櫎鎸囨爣閫夐」搴� + * 鍒犻櫎鎸囨爣 */ + @ApiOperation("鍒犻櫎鎸囨爣") @PreAuthorize("@ss.hasPermi('system:target:remove')") @Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE) @GetMapping("/remove/{targetIDs}") public AjaxResult remove(@PathVariable Long[] targetIDs) { return toAjax(ivrLibaTargetService.deleteIvrLibaTargetByTargetIDs(targetIDs)); } + + /** + * 鏌ヨ鎸囨爣閫夐」搴撳垪琛� + */ + @ApiOperation("鏌ヨ鎸囨爣鍜屽叧鑱旂殑鎸囨爣閫夐」") + @PreAuthorize("@ss.hasPermi('system:target:list')") + @PostMapping("/targetInfo") + public TableDataInfo targetInfo(@RequestBody IvrLibaTarget ivrLibaTarget) { + PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize()); + //杩欎釜鐢ㄦ潵鑾峰彇鍒嗛〉鏁版嵁 + List<IvrLibaTargetVO> ivrLibaTargetVOS = ivrLibaTargetService.targetInfo(ivrLibaTarget); + + //鐢ㄤ簬鍒嗛〉 + List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetService.selectIvrLibaTargetList(null); + //鍒嗛〉 + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("鏌ヨ鎴愬姛"); + rspData.setRows(ivrLibaTargetVOS); + rspData.setTotal(new PageInfo(ivrLibaTargets).getTotal()); + + return rspData; + } } -- Gitblit v1.9.3