'数据中心-机房系统、环境系统、照明系统心跳历史数据列表查询和告警管理-机房系统告警接口'

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/AlarmGrController.java

@@ -0,0 +1,61 @@
+package com.usky.park.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.AlarmGr;
+import com.usky.park.service.AlarmGrService;
+import com.usky.park.service.DmpDeviceService;
+import com.usky.park.service.vo.AlarmGrVO;
+import com.usky.park.service.vo.DmpDeviceVO;
+import com.usky.park.service.vo.HistoryAttributeVO;
+import org.bouncycastle.cert.ocsp.Req;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-03-30
+ */
+@RestController
+@RequestMapping("/alarmGr")
+public class AlarmGrController {
+    @Autowired
+    private AlarmGrService alarmGrService;
+
+    /**
+     * 告警管理-机房系统告警
+     *
+     * @param deviceName 设备名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param alarmType  告警类型
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param pageNum  当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    @GetMapping("alarmList")
+    public ApiResult<CommonPage<AlarmGrVO>> alarmList(@RequestParam(value = "deviceName",required = false) String deviceName,
+                                                      @RequestParam(value = "handlingStatus",required = false) Integer handlingStatus,
+                                                      @RequestParam(value = "alarmType",required = false) String alarmType,
+                                                      @RequestParam(value = "startDate",required = false) String startDate,
+                                                      @RequestParam(value = "endDate",required = false) String endDate,
+                                                      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return ApiResult.success(alarmGrService.alarmList(deviceName,handlingStatus,alarmType,startDate,endDate,pageNum,pageSize));
+    }
+
+}
+

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

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

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

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

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

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

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/DmpDeviceController.java

@@ -5,6 +5,7 @@ import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.park.service.DmpDeviceService;
 import com.usky.park.service.vo.DmpDeviceVO;
+import com.usky.park.service.vo.HistoryAttributeVO;
 import org.bouncycastle.cert.ocsp.Req;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +15,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备信息表 前端控制器
@@ -36,6 +39,7 @@ public class DmpDeviceController {
      * @param deviceType 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
      * @param deviceStatus  设备状态（0 离线 1 在线）
      * @param doorStatus  门禁门状态（1 开门状态 2 关门状态）
+     * @param switchStatus  照明开关状态（0 关闭 1 打开）
      * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
      * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
      * @param pageNum  当前页
@@ -45,14 +49,15 @@ public class DmpDeviceController {
     @GetMapping("dmpDeviceList")
     public ApiResult<CommonPage<DmpDeviceVO>> dmpDeviceList(@RequestParam(value = "deviceName",required = false) String deviceName,
                                                             @RequestParam(value = "installAddress",required = false) String installAddress,
-                                                            @RequestParam(value = "deviceType",required = false) String deviceType,
+                                                            @RequestParam(value = "deviceType",required = false) Integer deviceType,
                                                             @RequestParam(value = "deviceStatus",required = false) String deviceStatus,
                                                             @RequestParam(value = "doorStatus",required = false) String doorStatus,
+                                                            @RequestParam(value = "switchStatus",required = false) String switchStatus,
                                                             @RequestParam(value = "startDate",required = false) String startDate,
                                                             @RequestParam(value = "endDate",required = false) String endDate,
                                                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
-        return ApiResult.success(deviceService.dmpDeviceList(deviceName,installAddress,deviceType,deviceStatus,doorStatus,startDate,endDate,pageNum,pageSize));
+        return ApiResult.success(deviceService.dmpDeviceList(deviceName,installAddress,deviceType,deviceStatus,doorStatus,switchStatus,startDate,endDate,pageNum,pageSize));
     }
 
     /**
@@ -76,6 +81,25 @@ public class DmpDeviceController {
         return ApiResult.success(deviceService.deviceCurrentDataList(deviceName,installAddress,deviceType,switchStatus,pageNum,pageSize));
     }
 
+    /**
+     * 数据中心-机房系统、环境系统、照明系统心跳历史数据列表查询接口
+     *
+     * @param deviceId 设备Id
+     * @param deviceType 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     * @param deviceAttribute 设备属性
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("deviceHistoryDataList")
+    public ApiResult<List<HistoryAttributeVO>> deviceHistoryDataList(@RequestParam(value = "deviceId") String deviceId,
+                                                                     @RequestParam(value = "deviceType") Integer deviceType,
+                                                                     @RequestParam(value = "deviceAttribute") List<String> deviceAttribute,
+                                                                     @RequestParam(value = "startDate") String startDate,
+                                                                     @RequestParam(value = "endDate") String endDate){
+        return ApiResult.success(deviceService.deviceHistoryDataList(deviceId,deviceType,deviceAttribute,startDate,endDate));
+    }
+
 
 }
 

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/EventEgController.java

@@ -7,6 +7,7 @@ import com.usky.park.domain.EventEg;
 import com.usky.park.service.EventEgService;
 import com.usky.park.service.vo.EventEgStatisticVO;
 import jdk.nashorn.internal.objects.annotations.Getter;
+import org.bouncycastle.util.StringList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -69,16 +70,18 @@ public class EventEgController {
 
     /**
      * 数据中心-统计门禁今日进出人次查询
-     * @param deviceId 设备Id
+     * @param enterDeviceId 进设备Id
+     * @param outDeviceId 出设备Id
      * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
      * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
      * @return
      */
     @GetMapping("eventEgStatistic")
-    ApiResult<List<EventEgStatisticVO>> eventEgStatistic(@RequestParam(value = "deviceId",required = false) String deviceId,
+    ApiResult<List<EventEgStatisticVO>> eventEgStatistic(@RequestParam(value = "enterDeviceId") List<String> enterDeviceId,
+                                                         @RequestParam(value = "outDeviceId") List<String> outDeviceId,
                                                          @RequestParam(value = "startDate") String startDate,
                                                          @RequestParam(value = "endDate") String endDate){
-        return ApiResult.success(eventEgService.eventEgStatistic(deviceId,startDate,endDate));
+        return ApiResult.success(eventEgService.eventEgStatistic(enterDeviceId,outDeviceId,startDate,endDate));
     }
 
 }

service-park/service-park-biz/src/main/java/com/usky/park/domain/AlarmGr.java

@@ -0,0 +1,97 @@
+package com.usky.park.domain;
+
+import java.math.BigDecimal;
+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-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AlarmGr 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 String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警内容
+     */
+    private String alarmDesc;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 告警值
+     */
+    private BigDecimal alarmValue;
+
+    /**
+     * 扩充字段
+     */
+    private String expandField;
+
+    /**
+     * 处理人
+     */
+    private String handler;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handlingTime;
+
+    /**
+     * 处理内容
+     */
+    private String handlingContent;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.usky.park.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-04-03
+ */
+@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-park/service-park-biz/src/main/java/com/usky/park/domain/DataGrHistory.java

@@ -0,0 +1,66 @@
+package com.usky.park.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-04-03
+ */
+@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-park/service-park-biz/src/main/java/com/usky/park/domain/DataLgHistory.java

@@ -0,0 +1,66 @@
+package com.usky.park.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-04-03
+ */
+@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-park/service-park-biz/src/main/java/com/usky/park/mapper/AlarmGrMapper.java

@@ -0,0 +1,16 @@
+package com.usky.park.mapper;
+
+import com.usky.park.domain.AlarmGr;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 机房告警表 Mapper 接口
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-03
+ */
+public interface AlarmGrMapper extends CrudMapper<AlarmGr> {
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,30 @@
+package com.usky.park.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.AlarmGr;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.park.service.vo.AlarmGrVO;
+
+/**
+ * <p>
+ * 机房告警表 服务类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-03
+ */
+public interface AlarmGrService extends CrudService<AlarmGr> {
+    /**
+     * 告警管理-机房系统告警
+     *
+     * @param deviceName 设备名称
+     * @param handlingStatus 处理状态（0、未处理 1、已处理）
+     * @param alarmType  告警类型
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param pageNum  当前页
+     * @param pageSize  每页条数
+     * @return
+     */
+    CommonPage<AlarmGrVO> alarmList(String deviceName, Integer handlingStatus, String alarmType, String startDate, String endDate, Integer pageNum, Integer pageSize);
+}

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

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

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

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

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

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

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

@@ -4,6 +4,9 @@ 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.DmpDeviceVO;
+import com.usky.park.service.vo.HistoryAttributeVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -28,7 +31,7 @@ public interface DmpDeviceService extends CrudService<DmpDevice> {
      * @param pageSize  每页条数
      * @return
      */
-    CommonPage<DmpDeviceVO> dmpDeviceList(String deviceName,String installAddress,String deviceType,String deviceStatus,String doorStatus,String startDate,String endDate,Integer pageNum,Integer pageSize);
+    CommonPage<DmpDeviceVO> dmpDeviceList(String deviceName,String installAddress,Integer deviceType,String deviceStatus,String doorStatus,String switchStatus,String startDate,String endDate,Integer pageNum,Integer pageSize);
 
     /**
      * 数据中心-机房系统、环境系统、照明系统心跳列表查询接口
@@ -42,4 +45,15 @@ public interface DmpDeviceService extends CrudService<DmpDevice> {
      * @return
      */
     CommonPage<Object> deviceCurrentDataList(String deviceName,String installAddress,Integer deviceType,Integer switchStatus,Integer pageNum,Integer pageSize);
+
+    /**
+     * 数据中心-机房系统、环境系统、照明系统心跳历史数据列表查询接口
+     *
+     * @param deviceId 设备Id
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param deviceAttribute 设备属性
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<HistoryAttributeVO> deviceHistoryDataList(String deviceId, Integer deviceType, List<String> deviceAttribute, String startDate, String endDate);
 }

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

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.park.domain.EventEg;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.park.service.vo.EventEgStatisticVO;
+import org.bouncycastle.util.StringList;
 
 import java.util.List;
 
@@ -42,8 +43,8 @@ public interface EventEgService extends CrudService<EventEg> {
     CommonPage<EventEg> eventEgOne(String deviceId,Integer pageNum,Integer pageSize);
 
 
-    List<EventEgStatisticVO> eventEgStatistic(String deviceId,String startDate,String endDate);
+    List<EventEgStatisticVO> eventEgStatistic(List<String> enterDeviceId, List<String> outDeviceId, String startDate, String endDate);
 
-    Integer numStatistic(String deviceId,String startDate,String endDate,Integer iType);
+    Integer numStatistic(List<String> deviceId,String startDate,String endDate,Integer iType);
 
 }

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

@@ -0,0 +1,65 @@
+package com.usky.park.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.park.domain.AlarmGr;
+import com.usky.park.domain.DmpDevice;
+import com.usky.park.mapper.AlarmGrMapper;
+import com.usky.park.service.AlarmGrService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.park.service.vo.AlarmGrVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 机房告警表 服务实现类
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-03
+ */
+@Service
+public class AlarmGrServiceImpl extends AbstractCrudService<AlarmGrMapper, AlarmGr> implements AlarmGrService {
+
+    @Override
+    public CommonPage<AlarmGrVO> alarmList(String deviceName, Integer handlingStatus, String alarmType, String startDate, String endDate, Integer pageNum, Integer pageSize){
+        IPage<AlarmGr> page = new Page<>(pageNum,pageSize);
+        List<AlarmGrVO> list = new ArrayList<>();
+
+        LambdaQueryWrapper<AlarmGr> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(deviceName),AlarmGr::getDeviceName,deviceName)
+                .eq(handlingStatus != null,AlarmGr::getHandlingStatus,handlingStatus)
+                .like(StringUtils.isNotBlank(alarmType),AlarmGr::getAlarmType,alarmType)
+                .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), AlarmGr::getAlarmTime,startDate,endDate)
+                .orderByDesc(AlarmGr::getId);
+        page = this.page(page,queryWrapper);
+
+        if(CollectionUtils.isNotEmpty(page.getRecords())){
+            for(int i=0;i<page.getRecords().size();i++){
+                AlarmGrVO alarmGrVO = new AlarmGrVO();
+                alarmGrVO.setAlarmDesc(page.getRecords().get(i).getAlarmDesc());
+                alarmGrVO.setAlarmTime(page.getRecords().get(i).getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                alarmGrVO.setAlarmType(page.getRecords().get(i).getAlarmType());
+                alarmGrVO.setAlarmValue(page.getRecords().get(i).getAlarmValue());
+                alarmGrVO.setHandlingStatus(page.getRecords().get(i).getHandlingStatus());
+                alarmGrVO.setDeviceName(page.getRecords().get(i).getDeviceName());
+
+                list.add(alarmGrVO);
+            }
+
+        }
+
+        return new CommonPage<>(list,page.getTotal(),pageNum,pageSize);
+
+    }
+}

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

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

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

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

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

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

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

@@ -3,17 +3,22 @@ package com.usky.park.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.park.domain.DmpDevice;
-import com.usky.park.domain.DataRealTime;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.park.domain.*;
+import com.usky.park.service.DataEvHistoryService;
+import com.usky.park.service.DataGrHistoryService;
+import com.usky.park.service.DataLgHistoryService;
 import com.usky.park.mapper.DmpDeviceMapper;
-import com.usky.park.service.DataRealTimeService;
-import com.usky.park.service.DmpDeviceService;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,8 +44,17 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
     @Autowired
     private DataRealTimeService dataRealTimeService;
 
+    @Autowired
+    private DataGrHistoryService dataGrHistoryService;
+
+    @Autowired
+    private DataEvHistoryService dataEvHistoryService;
+
+    @Autowired
+    private DataLgHistoryService dataLgHistoryService;
+
     @Override
-    public CommonPage<DmpDeviceVO> dmpDeviceList(String deviceName,String installAddress,String deviceType,String deviceStatus,String doorStatus,String startDate,String endDate,Integer pageNum,Integer pageSize){
+    public CommonPage<DmpDeviceVO> dmpDeviceList(String deviceName,String installAddress,Integer deviceType,String deviceStatus,String doorStatus,String switchStatus,String startDate,String endDate,Integer pageNum,Integer pageSize){
 
         LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DmpDevice::getDeviceId,DmpDevice::getDeviceName,DmpDevice::getDeviceType,DmpDevice::getInstallAddress,DmpDevice::getCreatedTime)
@@ -64,8 +78,6 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                     .in(DataRealTime::getDeviceId,deviceIdList);
             list1 = dataRealTimeService.list(queryWrapper1);
 
-
-
             List<DataRealTime> list2 = new ArrayList<>();
             LambdaQueryWrapper<DataRealTime> queryWrapper2 = Wrappers.lambdaQuery();
             queryWrapper2.select(DataRealTime::getDeviceId,DataRealTime::getAttributeName,DataRealTime::getAttributeData)
@@ -74,6 +86,14 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
             list2 = dataRealTimeService.list(queryWrapper2);
 
 
+            List<DataRealTime> switchList = new ArrayList<>();
+            LambdaQueryWrapper<DataRealTime> queryWrapper3 = Wrappers.lambdaQuery();
+            queryWrapper3.select(DataRealTime::getDeviceId,DataRealTime::getAttributeName,DataRealTime::getAttributeData)
+                    .eq(DataRealTime::getAttributeName,"switch_status")
+                    .in(DataRealTime::getDeviceId,deviceIdList);
+            switchList = dataRealTimeService.list(queryWrapper3);
+
+
             List<DmpDeviceVO> list3 = new ArrayList<>();
             for(int i=0;i<pagelist.size();i++){
 
@@ -99,19 +119,35 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                         }
                     }
                 }
