From d8a62fdbbd0ecc4cb4ab41fc83ec81bc7e4c4bdc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 11:33:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java    |   81 +++++++
 ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml                    |   46 ++++
 ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java              |    8 
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java            |    1 
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java                 |   10 
 ycl-server/src/main/java/com/ycl/platform/mapper/DynamicColumnMapper.java            |   34 +++
 ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java |  119 ++++++++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java                    |    6 
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DynamicColumn.java             |   38 +++
 ycl-server/src/main/java/com/ycl/platform/service/DynamicColumnService.java          |   66 ++++++
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java      |   12 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/form/DynamicColumnForm.java           |   50 ++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/DynamicColumnQuery.java         |   17 +
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DynamicColumnVO.java               |   38 +++
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                         |   87 +++++++
 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java       |   42 ++-
 16 files changed, 636 insertions(+), 19 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DynamicColumn.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DynamicColumn.java
new file mode 100644
index 0000000..f47c0f1
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DynamicColumn.java
@@ -0,0 +1,38 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.ycl.platform.base.AbsEntity;
+import lombok.Data;
+
+/**
+ * 鍔ㄦ�佸垪
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Data
+@TableName("t_dynamic_column")
+public class DynamicColumn extends AbsEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("ref_id")
+    /** 鍏宠仈涓�鏈轰竴妗d */
+    private Integer refId;
+
+    @TableField("prop_name")
+    /** elementui table prop */
+    private String propName;
+
+    @TableField("label_value")
+    /** elementui table label */
+    private String labelValue;
+
+    @TableField("field_value")
+    /** 鍊� */
+    private String fieldValue;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DynamicColumnForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DynamicColumnForm.java
new file mode 100644
index 0000000..79e1e5d
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DynamicColumnForm.java
@@ -0,0 +1,50 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.DynamicColumn;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 鍔ㄦ�佸垪琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Data
+@ApiModel(value = "DynamicColumn琛ㄥ崟", description = "鍔ㄦ�佸垪琛ㄥ崟")
+public class DynamicColumnForm extends AbsForm {
+
+    @NotNull(message = "鍏宠仈涓�鏈轰竴妗d涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("鍏宠仈涓�鏈轰竴妗d")
+    private Integer refId;
+
+    @NotBlank(message = "elementui table prop涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("elementui table prop")
+    private String propName;
+
+    @NotBlank(message = "elementui table label涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("elementui table label")
+    private String labelValue;
+
+    @NotBlank(message = "鍊间笉鑳戒负绌�", groups = {Add.class, Update.class})
+    @ApiModelProperty("鍊�")
+    private String fieldValue;
+
+    public static DynamicColumn getEntityByForm(@NonNull DynamicColumnForm form, DynamicColumn entity) {
+        if(entity == null) {
+          entity = new DynamicColumn();
+        }
+        BeanUtils.copyProperties(form, entity);
+        return entity;
+    }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
index 8c6054e..b813bbe 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
@@ -23,4 +23,5 @@
     /** 鍏抽敭璇� */
     private String keyword;
 
+
 }
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DynamicColumnQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DynamicColumnQuery.java
new file mode 100644
index 0000000..495c3ca
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DynamicColumnQuery.java
@@ -0,0 +1,17 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 鍔ㄦ�佸垪鏌ヨ
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Data
+@ApiModel(value = "DynamicColumn鏌ヨ", description = "鍔ㄦ�佸垪鏌ヨ")
+public class DynamicColumnQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DynamicColumnVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DynamicColumnVO.java
new file mode 100644
index 0000000..0836853
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DynamicColumnVO.java
@@ -0,0 +1,38 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.DynamicColumn;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import lombok.Data;
+
+/**
+ * 鍔ㄦ�佸垪灞曠ず
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Data
+public class DynamicColumnVO extends AbsVo {
+
+    /** 鍏宠仈涓�鏈轰竴妗d */
+    private Integer refId;
+
+    /** elementui table prop */
+    private String propName;
+
+    /** elementui table label */
+    private String labelValue;
+
+    /** 鍊� */
+    private String fieldValue;
+
+    public static DynamicColumnVO getVoByEntity(@NonNull DynamicColumn entity, DynamicColumnVO vo) {
+        if(vo == null) {
+            vo = new DynamicColumnVO();
+        }
+        BeanUtils.copyProperties(entity, vo);
+        return vo;
+    }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
index fa83f24..a916997 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -219,4 +220,9 @@
 
     private Long deptId;
     private String deptName;
+
+    /**
+     * 鍔ㄦ�佸垪
+     */
+    private List<DynamicColumnVO> dynamicColumnList;
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index 1a57746..a2ddb0d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -1,8 +1,8 @@
 package com.ycl.platform.controller;
 
 import com.ycl.platform.domain.query.DataCenterQuery;
-import com.ycl.platform.domain.query.PlatformOnlineQuery;
 import com.ycl.platform.service.DataCenterService;
+import com.ycl.platform.service.ITMonitorService;
 import com.ycl.platform.service.PlatformOnlineService;
 import com.ycl.system.Result;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,20 @@
 
     private final DataCenterService dataCenterService;
     private final PlatformOnlineService platformOnlineService;
+    private final ITMonitorService monitorService;
+
+    /**
+     * 璧勪骇绠＄悊
+     *
+     * @param query
+     * @return
+     */
+    @GetMapping("/assetManagement")
+    @ApiOperation(value = "璧勪骇绠＄悊", notes = "璧勪骇绠＄悊")
+    @PreAuthorize("hasAuthority('assetManagement:page')")
+    public Result assetManagement(DataCenterQuery query) {
+        return monitorService.assetManagement(query);
+    }
 
     /**
      * 骞冲彴鍦ㄧ嚎鐜�
@@ -172,9 +186,6 @@
     }
 
 
-
-
-
     /**
      * 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
      *
@@ -286,13 +297,6 @@
     }
 
 
-
-
-
-
-
-
-
     /**
      * 浜鸿劯锛氳鍥惧簱瀵规帴绋冲畾鎬�
      *
@@ -301,7 +305,7 @@
      */
     @GetMapping("/faceViewDockStable")
     public Result faceViewDockStable(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceViewDockStable(query));
+        return (dataCenterService.faceViewDockStable(query));
     }
 
     /**
@@ -312,7 +316,7 @@
      */
     @GetMapping("/facePointOnlineRate")
     public Result facePointOnlineRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.facePointOnlineRate(query));
+        return (dataCenterService.facePointOnlineRate(query));
     }
 
     /**
@@ -323,7 +327,7 @@
      */
     @GetMapping("/faceDirectoryConsistency")
     public Result faceDirectoryConsistency(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceDirectoryConsistency(query));
