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/YwThresholdController.java | 188 +++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 64 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..10724b8 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
@@ -1,34 +1,42 @@
package com.ycl.platform.controller;
import annotation.Log;
+import com.ycl.platform.domain.entity.WorkOrderWhite;
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.domain.query.WorkOrderWhiteQuery;
import com.ycl.platform.service.IYwThresholdService;
import com.ycl.system.AjaxResult;
+import com.ycl.system.Result;
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 io.swagger.annotations.ApiOperation;
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.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
/**
* 杩愮淮闃堝�糃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 +45,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 +56,129 @@
*/
@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));
+ }
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ */
+ @PostMapping("/white/page")
+ @ApiOperation(value = "宸ュ崟鐧藉悕鍗曞垪琛�", notes = "宸ュ崟鐧藉悕鍗曞垪琛�")
+ public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery)
+ {
+ return ywThresholdService.selectWorkOrderWhiteList(workOrderWhiteQuery);
}
/**
- * 淇敼瑙嗛闃堝��
+ * 宸ュ崟鐧藉悕鍗曡鎯�
*/
- @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));
+ @GetMapping("/white/{id}")
+ @ApiOperation(value = "宸ュ崟鐧藉悕鍗曡鎯�", notes = "宸ュ崟鐧藉悕鍗曡鎯�")
+ public Result whiteDetail(@PathVariable Integer id)
+ {
+ return ywThresholdService.selectWorkOrderWhiteDetail(id);
+ }
+ /**
+ * 娣诲姞宸ュ崟鐧藉悕鍗�
+ *
+ * @param workOrderWhite 鐧借壊宸ュ崟
+ * @return {@link Result }
+ * @author
+ */
+ @PostMapping("/white/add")
+ @ApiOperation(value = "鏂板宸ュ崟鐧藉悕鍗�", notes = "鏂板宸ュ崟鐧藉悕鍗�")
+ public Result addWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) {
+ return ywThresholdService.addWorkOrderWhite(workOrderWhite);
}
+ /**
+ * 淇敼宸ュ崟鐧藉悕鍗�
+ *
+ * @param workOrderWhite 鐧借壊宸ュ崟
+ * @return {@link Result }
+ * @author
+ */
+ @PostMapping("/white/update")
+ @ApiOperation(value = "淇敼宸ュ崟鐧藉悕鍗�", notes = "淇敼宸ュ崟鐧藉悕鍗�")
+ public Result updateWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) {
+ return ywThresholdService.updateWorkOrderWhite(workOrderWhite);
+ }
+ /**
+ * 鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�
+ *
+ * @param ids ids
+ * @return {@link Result }
+ * @author
+ */
+ @DeleteMapping("/white/batchDelete")
+ @ApiOperation(value = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�", notes = "鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�")
+ public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) {
+ return ywThresholdService.batchDeleteWorkOrderWhite(ids);
+ }
+
+ /**
+ * 瀵煎嚭鐧藉悕鍗�
+ * @param response
+ * @throws IOException
+ */
+ @GetMapping("/white/export")
+ @ApiOperation(value = "瀵煎嚭鏁版嵁", notes = "瀵煎嚭鏁版嵁")
+ public void whiteExport(HttpServletResponse response) throws IOException {
+ ywThresholdService.whiteExport(response);
+ }
+ /**
+ * 瀵煎叆鐧藉悕鍗�
+ *
+ * @param file 鏂囦欢
+ * @return {@link Result }
+ * @author
+ */
+ @PostMapping("/import")
+ @ApiOperation(value = "瀵煎叆鐧藉悕鍗�", notes = "瀵煎叆鐧藉悕鍗�")
+ public Result importData(MultipartFile file) throws IOException, ParseException, ExecutionException, InterruptedException {
+ return ywThresholdService.importWhite(file);
+ }
+
+ /**
+ * 鏂板鐧藉悕鍗曟晠闅滅被鍨�
+ */
+ @PostMapping("/addBatch")
+ @ApiOperation(value = "鏂板鐧藉悕鍗曟晠闅滅被鍨�", notes = "鏂板鐧藉悕鍗曟晠闅滅被鍨�")
+ public Result addBatch(@RequestBody WorkOrderWhite addErrorForm) {
+ return ywThresholdService.addBatch(addErrorForm);
+ }
}
--
Gitblit v1.8.0