+
+                if(switchList.size()>0){
+                    for(int j=0;j<switchList.size();j++){
+                        if(pagelist.get(i).getDeviceId().equals(switchList.get(j).getDeviceId())){
+                            dmpDeviceVO.setSwitchStatus(switchList.get(j).getAttributeData());
+                        }
+                    }
+                }
                 list3.add(dmpDeviceVO);
             }
 
-            if(deviceStatus.length()>0){
+            if(StringUtils.isNotBlank(deviceStatus)){
                 list = list3.stream().filter(e -> deviceStatus.equals(e.getDeviceStatus())).collect(Collectors.toList());
             }
 
-            if(doorStatus.length()>0){
+            if(StringUtils.isNotBlank(doorStatus)){
                 list = list3.stream().filter(e -> doorStatus.equals(e.getDoorStatus())).collect(Collectors.toList());
             }
 
-            if((deviceStatus.length()==0 )&&(doorStatus.length()==0)){
-                list = list3;
+            if(StringUtils.isNotBlank(switchStatus)){
+                list = list3.stream().filter(e -> switchStatus.equals(e.getSwitchStatus())).collect(Collectors.toList());
+            }
+
+            if((StringUtils.isBlank(deviceStatus))&&(StringUtils.isBlank(doorStatus))&&(StringUtils.isBlank(switchStatus))){
+                if(list3.size()>0){
+                    for(int i=0;i<list3.size();i++){
+                        list.add(list3.get(i));
+                    }
+                }
             }
 
         }
@@ -140,6 +176,11 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                 .like(StringUtils.isNotBlank(installAddress),DmpDevice::getInstallAddress,installAddress)
                 .eq(DmpDevice::getDeviceType,deviceType);
         devList = this.list(queryWrapper);
+
+        if(devList.size() <=0){
+            return new CommonPage<>(list,0,pageNum,pageSize);
+        }
+
         if(devList.size()>0){
             for(int i=0;i<devList.size();i++){
                 Map<String,Object> map = new HashMap<>();
@@ -163,9 +204,7 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
                                 found = false;
                             }
                         }
-
                     }
-
                     if(deviceType == 510){
                         if(found){
                             list.add(map);
@@ -196,4 +235,89 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
         return new CommonPage<>(objectList,total,pageNum,pageSize);
     }
 
+    public List<HistoryAttributeVO> deviceHistoryDataList(String deviceId, Integer deviceType, List<String> deviceAttribute, String startDate, String endDate){
+        List<HistoryAttributeVO> list = new ArrayList<>();
+        switch (deviceType){
+            case 504:
+                for(int i=0;i<deviceAttribute.size();i++){
+                    HistoryAttributeVO historyAttributeVO = new HistoryAttributeVO();
+
+                    historyAttributeVO.setDeviceAttribute(deviceAttribute.get(i));
+                    List<KeyValueVO> list2 = new ArrayList<>();
+
+                    LambdaQueryWrapper<DataGrHistory> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.select(DataGrHistory::getAttributeData,DataGrHistory::getDataTime)
+                            .eq(DataGrHistory::getDeviceId,deviceId)
+                            .eq(DataGrHistory::getAttributeName,deviceAttribute.get(i))
+                            .between(DataGrHistory::getDataTime,startDate,endDate);
+                    List<DataGrHistory> grList = dataGrHistoryService.list(queryWrapper1);
+                    if(CollectionUtils.isNotEmpty(grList)){
+                        for(int j=0;j< grList.size();j++){
+                            KeyValueVO keyValueVO = new KeyValueVO();
+                            keyValueVO.setValue(grList.get(j).getAttributeData());
+                            keyValueVO.setTime(grList.get(j).getDataTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                            list2.add(keyValueVO);
+                        }
+                    }
+                    historyAttributeVO.setKvList(list2);
+                    list.add(historyAttributeVO);
+                }
+
+                break;
+            case 509:
+                for(int i=0;i<deviceAttribute.size();i++){
+                    HistoryAttributeVO historyAttributeVO = new HistoryAttributeVO();
+
+                    historyAttributeVO.setDeviceAttribute(deviceAttribute.get(i));
+                    List<KeyValueVO> list2 = new ArrayList<>();
+
+                    LambdaQueryWrapper<DataEvHistory> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.select(DataEvHistory::getAttributeData,DataEvHistory::getDataTime)
+                            .eq(DataEvHistory::getDeviceId,deviceId)
+                            .eq(DataEvHistory::getAttributeName,deviceAttribute.get(i))
+                            .between(DataEvHistory::getDataTime,startDate,endDate);
+                    List<DataEvHistory> evList = dataEvHistoryService.list(queryWrapper1);
+                    if(CollectionUtils.isNotEmpty(evList)){
+                        for(int j=0;j< evList.size();j++){
+                            KeyValueVO keyValueVO = new KeyValueVO();
+                            keyValueVO.setValue(evList.get(j).getAttributeData());
+                            keyValueVO.setTime(evList.get(j).getDataTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                            list2.add(keyValueVO);
+                        }
+                    }
+                    historyAttributeVO.setKvList(list2);
+                    list.add(historyAttributeVO);
+                }
+                break;
+            case 510:
+                for(int i=0;i<deviceAttribute.size();i++){
+                    HistoryAttributeVO historyAttributeVO = new HistoryAttributeVO();
+
+                    historyAttributeVO.setDeviceAttribute(deviceAttribute.get(i));
+                    List<KeyValueVO> list2 = new ArrayList<>();
+
+                    LambdaQueryWrapper<DataLgHistory> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.select(DataLgHistory::getAttributeData,DataLgHistory::getDataTime)
+                            .eq(DataLgHistory::getDeviceId,deviceId)
+                            .eq(DataLgHistory::getAttributeName,deviceAttribute.get(i))
+                            .between(DataLgHistory::getDataTime,startDate,endDate);
+                    List<DataLgHistory> lgList = dataLgHistoryService.list(queryWrapper1);
+                    if(CollectionUtils.isNotEmpty(lgList)){
+                        for(int j=0;j< lgList.size();j++){
+                            KeyValueVO keyValueVO = new KeyValueVO();
+                            keyValueVO.setValue(lgList.get(j).getAttributeData());
+                            keyValueVO.setTime(lgList.get(j).getDataTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                            list2.add(keyValueVO);
+                        }
+                    }
+                    historyAttributeVO.setKvList(list2);
+                    list.add(historyAttributeVO);
+                }
+
+                break;
+        }
+        return list;
+
+    }
+
 }

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

@@ -11,6 +11,7 @@ import com.usky.park.mapper.EventEgMapper;
 import com.usky.park.service.EventEgService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.park.service.vo.EventEgStatisticVO;
+import org.bouncycastle.util.StringList;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -57,20 +58,20 @@ public class EventEgServiceImpl extends AbstractCrudService<EventEgMapper, Event
     }
 
     @Override
-    public List<EventEgStatisticVO> eventEgStatistic(String deviceId,String startDate,String endDate){
+    public List<EventEgStatisticVO> eventEgStatistic(List<String> enterDeviceId, List<String> outDeviceId, String startDate, String endDate){
         List<EventEgStatisticVO> list = new ArrayList<>();
         EventEgStatisticVO eventEgStatisticVO = new EventEgStatisticVO();
-        eventEgStatisticVO.setEnterNum(numStatistic(deviceId,startDate,endDate,1));
-        eventEgStatisticVO.setOutNum(numStatistic(deviceId,startDate,endDate,0));
+        eventEgStatisticVO.setEnterNum(numStatistic(enterDeviceId,startDate,endDate,1));
+        eventEgStatisticVO.setOutNum(numStatistic(outDeviceId,startDate,endDate,0));
         list.add(eventEgStatisticVO);
 
         return list;
     }
 
-    public Integer numStatistic(String deviceId,String startDate,String endDate,Integer iType){
+    public Integer numStatistic(List<String> deviceId,String startDate,String endDate,Integer iType){
         Integer num = 0;
         LambdaQueryWrapper<EventEg> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(deviceId),EventEg::getDeviceId,deviceId)
+        queryWrapper.in(EventEg::getDeviceId,deviceId)
                 .between(EventEg::getEventTime,startDate,endDate)
                 .eq(EventEg::getInOutType,iType);
         num = this.count(queryWrapper);

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

@@ -0,0 +1,57 @@
+package com.usky.park.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AlarmGrVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警内容
+     */
+    private String alarmDesc;
+
+    /**
+     * 告警时间
+     */
+    private String alarmTime;
+
+    /**
+     * 告警值
+     */
+    private BigDecimal alarmValue;
+
+    /**
+     * 处理状态（0、未处理 1、已处理）
+     */
+    private Integer handlingStatus;
+}

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

@@ -54,4 +54,9 @@ public class DmpDeviceVO  implements Serializable {
      */
     private String doorStatus;
 
+    /**
+     * 照明开关状态（0 关闭 1 打开）
+     */
+    private String switchStatus;
+
 }

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

@@ -0,0 +1,30 @@
+package com.usky.park.service.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class HistoryAttributeVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String deviceAttribute;
+
+    private List<KeyValueVO> kvList;
+
+}

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

@@ -0,0 +1,29 @@
+package com.usky.park.service.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-04-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class KeyValueVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String value;
+
+    private String time;
+}

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9887
+  port: 9889
 
 # Spring
 spring: 

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

@@ -0,0 +1,23 @@
+<?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.park.mapper.AlarmGrMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.domain.AlarmGr">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_desc" property="alarmDesc" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="expand_field" property="expandField" />
+        <result column="handler" property="handler" />
+        <result column="handling_time" property="handlingTime" />
+        <result column="handling_content" property="handlingContent" />
+        <result column="handling_status" property="handlingStatus" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-park/service-park-biz/src/main/resources/mapper/park/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.park.mapper.DataEvHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.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-park/service-park-biz/src/main/resources/mapper/park/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.park.mapper.DataGrHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.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-park/service-park-biz/src/main/resources/mapper/park/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.park.mapper.DataLgHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.park.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>