+        return (dataCenterService.faceDirectoryConsistency(query));
     }
 
     /**
@@ -334,7 +338,7 @@
      */
     @GetMapping("/faceCollectionConsistency")
     public Result faceCollectionConsistency(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceCollectionConsistency(query));
+        return (dataCenterService.faceCollectionConsistency(query));
     }
 
     /**
@@ -345,7 +349,7 @@
      */
     @GetMapping("/faceImgQualification")
     public Result faceImgQualification(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceImgQualification(query));
+        return (dataCenterService.faceImgQualification(query));
     }
 
     /**
@@ -356,7 +360,7 @@
      */
     @GetMapping("/faceCapturesImagesAccuracy")
     public Result faceCapturesImagesAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceCapturesImagesAccuracy(query));
+        return (dataCenterService.faceCapturesImagesAccuracy(query));
     }
 
     /**
@@ -367,7 +371,7 @@
      */
     @GetMapping("/faceTimelyUpload")
     public Result faceTimelyUpload(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceTimelyUpload(query));
+        return (dataCenterService.faceTimelyUpload(query));
     }
 
     /**
@@ -378,6 +382,6 @@
      */
     @GetMapping("/faceAvailabilityOfLargeImg")
     public Result faceAvailabilityOfLargeImg(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.faceAvailabilityOfLargeImg(query));
