From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 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 2ec9af4..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,16 +1,22 @@
package com.ycl.platform.controller;
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 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 com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
-import jakarta.servlet.http.HttpServletResponse;
+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;
@@ -28,71 +34,98 @@
@Autowired
private ICheckTemplateService checkTemplateService;
+ @Autowired
+ private ICheckTemplateRuleService checkTemplateRuleService;
/**
* 鏌ヨ鑰冩牳妯℃澘鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:template:list')")
+ @PreAuthorize("@ss.hasPermi('check:template:list')")
@GetMapping("/list")
- public TableDataInfo list(CheckTemplate checkTemplate)
+ public TableDataInfo list(CheckTemplateQuery checkTemplateDTO)
{
startPage();
- List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
+ List<CheckTemplateQuery> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
return getDataTable(list);
}
- /**
- * 瀵煎嚭鑰冩牳妯℃澘鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:template:export')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, CheckTemplate checkTemplate)
- {
- List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
- ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
- util.exportExcel(response, list, "鑰冩牳妯℃澘鏁版嵁");
- }
/**
* 鑾峰彇鑰冩牳妯℃澘璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('system:template:query')")
+ @PreAuthorize("@ss.hasPermi('check:template:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
- return success(checkTemplateService.selectCheckTemplateById(id));
+ return success(checkTemplateService.selectCheckTemplateById(Integer.parseInt(id)));
}
/**
* 鏂板鑰冩牳妯℃澘
*/
- @PreAuthorize("@ss.hasPermi('system:template:add')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
+ @PreAuthorize("@ss.hasPermi('check:template:add')")
+ @Log(title = "鏂板鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody CheckTemplate checkTemplate)
- {
- return toAjax(checkTemplateService.insertCheckTemplate(checkTemplate));
+ 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('system:template:edit')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
+ @PreAuthorize("@ss.hasPermi('check:template:edit')")
+ @Log(title = "淇敼鑰冩牳妯℃澘", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody CheckTemplate checkTemplate)
- {
- return toAjax(checkTemplateService.updateCheckTemplate(checkTemplate));
+ 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('system:template:remove')")
- @Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(checkTemplateService.deleteCheckTemplateByIds(ids));
+ @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