From 2be2f6c3e5b2be2bae1562423a9a4d29aa174aae Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 22 七月 2024 10:57:10 +0800 Subject: [PATCH] 工单阈值重构 --- ycl-server/src/main/java/com/ycl/platform/controller/YwThresholdController.java | 99 +++++++++++++++---------------------------------- 1 files changed, 30 insertions(+), 69 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwThresholdController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwThresholdController.java index 7a660a9..33197f8 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/YwThresholdController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwThresholdController.java @@ -2,33 +2,30 @@ import annotation.Log; import com.ycl.platform.domain.entity.YwThreshold; -import com.ycl.platform.domain.form.CarThresholdForm; -import com.ycl.platform.domain.form.FaceThresholdForm; -import com.ycl.platform.domain.form.VideoThresholdForm; import com.ycl.platform.service.IYwThresholdService; import com.ycl.system.AjaxResult; import com.ycl.system.controller.BaseController; -import com.ycl.system.domain.group.Update; import com.ycl.system.page.TableDataInfo; import com.ycl.utils.poi.ExcelUtil; import enumeration.BusinessType; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 杩愮淮闃堝�糃ontroller * * @author gonghl - * @date 2024-03-25 + * @date 2024-07-19 */ @RestController @RequestMapping("/threshold") -public class YwThresholdController extends BaseController { +public class YwThresholdController extends BaseController +{ @Autowired private IYwThresholdService ywThresholdService; @@ -37,22 +34,10 @@ */ @PreAuthorize("@ss.hasPermi('ycl:threshold:list')") @GetMapping("/list") - public TableDataInfo list(YwThreshold ywThreshold) { - startPage(); - List<YwThreshold> list = ywThresholdService.selectYwThresholdList(ywThreshold); - return getDataTable(list); - } - - /** - * 瀵煎嚭杩愮淮闃堝�煎垪琛� - */ - @PreAuthorize("@ss.hasPermi('ycl:threshold:export')") - @Log(title = "杩愮淮闃堝��", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, YwThreshold ywThreshold) { - List<YwThreshold> list = ywThresholdService.selectYwThresholdList(ywThreshold); - ExcelUtil<YwThreshold> util = new ExcelUtil<YwThreshold>(YwThreshold.class); - util.exportExcel(response, list, "杩愮淮闃堝�兼暟鎹�"); + public AjaxResult list(YwThreshold ywThreshold) + { + Map<String, List<YwThreshold>> map = ywThresholdService.selectYwThresholdList(ywThreshold); + return success(map); } /** @@ -60,65 +45,41 @@ */ @PreAuthorize("@ss.hasPermi('ycl:threshold:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Integer id) { + public AjaxResult getInfo(@PathVariable("id") Long id) + { return success(ywThresholdService.selectYwThresholdById(id)); } /** - * 鑾峰彇浜鸿劯閰嶇疆 + * 鏂板杩愮淮闃堝�� */ - // @PreAuthorize("@ss.hasPermi('ycl:threshold:query')") - @GetMapping(value = "/face/{id}") - public AjaxResult getFace(@PathVariable("id") Integer id) { - return success(ywThresholdService.getFace(id)); + @PreAuthorize("@ss.hasPermi('ycl:threshold:add')") + @Log(title = "杩愮淮闃堝��", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody YwThreshold ywThreshold) + { + return toAjax(ywThresholdService.insertYwThreshold(ywThreshold)); } /** - * 鑾峰彇杞﹁締閰嶇疆 - */ - // @PreAuthorize("@ss.hasPermi('ycl:threshold:query')") - @GetMapping(value = "/car/{id}") - public AjaxResult getCar(@PathVariable("id") Integer id) { - return success(ywThresholdService.getCar(id)); - } - - /** - * 鑾峰彇瑙嗛閰嶇疆 - */ - // @PreAuthorize("@ss.hasPermi('ycl:threshold:query')") - @GetMapping(value = "/video/{id}") - public AjaxResult getVideo(@PathVariable("id") Integer id) { - return success(ywThresholdService.getVideo(id)); - } - - /** - * 淇敼浜鸿劯闃堝�� + * 淇敼杩愮淮闃堝�� */ @PreAuthorize("@ss.hasPermi('ycl:threshold:edit')") - @Log(title = "淇敼浜鸿劯杩愮淮闃堝��", businessType = BusinessType.UPDATE) - @PutMapping("/face") - public AjaxResult editFace(@RequestBody @Validated FaceThresholdForm form) { - return toAjax(ywThresholdService.editFace(form)); + @Log(title = "杩愮淮闃堝��", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody List<YwThreshold> list) + { + return toAjax(ywThresholdService.updateYwThreshold(list)); } /** - * 淇敼杞﹁締闃堝�� + * 鍒犻櫎杩愮淮闃堝�� */ - @PreAuthorize("@ss.hasPermi('ycl:threshold:edit')") - @Log(title = "淇敼杞﹁締闃堝��", businessType = BusinessType.UPDATE) - @PutMapping("/car") - public AjaxResult editCar(@RequestBody @Validated CarThresholdForm form) { - return toAjax(ywThresholdService.editCar(form)); + @PreAuthorize("@ss.hasPermi('ycl:threshold:remove')") + @Log(title = "杩愮淮闃堝��", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(ywThresholdService.deleteYwThresholdByIds(ids)); } - - /** - * 淇敼瑙嗛闃堝�� - */ - @PreAuthorize("@ss.hasPermi('ycl:threshold:edit')") - @Log(title = "淇敼瑙嗛闃堝��", businessType = BusinessType.UPDATE) - @PutMapping("/video") - public AjaxResult editVideo(@RequestBody @Validated VideoThresholdForm form) { - return toAjax(ywThresholdService.editVideo(form)); - } - } -- Gitblit v1.8.0