+        return (dataCenterService.faceAvailabilityOfLargeImg(query));
     }
 }
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
new file mode 100644
index 0000000..f96abd4
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
@@ -0,0 +1,81 @@
+package com.ycl.platform.controller;
+
+import com.ycl.system.Result;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
+import jakarta.validation.constraints.NotEmpty;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import io.swagger.annotations.Api;
+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.*;
+
+/**
+ * 鍔ㄦ�佸垪 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "鍔ㄦ�佸垪", tags = "鍔ㄦ�佸垪绠＄悊")
+@RestController
+@RequestMapping("/api/dynamic-column")
+public class DynamicColumnController {
+
+    private final DynamicColumnService dynamicColumnService;
+
+    @PostMapping
+    @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+    @PreAuthorize("hasAuthority('dynamicColumn:add')")
+    public Result add(@RequestBody @Validated(Add.class) DynamicColumnForm form) {
+        return dynamicColumnService.add(form);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "淇敼", notes = "淇敼")
+    @PreAuthorize("hasAuthority('dynamicColumn:edit')")
+    public Result update(@RequestBody @Validated(Update.class) DynamicColumnForm form) {
+        return dynamicColumnService.update(form);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+    @PreAuthorize("hasAuthority('dynamicColumn:del')")
+    public Result removeById(@PathVariable("id") String id) {
+        return dynamicColumnService.removeById(id);
+    }
+
+    @DeleteMapping("/batch")
+    @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+    @PreAuthorize("hasAuthority('dynamicColumn:del:batch')")
+    public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+        return dynamicColumnService.remove(ids);
+    }
+
+    @GetMapping("/page")
+    @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+    @PreAuthorize("hasAuthority('dynamicColumn:page')")
+    public Result page(DynamicColumnQuery query) {
+        return dynamicColumnService.page(query);
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+    @PreAuthorize("hasAuthority('dynamicColumn:detail')")
+    public Result detail(@PathVariable("id") Integer id) {
+        return dynamicColumnService.detail(id);
+    }
+
+    @GetMapping("/list")
+    @PreAuthorize("hasAuthority('dynamicColumn:list')")
+    @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+    public Result list() {
+        return dynamicColumnService.all();
+    }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DynamicColumnMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DynamicColumnMapper.java
new file mode 100644
index 0000000..e7e3a8d
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DynamicColumnMapper.java
@@ -0,0 +1,34 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DynamicColumn;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.query.DynamicColumnQuery;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
+import com.ycl.platform.domain.form.DynamicColumnForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 鍔ㄦ�佸垪 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Mapper
+public interface DynamicColumnMapper extends BaseMapper<DynamicColumn> {
+
+    /**
+     * id鏌ユ壘鍔ㄦ�佸垪
+     * @param id
+     * @return
+     */
+    DynamicColumnVO getById(Integer id);
+
+    /**
+    *  鍒嗛〉
+    */
+    IPage getPage(IPage page, @Param("query") DynamicColumnQuery query);
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 12ae867..922d206 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -1,12 +1,15 @@
 package com.ycl.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.query.HomeQuery;
 import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.domain.vo.screen.MonitorRateVO;
 import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -116,4 +119,11 @@
      */
     List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery);
 
+    /**
+     * 鏁版嵁涓績-璧勪骇绠＄悊
+     *
+     * @param page
+     * @param query
+     */
+    void assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DynamicColumnService.java b/ycl-server/src/main/java/com/ycl/platform/service/DynamicColumnService.java
new file mode 100644
index 0000000..56976d9
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DynamicColumnService.java
@@ -0,0 +1,66 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DynamicColumn;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.form.DynamicColumnForm;
+import com.ycl.platform.domain.query.DynamicColumnQuery;
+import com.ycl.system.Result;
+
+import java.util.List;
+
+/**
+ * 鍔ㄦ�佸垪 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+public interface DynamicColumnService extends IService<DynamicColumn> {
+
+    /**
+     * 娣诲姞
+     * @param form
+     * @return
+     */
+    Result add(DynamicColumnForm form);
+
+    /**
+     * 淇敼
+     * @param form
+     * @return
+     */
+    Result update(DynamicColumnForm form);
+
+    /**
+     * 鎵归噺鍒犻櫎
+     * @param ids
+     * @return
+     */
+    Result remove(List<String> ids);
+
+    /**
+     * id鍒犻櫎
+     * @param id
+     * @return
+     */
+    Result removeById(String id);
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     * @param query
+     * @return
+     */
+    Result page(DynamicColumnQuery query);
+
+    /**
+     * 鏍规嵁id鏌ユ壘
+     * @param id
+     * @return
+     */
+    Result detail(Integer id);
+
+    /**
+     * 鍒楄〃
+     * @return
+     */
+    Result all();
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index 16a323d..d0246df 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -3,10 +3,12 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.query.HomeQuery;
 import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.domain.vo.screen.MonitorRateVO;
 import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
