Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/request/HistoryQueryVo.java

@@ -17,20 +17,25 @@ public class HistoryQueryVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
      /**
-     * 开始时间戳
+     * 开始时间
      */
-    private Integer startTime;
+    private String startTime;
 
      /**
-     * 结束时间戳
+     * 结束时间
      */
-    private Integer endTime;
+    private String endTime;
 
      /**
      * 设备Id
      */
     private String  deviceId;
 
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
     /**
      * 指标名
      */

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataEgHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 门禁系统历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataEgHistory")
+public class DataEgHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataEvHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 环境系统历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataEvHistory")
+public class DataEvHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataGrHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 温湿度历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataGrHistory")
+public class DataGrHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataLcHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 梯控系统历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataLcHistory")
+public class DataLcHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataLgHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 照明系统历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataLgHistory")
+public class DataLgHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataQueryController.java

@@ -29,28 +29,30 @@ public class DataQueryController {
     @Autowired
     private DataQueryService dataQueryService;
 
-    @GetMapping("/history")
+    /**
+     * 获取单个设备单属性历史数据
+     *
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param deviceId 设备Id
+     * @param metric 属性
+     * @param deviceType 设备类型编码（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     * @return
+     */
+    @GetMapping("/historyMetric")
     @ApiOperation("获取单个设备单属性历史数据")
-    public ApiResult<HistoryResultVo> history(@RequestParam("startTime") String startTime,
+    public ApiResult<HistoryResultVo> historyMetric(@RequestParam("startTime") String startTime,
                                               @RequestParam("endTime") String endTime,
                                               @RequestParam("deviceId") String deviceId,
-                                              @RequestParam("metric") String metric ) {
-        //以下是mock模拟数据
-        List<MetricItemVo> items = new ArrayList<>();
-        items.add(new MetricItemVo(LocalDateTime.now(),12.3));
-        HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metric,items);
-        return ApiResult.success(historyResultVo);
+                                              @RequestParam("metric") String metric,
+                                              @RequestParam("deviceType") Integer deviceType) {
+        return ApiResult.success(dataQueryService.historyMetric(deviceId,metric,startTime,endTime,deviceType));
     }
 
-    @PostMapping("/history")
+    @PostMapping("/historyMetrics")
     @ApiOperation("获取单个设备多属性历史数据")
-    public ApiResult<List<HistoryResultVo>> history(@RequestBody HistoryQueryVo historyQueryVo) {
-        List<HistoryResultVo> result  = new ArrayList<>();
-        List<MetricItemVo> items = new ArrayList<>();
-        items.add(new MetricItemVo(LocalDateTime.now(),12.3));
-        HistoryResultVo historyResultVo = new HistoryResultVo(historyQueryVo.getDeviceId(),"cpu.load",items);
-        result.add(historyResultVo);
-        return ApiResult.success(result);
+    public ApiResult<List<HistoryResultVo>> historyMetrics(@RequestBody HistoryQueryVo historyQueryVo) {
+        return ApiResult.success(dataQueryService.historyMetrics(historyQueryVo));
     }
 
     /**

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataVdHistoryController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 视频监控系统历史数据 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Controller
+@RequestMapping("/dataVdHistory")
+public class DataVdHistoryController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataEgHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 门禁系统历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataEgHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataEvHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 环境系统历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataEvHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataGrHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 温湿度历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataGrHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataLcHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 梯控系统历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataLcHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataLgHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 照明系统历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataLgHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/DataVdHistory.java

@@ -0,0 +1,66 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 视频监控系统历史数据
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataVdHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性值
+     */
+    private String attributeData;
+
+    /**
+     * 数据时间
+     */
+    private LocalDateTime dataTime;
+
+    /**
+     * 插入时间
+     */
+    private LocalDateTime insertTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataEgHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataEgHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 门禁系统历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataEgHistoryMapper extends CrudMapper<DataEgHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataEvHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataEvHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 环境系统历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataEvHistoryMapper extends CrudMapper<DataEvHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataGrHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataGrHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 温湿度历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataGrHistoryMapper extends CrudMapper<DataGrHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataLcHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataLcHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 梯控系统历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataLcHistoryMapper extends CrudMapper<DataLcHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataLgHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataLgHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 照明系统历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataLgHistoryMapper extends CrudMapper<DataLgHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataVdHistoryMapper.java

@@ -0,0 +1,18 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.DataVdHistory;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 视频监控系统历史数据 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Repository
+public interface DataVdHistoryMapper extends CrudMapper<DataVdHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataEgHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataEgHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 门禁系统历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataEgHistoryService extends CrudService<DataEgHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataEvHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataEvHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 环境系统历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataEvHistoryService extends CrudService<DataEvHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataGrHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataGrHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 温湿度历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataGrHistoryService extends CrudService<DataGrHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataLcHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataLcHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 梯控系统历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataLcHistoryService extends CrudService<DataLcHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataLgHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataLgHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 照明系统历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataLgHistoryService extends CrudService<DataLgHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataQueryService.java

@@ -2,12 +2,19 @@ package com.usky.backend.service;
 
 
 import com.usky.backend.domain.StatusVO;
+import com.usky.backend.domain.request.HistoryQueryVo;
 import com.usky.backend.domain.request.LastQueryVo;
+import com.usky.backend.domain.response.HistoryResultVo;
 import com.usky.backend.domain.response.LastResultVo;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
 public interface DataQueryService {
+    HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,Integer deviceType);
+
+    List<HistoryResultVo> historyMetrics(HistoryQueryVo historyQueryVo);
+
     List<LastResultVo> last(LastQueryVo lastQueryVo);
 
     List<StatusVO> status();

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataVdHistoryService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.DataVdHistory;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 视频监控系统历史数据 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+public interface DataVdHistoryService extends CrudService<DataVdHistory> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataEgHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataEgHistory;
+import com.usky.backend.mapper.DataEgHistoryMapper;
+import com.usky.backend.service.DataEgHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 门禁系统历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataEgHistoryServiceImpl extends AbstractCrudService<DataEgHistoryMapper, DataEgHistory> implements DataEgHistoryService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataEvHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataEvHistory;
+import com.usky.backend.mapper.DataEvHistoryMapper;
+import com.usky.backend.service.DataEvHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 环境系统历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataEvHistoryServiceImpl extends AbstractCrudService<DataEvHistoryMapper, DataEvHistory> implements DataEvHistoryService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataGrHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataGrHistory;
+import com.usky.backend.mapper.DataGrHistoryMapper;
+import com.usky.backend.service.DataGrHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 温湿度历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataGrHistoryServiceImpl extends AbstractCrudService<DataGrHistoryMapper, DataGrHistory> implements DataGrHistoryService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataLcHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataLcHistory;
+import com.usky.backend.mapper.DataLcHistoryMapper;
+import com.usky.backend.service.DataLcHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 梯控系统历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataLcHistoryServiceImpl extends AbstractCrudService<DataLcHistoryMapper, DataLcHistory> implements DataLcHistoryService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataLgHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataLgHistory;
+import com.usky.backend.mapper.DataLgHistoryMapper;
+import com.usky.backend.service.DataLgHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 照明系统历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataLgHistoryServiceImpl extends AbstractCrudService<DataLgHistoryMapper, DataLgHistory> implements DataLgHistoryService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataQueryServiceImpl.java

@@ -1,18 +1,21 @@
 package com.usky.backend.service.impl;
 
+import cn.hutool.db.meta.Table;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.backend.domain.DataRealTime;
-import com.usky.backend.domain.MetricItemVo;
-import com.usky.backend.domain.StatusVO;
+import com.usky.backend.domain.*;
+import com.usky.backend.domain.request.HistoryQueryVo;
 import com.usky.backend.domain.request.LastQueryVo;
+import com.usky.backend.domain.response.HistoryResultVo;
 import com.usky.backend.domain.response.LastResultVo;
-import com.usky.backend.service.DataQueryService;
-import com.usky.backend.service.DataRealTimeService;
+import com.usky.backend.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +25,212 @@ public class DataQueryServiceImpl implements DataQueryService {
     @Autowired
     private DataRealTimeService dataRealTimeService;
 
+    @Autowired
+    private DataVdHistoryService dataVdHistoryService;
+
+    @Autowired
+    private DataEgHistoryService dataEgHistoryService;
+
+    @Autowired
+    private DataLgHistoryService dataLgHistoryService;
+
+    @Autowired
+    private DataGrHistoryService dataGrHistoryService;
+
+    @Autowired
+    private DataEvHistoryService dataEvHistoryService;
+
+    @Autowired
+    private DataLcHistoryService dataLcHistoryService;
+
+    @Override
+    public HistoryResultVo historyMetric(String deviceId, String metric, String startTime, String endTime,Integer deviceType){
+
+        List<MetricItemVo> items = new ArrayList<>();
+        if(deviceType == 501){
+            LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
+            vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
+                    .eq(DataVdHistory::getDeviceId,deviceId)
+                    .eq(DataVdHistory::getAttributeName,metric)
+                    .between(DataVdHistory::getDataTime,startTime,endTime);
+            List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }else if(deviceType == 502){
+            LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
+            egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
+                    .eq(DataEgHistory::getDeviceId,deviceId)
+                    .eq(DataEgHistory::getAttributeName,metric)
+                    .between(DataEgHistory::getDataTime,startTime,endTime);
+            List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }else if(deviceType == 503){
+            LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
+            lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
+                    .eq(DataLgHistory::getDeviceId,deviceId)
+                    .eq(DataLgHistory::getAttributeName,metric)
+                    .between(DataLgHistory::getDataTime,startTime,endTime);
+            List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }else if(deviceType == 504){
+            LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
+            grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
+                    .eq(DataGrHistory::getDeviceId,deviceId)
+                    .eq(DataGrHistory::getAttributeName,metric)
+                    .between(DataGrHistory::getDataTime,startTime,endTime);
+            List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }else if(deviceType == 509){
+            LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
+            evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
+                    .eq(DataEvHistory::getDeviceId,deviceId)
+                    .eq(DataEvHistory::getAttributeName,metric)
+                    .between(DataEvHistory::getDataTime,startTime,endTime);
+            List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }else if(deviceType == 510){
+            LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
+            lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
+                    .eq(DataLcHistory::getDeviceId,deviceId)
+                    .eq(DataLcHistory::getAttributeName,metric)
+                    .between(DataLcHistory::getDataTime,startTime,endTime);
+            List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
+
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<list.size();i++){
+                    items.add(new MetricItemVo(list.get(i).getDataTime(),list.get(i).getAttributeData()));
+                }
+            }
+        }
+
+        HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metric,items);
+
+        return historyResultVo;
+    }
+
+    @Override
+    public List<HistoryResultVo> historyMetrics(HistoryQueryVo historyQueryVo){
+        List<HistoryResultVo> result = new ArrayList<>();
+        String deviceId = historyQueryVo.getDeviceId();
+        String startTime = historyQueryVo.getStartTime();
+        String endTime = historyQueryVo.getEndTime();
+        Integer deviceType = historyQueryVo.getDeviceType();
+        List<String> metrics = historyQueryVo.getMetrics();
+        if(CollectionUtils.isNotEmpty(metrics)){
+            for(int i=0;i<metrics.size();i++){
+                List<MetricItemVo> items = new ArrayList<>();
+                if(deviceType == 501){
+                    LambdaQueryWrapper<DataVdHistory> vdQuery = Wrappers.lambdaQuery();
+                    vdQuery.select(DataVdHistory::getAttributeData,DataVdHistory::getDataTime)
+                            .eq(DataVdHistory::getDeviceId,deviceId)
+                            .eq(DataVdHistory::getAttributeName,metrics.get(i))
+                            .between(DataVdHistory::getDataTime,startTime,endTime);
+                    List<DataVdHistory> list = dataVdHistoryService.list(vdQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }else if(deviceType == 502){
+                    LambdaQueryWrapper<DataEgHistory> egQuery = Wrappers.lambdaQuery();
+                    egQuery.select(DataEgHistory::getAttributeData,DataEgHistory::getDataTime)
+                            .eq(DataEgHistory::getDeviceId,deviceId)
+                            .eq(DataEgHistory::getAttributeName,metrics.get(i))
+                            .between(DataEgHistory::getDataTime,startTime,endTime);
+                    List<DataEgHistory> list = dataEgHistoryService.list(egQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }else if(deviceType == 503){
+                    LambdaQueryWrapper<DataLgHistory> lgQuery = Wrappers.lambdaQuery();
+                    lgQuery.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
+                            .eq(DataLgHistory::getDeviceId,deviceId)
+                            .eq(DataLgHistory::getAttributeName,metrics.get(i))
+                            .between(DataLgHistory::getDataTime,startTime,endTime);
+                    List<DataLgHistory> list = dataLgHistoryService.list(lgQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }else if(deviceType == 504){
+                    LambdaQueryWrapper<DataGrHistory> grQuery = Wrappers.lambdaQuery();
+                    grQuery.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
+                            .eq(DataGrHistory::getDeviceId,deviceId)
+                            .eq(DataGrHistory::getAttributeName,metrics.get(i))
+                            .between(DataGrHistory::getDataTime,startTime,endTime);
+                    List<DataGrHistory> list = dataGrHistoryService.list(grQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }else if(deviceType == 509){
+                    LambdaQueryWrapper<DataEvHistory> evQuery = Wrappers.lambdaQuery();
+                    evQuery.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
+                            .eq(DataEvHistory::getDeviceId,deviceId)
+                            .eq(DataEvHistory::getAttributeName,metrics.get(i))
+                            .between(DataEvHistory::getDataTime,startTime,endTime);
+                    List<DataEvHistory> list = dataEvHistoryService.list(evQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }else if(deviceType == 510){
+                    LambdaQueryWrapper<DataLcHistory> lcQuery = Wrappers.lambdaQuery();
+                    lcQuery.select(DataLcHistory::getAttributeData,DataLcHistory::getDataTime)
+                            .eq(DataLcHistory::getDeviceId,deviceId)
+                            .eq(DataLcHistory::getAttributeName,metrics.get(i))
+                            .between(DataLcHistory::getDataTime,startTime,endTime);
+                    List<DataLcHistory> list = dataLcHistoryService.list(lcQuery);
+
+                    if(CollectionUtils.isNotEmpty(list)){
+                        for(int j=0;j<list.size();j++){
+                            items.add(new MetricItemVo(list.get(j).getDataTime(),list.get(j).getAttributeData()));
+                        }
+                    }
+                }
+
+                HistoryResultVo historyResultVo = new HistoryResultVo(deviceId,metrics.get(i),items);
+                result.add(historyResultVo);
+            }
+        }
+
+        return result;
+    }
+
     @Override
     public List<LastResultVo> last(LastQueryVo lastQueryVo){
         List<LastResultVo> list = new ArrayList<>();

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataVdHistoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.DataVdHistory;
+import com.usky.backend.mapper.DataVdHistoryMapper;
+import com.usky.backend.service.DataVdHistoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 视频监控系统历史数据 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-06-12
+ */
+@Service
+public class DataVdHistoryServiceImpl extends AbstractCrudService<DataVdHistoryMapper, DataVdHistory> implements DataVdHistoryService {
+
+}

service-backend/service-backend-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataEgHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataEgHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataEgHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataEvHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataEvHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataEvHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataGrHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataGrHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataGrHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataLcHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataLcHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataLcHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataLgHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataLgHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataLgHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/DataVdHistoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.usky.backend.mapper.DataVdHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataVdHistory">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_data" property="attributeData" />
+        <result column="data_time" property="dataTime" />
+        <result column="insert_time" property="insertTime" />
+    </resultMap>
+
+</mapper>