From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，

---
 ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
index f3dc788..995bad3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
@@ -2,8 +2,9 @@
 
 import com.ycl.system.Result;
 import com.ycl.system.domain.group.Add;
-import com.ycl.system.domain.group.Update;
+import constant.TableNameConstants;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.RequiredArgsConstructor;
@@ -12,8 +13,9 @@
 import io.swagger.annotations.ApiOperation;
 import com.ycl.platform.service.DynamicColumnService;
 import com.ycl.platform.domain.form.DynamicColumnForm;
-import com.ycl.platform.domain.query.DynamicColumnQuery;
 import org.springframework.web.bind.annotation.*;
+
+import static constant.TableNameConstants.COLUMN_NAME_VIDEO;
 
 /**
  * 鍔ㄦ�佸垪 鍓嶇鎺у埗鍣�
@@ -39,43 +41,60 @@
 
     @PutMapping
     @ApiOperation(value = "淇敼", notes = "淇敼")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:edit')")
-    public Result update(@RequestBody @Validated(Update.class) DynamicColumnForm form) {
-        return dynamicColumnService.update(form);
+    public Result update(@RequestBody @NotEmpty(message = "鏁版嵁涓虹┖锛屾棤娉曚繚瀛�") List<DynamicColumnForm> columnList) {
+        return dynamicColumnService.update(columnList);
     }
 
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:del')")
     public Result removeById(@PathVariable("id") String id) {
         return dynamicColumnService.removeById(id);
     }
 
-    @DeleteMapping("/batch")
-    @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:del:batch')")
-    public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
-        return dynamicColumnService.remove(ids);
-    }
-
-    @GetMapping("/page")
-    @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:page')")
-    public Result page(DynamicColumnQuery query) {
-        return dynamicColumnService.page(query);
-    }
-
-    @GetMapping("/{id}")
-    @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:detail')")
-    public Result detail(@PathVariable("id") Integer id) {
-        return dynamicColumnService.detail(id);
-    }
-
     @GetMapping("/list")
-    @PreAuthorize("@ss.hasPermi('dynamicColumn:list')")
     @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
     public Result list() {
         return dynamicColumnService.all();
     }
+
+    @GetMapping("/listByTableName")
+    @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+    public Result listByTableName(@RequestParam @NotNull(message = "璺緞鍚嶄笉鑳戒负绌�")String pathName) {
+        String tableName = getTableNameByPathNane(pathName);
+        return dynamicColumnService.allByTableName(tableName);
+    }
+
+    @PostMapping("/addByTableName")
+    @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:add')")
+    public Result addByTableName(@RequestParam @NotNull(message = "璺緞鍚嶄笉鑳戒负绌�")String pathName,@RequestBody @Validated(Add.class) DynamicColumnForm form){
+        String tableName = getTableNameByPathNane(pathName);
+        return dynamicColumnService.addByTableName(tableName,form);
+    }
+
+
+
+    @PutMapping("/updateByTableName")
+    @ApiOperation(value = "淇敼", notes = "淇敼")
+    public Result updateByTableName(@RequestParam @NotNull(message = "璺緞鍚嶄笉鑳戒负绌�")String pathName, @RequestBody @NotEmpty(message = "鏁版嵁涓虹┖锛屾棤娉曚繚瀛�") List<DynamicColumnForm> columnList){
+        String tableName = getTableNameByPathNane(pathName);
+        if ("".equals(tableName)){
+            return null;
+        }
+        return dynamicColumnService.updateByTableName(tableName,columnList);
+    }
+
+    private String getTableNameByPathNane(String pathName) {
+        String tableName = "";
+        if ("褰曞儚鍙敤鐜�".equals(pathName)){
+            tableName = TableNameConstants.COLUMN_NAME_VIDEO;
+        }else if("杞﹁締鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+            tableName = TableNameConstants.COLUMN_NAME_CAR_POINT;
+        }else if("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+            tableName = TableNameConstants.COLUMN_NAME_FACE_POINT;
+        }else if("瑙嗛鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+            tableName = TableNameConstants.COLUMN_NAME_VIDEO_POINT;
+        }
+        return tableName;
+    }
 }

--
Gitblit v1.8.0