+import com.ycl.system.Result;
 
 import java.util.List;
 import java.util.Map;
@@ -101,4 +103,10 @@
      */
     List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery);
 
+    /**
+     * 璧勪骇绠＄悊
+     * @param query
+     * @return
+     */
+    Result assetManagement(DataCenterQuery query);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java
new file mode 100644
index 0000000..14047f0
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java
@@ -0,0 +1,119 @@
+package com.ycl.platform.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.platform.domain.entity.DynamicColumn;
+import com.ycl.platform.mapper.DynamicColumnMapper;
+import com.ycl.platform.service.DynamicColumnService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.DynamicColumnForm;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
+import com.ycl.platform.domain.query.DynamicColumnQuery;
+import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鍔ㄦ�佸垪 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-08-16
+ */
+@Service
+@RequiredArgsConstructor
+public class DynamicColumnServiceImpl extends ServiceImpl<DynamicColumnMapper, DynamicColumn> implements DynamicColumnService {
+
+    private final DynamicColumnMapper dynamicColumnMapper;
+
+    /**
+     * 娣诲姞
+     * @param form
+     * @return
+     */
+    @Override
+    public Result add(DynamicColumnForm form) {
+        DynamicColumn entity = DynamicColumnForm.getEntityByForm(form, null);
+        baseMapper.insert(entity);
+        return Result.ok("娣诲姞鎴愬姛");
+    }
+
+    /**
+     * 淇敼
+     * @param form
+     * @return
+     */
+    @Override
+    public Result update(DynamicColumnForm form) {
+        DynamicColumn entity = baseMapper.selectById(form.getId());
+
+        // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+        Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+        BeanUtils.copyProperties(form, entity);
+        baseMapper.updateById(entity);
+        return Result.ok("淇敼鎴愬姛");
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎
+     * @param ids
+     * @return
+     */
+    @Override
+    public Result remove(List<String> ids) {
+        baseMapper.deleteBatchIds(ids);
+        return Result.ok("鍒犻櫎鎴愬姛");
+    }
+
+    /**
+     * id鍒犻櫎
+     * @param id
+     * @return
+     */
+    @Override
+    public Result removeById(String id) {
+        baseMapper.deleteById(id);
+        return Result.ok("鍒犻櫎鎴愬姛");
+    }
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     * @param query
+     * @return
+     */
+    @Override
+    public Result page(DynamicColumnQuery query) {
+        IPage<DynamicColumnVO> page = PageUtil.getPage(query, DynamicColumnVO.class);
+        baseMapper.getPage(page, query);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
+
+    /**
+     * 鏍规嵁id鏌ユ壘
+     * @param id
+     * @return
+     */
+    @Override
+    public Result detail(Integer id) {
+        DynamicColumnVO vo = baseMapper.getById(id);
+        Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+        return Result.ok().data(vo);
+    }
+
+    /**
+     * 鍒楄〃
+     * @return
+     */
+    @Override
+    public Result all() {
+        List<DynamicColumn> entities = baseMapper.selectList(null);
+        List<DynamicColumnVO> vos = entities.stream()
+                .map(entity -> DynamicColumnVO.getVoByEntity(entity, null))
+                .collect(Collectors.toList());
+        return Result.ok().data(vos);
+    }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 9aa15a8..3a6d860 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -1,15 +1,19 @@
 package com.ycl.platform.service.impl;
 
 import annotation.DataScope;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.query.HomeQuery;
 import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.domain.vo.screen.MonitorRateVO;
 import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ITMonitorService;
+import com.ycl.system.Result;
 import com.ycl.system.service.ISysConfigService;
 import com.ycl.utils.StringUtils;
 import com.ycl.utils.redis.RedisCache;
@@ -160,4 +164,12 @@
     public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) {
         return baseMapper.monitorRate(dashboardQuery);
     }
+
+
+    @Override
+    public Result assetManagement(DataCenterQuery query) {
+        IPage<TMonitorVO> page = new Page<>(query.getPageNum(), query.getPageSize());
+        baseMapper.assetManagement(page, query);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
 }
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
new file mode 100644
index 0000000..7a27cf7
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.DynamicColumnMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
+        <result column="ref_id" property="refId" />
+        <result column="prop_name" property="propName" />
+        <result column="label_value" property="labelValue" />
+        <result column="field_value" property="fieldValue" />
+    </resultMap>
+
+
+
+
+
+
+
+    <select id="getById" resultMap="BaseResultMap">
+        SELECT
+            TDC.ref_id,
+            TDC.prop_name,
+            TDC.label_value,
+            TDC.field_value,
+            TDC.id
+        FROM
+            t_dynamic_column TDC
+        WHERE
+            TDC.id = #{id} AND TDC.deleted = 0
+    </select>
+
+
+    <select id="getPage" resultMap="BaseResultMap">
+        SELECT
+            TDC.ref_id,
+            TDC.prop_name,
+            TDC.label_value,
+            TDC.field_value,
+            TDC.id
+        FROM
+            t_dynamic_column TDC
+        WHERE
+            TDC.deleted = 0
+    </select>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 0de6265..604549a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -454,4 +454,91 @@
             ) c ON a.area = c.area
     </select>
 
+
+    <select id="assetManagement" resultMap="dyMap">
+        SELECT
+            tm.id,
+            tm.serial_number,
+               tm.name,
+               tm.site_type,
+               tm.mac_addr,
+               tm.ip,
+               tm.camera_fun_type,
+               tm.longitude,
+               tm.latitude,
+               tm.camera_capture_area,
+               tm.on_state,
+               tm.civil_code,
+               tm.integrated_device,
+               tm.camera_brand,
+               tm.address,
+               tm.net_working,
+               tm.public_security,
+               tm.installed_time,
+               tm.management_unit,
+               tm.mu_contact_info,
+               tm.storage_days,
+               tm.monitor_azimuth,
+               tm.scene_photo_addr,
+               tm.model,
+               tm.site_vulgo,
+               tm.camera_type,
+               tm.camera_light_type,
+               tm.encoded_format,
+               tm.camera_dept,
+               tm.hybm,
+               tm.lxbm,
+               dc.prop_name,
+               dc.label_value,
+               dc.field_value
+        FROM
+            t_monitor tm
+                LEFT JOIN t_dynamic_column dc ON tm.id = dc.ref_id
+        <where>
+            <if test="query.keyword != null and query.keyword != ''">
+                AND (tm.name like concat('%', #{query.keyword}, '%') OR dc.field_value like concat('%', #{query.keyword}, '%'))
+            </if>
+        </where>
+    </select>
+
+    <resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">
+        <id column="id" property="id"/>
+        <result column="serial_number" property="serialNumber"/>
+        <result column="name" property="name"/>
+        <result column="site_type" property="siteType"/>
+        <result column="mac_addr" property="macAddr"/>
+        <result column="ip" property="ip"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="camera_capture_area" property="cameraCaptureArea"/>
+        <result column="camera_fun_type" property="cameraFunType"/>
+        <result column="on_state" property="onState"/>
+        <result column="civil_code" property="civilCode"/>
+        <result column="integrated_device" property="integratedDevice"/>
+        <result column="camera_brand" property="cameraBrand"/>
+        <result column="address" property="address"/>
+        <result column="public_security" property="publicSecurity"/>
+        <result column="installed_time" property="installedTime"/>
+        <result column="management_unit" property="managementUnit"/>
+        <result column="mu_contact_info" property="muContactInfo"/>
+        <result column="storage_days" property="storageDays"/>
+        <result column="monitor_azimuth" property="monitorAzimuth"/>
+        <result column="scene_photo_addr" property="scenePhotoAddr"/>
+        <result column="model" property="model"/>
+        <result column="site_vulgo" property="siteVulgo"/>
+        <result column="camera_type" property="cameraType"/>
+        <result column="camera_light_type" property="cameraLightType"/>
+        <result column="encoded_format" property="encodedFormat"/>
+        <result column="camera_dept" property="cameraDept"/>
+        <result column="hybm" property="hybm"/>
+        <result column="lxbm" property="lxbm"/>
+        <collection property="dynamicColumnList" ofType="com.ycl.platform.domain.vo.DynamicColumnVO" resultMap="dynamicColumnMap"/>
+    </resultMap>
+
+    <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
+        <result column="prop_name" property="propName"/>
+        <result column="label_value" property="labelValue"/>
+        <result column="field_value" property="fieldValue"/>
+    </resultMap>
+
 </mapper>

--
Gitblit v1.8.0