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

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

@@ -1,21 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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/DataVdHistoryController.java

@@ -1,21 +0,0 @@
-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/controller/DataXfHistoryController.java

@@ -1,21 +0,0 @@
-package com.usky.backend.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 新风系统历史数据表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2023-08-23
- */
-@Controller
-@RequestMapping("/dataXfHistory")
-public class DataXfHistoryController {
-
-}
-

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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,66 +0,0 @@
-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 productCode;
-
-    /**
-     * 设备类型
-     */
-    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/DataXfHistory.java

@@ -1,66 +0,0 @@
-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 ya
- * @since 2023-08-23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class DataXfHistory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 设备ID
-     */
-    private String deviceId;
-
-    /**
-     * 产品编码
-     */
-    private String productCode;
-
-    /**
-     * 设备类型
-     */
-    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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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/mapper/DataXfHistoryMapper.java

@@ -1,16 +0,0 @@
-package com.usky.backend.mapper;
-
-import com.usky.backend.domain.DataXfHistory;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 新风系统历史数据表 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2023-08-23
- */
-public interface DataXfHistoryMapper extends CrudMapper<DataXfHistory> {
-
-}

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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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/DataVdHistoryService.java

@@ -1,16 +0,0 @@
-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/DataXfHistoryService.java

@@ -1,16 +0,0 @@
-package com.usky.backend.service;
-
-import com.usky.backend.domain.DataXfHistory;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 新风系统历史数据表 服务类
- * </p>
- *
- * @author ya
- * @since 2023-08-23
- */
-public interface DataXfHistoryService extends CrudService<DataXfHistory> {
-
-}

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

@@ -1,20 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -34,24 +34,6 @@ 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;
-
     @Autowired
     private DataRealTimeMapper dataRealTimeMapper;
 
