From 0b99371d3e543532608e691e2bdfda3e65e1912c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 10:18:24 +0800
Subject: [PATCH] 工单取图片查询优化
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 180 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 62 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
index 749448a..21359bf 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -1,75 +1,131 @@
package com.ycl.platform.controller;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.CheckTemplateService;
-import com.ycl.system.Result;
-import com.ycl.platform.domain.form.CheckTemplateForm;
+import annotation.Log;
+import com.ycl.exception.job.TaskException;
+import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.entity.CheckTemplateRule;
import com.ycl.platform.domain.query.CheckTemplateQuery;
-import lombok.RequiredArgsConstructor;
+import com.ycl.platform.service.ICheckTemplateRuleService;
+import com.ycl.platform.service.ICheckTemplateService;
+import com.ycl.system.AjaxResult;
+import com.ycl.system.Result;
+import com.ycl.system.controller.BaseController;
+import com.ycl.system.page.TableDataInfo;
+import enumeration.BusinessType;
+import io.swagger.annotations.ApiOperation;
+import org.quartz.SchedulerException;
+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;
+
/**
- * 鑰冩牳妯℃澘 鍓嶇鎺у埗鍣�
+ * 鑰冩牳妯℃澘Controller
*
- * @author xp
- * @since 2024-03-06
+ * @author ruoyi
+ * @date 2024-04-01
*/
-@Validated
-@RequiredArgsConstructor
-@Api(value = "鑰冩牳妯℃澘", tags = "鑰冩牳妯℃澘绠＄悊")
@RestController
-@RequestMapping("/check-template")
-public class CheckTemplateController {
+@RequestMapping("/check/template")
+public class CheckTemplateController extends BaseController
+{
+ @Autowired
+ private ICheckTemplateService checkTemplateService;
- private final CheckTemplateService checkTemplateService;
-
- @PostMapping
- @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) CheckTemplateForm form) {
- return checkTemplateService.add(form);
- }
-
- @PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) CheckTemplateForm form) {
- return checkTemplateService.update(form);
- }
-
- @DeleteMapping("/{id}")
- @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
- public Result removeById(@PathVariable("id") String id) {
- return checkTemplateService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return checkTemplateService.remove(ids);
- }
-
- @PostMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(@RequestBody CheckTemplateQuery query) {
- return checkTemplateService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- public Result detail(@PathVariable("id") String id) {
- return checkTemplateService.detail(id);
- }
-
+ @Autowired
+ private ICheckTemplateRuleService checkTemplateRuleService;
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:list')")
@GetMapping("/list")
- @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- public Result list() {
- return checkTemplateService.all();
+ public TableDataInfo list(CheckTemplateQuery checkTemplateDTO)
+ {
+ startPage();
+ List<CheckTemplateQuery> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
+ return getDataTable(list);
}
+
+
+ /**
+ * 鑾峰彇鑰冩牳妯℃澘璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(checkTemplateService.selectCheckTemplateById(Integer.parseInt(id)));
+ }
+
+ /**
+ * 鏂板鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:add')")
+ @Log(title = "鏂板鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody @Validated CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+
+ return toAjax(checkTemplateService.insertCheckTemplate(checkTemplateDTO));
+ }
+
+ /**
+ * 澶嶅埗鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:copy')")
+ @Log(title = "澶嶅埗鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @PostMapping("/copy")
+ public AjaxResult copy(@RequestBody CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ return toAjax(checkTemplateService.copyCheckTemplate(checkTemplateDTO));
+ }
+
+ /**
+ * 淇敼鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:edit')")
+ @Log(title = "淇敼鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ return checkTemplateService.updateCheckTemplate(checkTemplateDTO);
+ }
+
+ /**
+ * 淇敼鑰冩牳妯℃澘鏉冮噸
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:edit')")
+ @Log(title = "淇敼鑰冩牳妯℃澘鏉冮噸", businessType = BusinessType.UPDATE)
+ @PutMapping("/weight")
+ public AjaxResult editWeight(@RequestBody CheckTemplateRule checkTemplateRule)
+ {
+
+ return toAjax(checkTemplateRuleService.updateCheckTemplateRule(checkTemplateRule));
+ }
+ /**
+ * 鍒犻櫎鑰冩牳妯℃澘
+ */
+ @PreAuthorize("@ss.hasPermi('check:template:remove')")
+ @Log(title = "鍒犻櫎鑰冩牳妯℃澘", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{id}")
+ public AjaxResult remove(@PathVariable String id) throws SchedulerException {
+ return toAjax(checkTemplateService.deleteCheckTemplateById(Integer.parseInt(id)));
+ }
+
+ @GetMapping("/pullList")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result pullList() {
+ return checkTemplateService.pullList();
+ }
+// /**
+// * 瀵煎嚭鑰冩牳妯℃澘鍒楄〃
+// */
+//// @PreAuthorize("@ss.hasPermi('system:template:export')")
+// @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, CheckTemplateQuery checkTemplateDTO)
+// {
+// List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
+// ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
+// util.exportExcel(response, list, "鑰冩牳妯℃澘鏁版嵁");
+// }
}
--
Gitblit v1.8.0