@@ -63,86 +45,6 @@ public class DataQueryServiceImpl implements DataQueryService {
 
         items = dataRealTimeMapper.QueryHistoryData(deviceId, metric, startTime, endTime,tableName);
 
-//        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;
@@ -162,85 +64,6 @@ public class DataQueryServiceImpl implements DataQueryService {
                 String tableName = "data_"+typeAbbrevia+"_history";
 
                 items = dataRealTimeMapper.QueryHistoryData(deviceId, metrics.get(i), startTime, endTime,tableName);
-//                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);

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

@@ -1,20 +0,0 @@
-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/java/com/usky/backend/service/impl/DataXfHistoryServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.backend.service.impl;
-
-import com.usky.backend.domain.DataXfHistory;
-import com.usky.backend.mapper.DataXfHistoryMapper;
-import com.usky.backend.service.DataXfHistoryService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 新风系统历史数据表 服务实现类
- * </p>
- *
- * @author ya
- * @since 2023-08-23
- */
-@Service
-public class DataXfHistoryServiceImpl extends AbstractCrudService<DataXfHistoryMapper, DataXfHistory> implements DataXfHistoryService {
-
-}

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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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

@@ -1,17 +0,0 @@
-<?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="product_code" property="productCode" />
-        <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/DataXfHistoryMapper.xml

@@ -1,17 +0,0 @@
-<?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.DataXfHistoryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.backend.domain.DataXfHistory">
-        <id column="id" property="id" />
-        <result column="device_id" property="deviceId" />
-        <result column="product_code" property="productCode" />
-        <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-park/service-park-biz/src/main/java/com/usky/park/controller/web/DmpDeviceController.java

@@ -3,9 +3,11 @@ package com.usky.park.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.utils.poi.ExcelUtil;
 import com.usky.park.domain.DataRealTime;
 import com.usky.park.service.DataRealTimeService;
 import com.usky.park.service.DmpDeviceService;
+import com.usky.park.service.vo.DeviceHistoryDataExportVO;
 import com.usky.park.service.vo.DmpDeviceVO;
 import com.usky.park.service.vo.HistoryAttributeVO;
 import org.bouncycastle.cert.ocsp.Req;
@@ -17,6 +19,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -84,6 +88,25 @@ public class DmpDeviceController {
         return ApiResult.success(deviceService.deviceCurrentDataList(deviceName,installAddress,deviceType,switchStatus,pageNum,pageSize));
     }
 
+    /**
+     * 数据中心-设备历史数据全量导出
+     *
+     * @param deviceType  设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     * @param startDate  开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("deviceHistoryDataListExport")
+    void deviceHistoryDataListExport(@RequestParam(value = "deviceType") Integer deviceType,
+                                                                           @RequestParam(value = "startDate") String startDate,
+                                                                           @RequestParam(value = "endDate") String endDate, HttpServletResponse response) throws IOException {
+        String name = "环境设备_"+startDate.substring(0,10)+"_"+endDate.substring(0,10);
+        List<DeviceHistoryDataExportVO> list = deviceService.deviceHistoryDataListExport(deviceType,startDate,endDate);
+        ExcelUtil<DeviceHistoryDataExportVO> util = new ExcelUtil<DeviceHistoryDataExportVO>(DeviceHistoryDataExportVO.class);
+        util.exportExcel(response,list,name,name);
+    }
+
+
     /**
      * 数据中心-机房系统、环境系统、照明系统心跳历史数据列表查询接口
      *

service-park/service-park-biz/src/main/java/com/usky/park/mapper/DmpDeviceMapper.java

@@ -2,6 +2,10 @@ package com.usky.park.mapper;
 
 import com.usky.park.domain.DmpDevice;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.park.service.vo.DeviceDataHistoryMiddleVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @since 2023-03-30
  */
 public interface DmpDeviceMapper extends CrudMapper<DmpDevice> {
-
+    List<DeviceDataHistoryMiddleVO> QueryDeviceHistoryData(@Param("tableName") String tableName, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

service-park/service-park-biz/src/main/java/com/usky/park/service/DmpDeviceService.java

@@ -3,6 +3,7 @@ package com.usky.park.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.DmpDevice;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.park.service.vo.DeviceHistoryDataExportVO;
 import com.usky.park.service.vo.DmpDeviceVO;
 import com.usky.park.service.vo.HistoryAttributeVO;
 
@@ -47,6 +48,10 @@ public interface DmpDeviceService extends CrudService<DmpDevice> {
      */
     CommonPage<Object> deviceCurrentDataList(String deviceName,String installAddress,Integer deviceType,Integer switchStatus,Integer pageNum,Integer pageSize);
 
+
+    List<DeviceHistoryDataExportVO> deviceHistoryDataListExport(Integer deviceType, String startDate, String endDate);
+
+
     /**
      * 数据中心-机房系统、环境系统、照明系统心跳历史数据列表查询接口
      *

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DmpDeviceServiceImpl.java

@@ -16,9 +16,7 @@ import com.usky.park.service.DataLgHistoryService;
 import com.usky.park.mapper.DmpDeviceMapper;
 import com.usky.park.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.park.service.vo.DmpDeviceVO;
-import com.usky.park.service.vo.HistoryAttributeVO;
-import com.usky.park.service.vo.KeyValueVO;
+import com.usky.park.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -201,6 +199,7 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                 dataRealList = dataRealTimeService.list(queryWrapper1);
                 if(dataRealList.size()>0){
                     Boolean found = true;
+                    boolean exist = false;
                     for(int j=0;j<dataRealList.size();j++){
                         map.put(dataRealList.get(j).getAttributeName(),dataRealList.get(j).getAttributeData());
                         map.put(dataRealList.get(j).getAttributeName()+"Time",dataRealList.get(j).getDataTime());
@@ -209,13 +208,18 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                                 found = false;
                             }
                         }
+                        if(dataRealList.get(j).getAttributeData().equals("-50")){
+                            exist = true;
+                        }
                     }
-                    if(deviceType == 510){
-                        if(found){
+                    if(!exist){
+                        if(deviceType == 510){
+                            if(found){
+                                list.add(map);
+                            }
+                        }else{
                             list.add(map);
                         }
-                    }else{
-                        list.add(map);
                     }
                 }
 
@@ -240,6 +244,69 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
         return new CommonPage<>(objectList,total,pageNum,pageSize);
     }
 
+    public List<DeviceHistoryDataExportVO> deviceHistoryDataListExport(Integer deviceType, String startDate, String endDate){
+        List<DeviceHistoryDataExportVO> list = new ArrayList<>();
+
+        String tableName = "data_"+"ev"+"_history";
+
+        List<DeviceDataHistoryMiddleVO> list1 = new ArrayList<>();
+        list1 = baseMapper.QueryDeviceHistoryData(tableName,startDate,endDate);
+
+        if(CollectionUtils.isNotEmpty(list1)){
+            List<String> dateList = new ArrayList<>();
+            List<String> deviceIdList = new ArrayList<>();
+            for(int i=0;i<list1.size();i++){
+                if(!dateList.contains(list1.get(i).getDataDate())){
+                    dateList.add(list1.get(i).getDataDate());
+                }
+                if(!deviceIdList.contains(list1.get(i).getDeviceId())){
+                    deviceIdList.add(list1.get(i).getDeviceId());
+                }
+            }
+            if(CollectionUtils.isNotEmpty(dateList) && CollectionUtils.isNotEmpty(deviceIdList)){
+                for(int i=0;i<deviceIdList.size();i++){
+                    for(int j=0;j<dateList.size();j++){
+                        DeviceHistoryDataExportVO responseVO = new DeviceHistoryDataExportVO();
+                        responseVO.setDeviceId(deviceIdList.get(i));
+                        responseVO.setDataDate(dateList.get(j));
+                        for(int k=0;k<list1.size();k++){
+                            if(deviceIdList.get(i).equals(list1.get(k).getDeviceId()) && dateList.get(j).equals(list1.get(k).getDataDate())){
+                                if(list1.get(k).getAttributeName().equals("wd")){
+                                    responseVO.setWd(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("sd")){
+                                    responseVO.setSd(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("co2")){
+                                    responseVO.setCo2(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("jq")){
+                                    responseVO.setJq(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("pm2.5")){
+                                    responseVO.setPm2_5(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("tvoc")){
+                                    responseVO.setTvoc(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("pm1.0")){
+                                    responseVO.setPm1_0(list1.get(k).getAttributeData());
+                                }
+                                if(list1.get(k).getAttributeName().equals("pm10")){
+                                    responseVO.setPm10(list1.get(k).getAttributeData());
+                                }
+                            }
+                        }
+                        list.add(responseVO);
+                    }
+                }
+            }
+        }
+
+        return list;
+
+    }
+
     public List<HistoryAttributeVO> deviceHistoryDataList(String deviceId, Integer deviceType, List<String> deviceAttribute, String startDate, String endDate){
         List<HistoryAttributeVO> list = new ArrayList<>();
         switch (deviceType){

service-park/service-park-biz/src/main/java/com/usky/park/service/vo/DeviceDataHistoryMiddleVO.java

@@ -0,0 +1,15 @@
+package com.usky.park.service.vo;
+
+import lombok.Data;
+
+@Data
+public class DeviceDataHistoryMiddleVO {
+
+    private String deviceId;
+
+    private String dataDate;
+
+    private String attributeName;
+
+    private String attributeData;
+}

service-park/service-park-biz/src/main/java/com/usky/park/service/vo/DeviceHistoryDataExportVO.java

@@ -0,0 +1,68 @@
+package com.usky.park.service.vo;
+
+import com.usky.common.core.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class DeviceHistoryDataExportVO {
+
+    /**
+     * 设备Id
+     */
+    @Excel(name = "设备Id")
+    private String deviceId;
+
+    /**
+     * 数据时间
+     */
+    @Excel(name = "数据时间")
+    private String dataDate;
+
+    /**
+     * 温度
+     */
+    @Excel(name = "温度")
+    private String wd;
+
+    /**
+     * 湿度
+     */
+    @Excel(name = "湿度")
+    private String sd;
+
+    /**
+     * 二氧化碳
+     */
+    @Excel(name = "二氧化碳")
+    private String co2;
+
+    /**
+     * 甲醛
+     */
+    @Excel(name = "甲醛")
+    private String jq;
+
+    /**
+     * PM2.5
+     */
+    @Excel(name = "PM2.5")
+    private String pm2_5;
+
+    /**
+     * TVOC
+     */
+    @Excel(name = "TVOC")
+    private String tvoc;
+
+    /**
+     * PM1.0
+     */
+    @Excel(name = "PM1.0")
+    private String pm1_0;
+
+    /**
+     * PM10
+     */
+    @Excel(name = "PM10")
+    private String pm10;
+}

service-park/service-park-biz/src/main/resources/mapper/park/DmpDeviceMapper.xml

@@ -24,5 +24,12 @@
         <result column="company_code" property="companyCode" />
         <result column="install_address" property="installAddress" />
     </resultMap>
+    <select id="QueryDeviceHistoryData" resultType="com.usky.park.service.vo.DeviceDataHistoryMiddleVO">
+        select device_id as deviceId, data_time as dataDate, attribute_name as attributeName, avg(attribute_data) as attributeData
+        FROM ${tableName}
+        WHERE data_time  BETWEEN  #{startDate} AND  #{endDate}
+        and attribute_data != 0 and attribute_data != -50
+        group by device_id,data_time,attribute_name;
+    </select>
 
 </mapper>