diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
new file mode 100644
index 0000000..a2ed0fd
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeviceDataListMapper;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据统计分析
+ *
+ * @author lwh
+ */
+@Slf4j
+@Component
+public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService {
+ @Resource
+ private AbstractDictService dictService;
+ @Resource
+ private IBusDeviceSupportService deviceSupportService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+ @Override
+ public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ @Override
+ public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
new file mode 100644
index 0000000..a2ed0fd
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeviceDataListMapper;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据统计分析
+ *
+ * @author lwh
+ */
+@Slf4j
+@Component
+public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService {
+ @Resource
+ private AbstractDictService dictService;
+ @Resource
+ private IBusDeviceSupportService deviceSupportService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+ @Override
+ public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ @Override
+ public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
new file mode 100644
index 0000000..bd7463f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataDig {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String ddata;
+ private String frequency;
+ private String descn;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
new file mode 100644
index 0000000..a2ed0fd
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeviceDataListMapper;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据统计分析
+ *
+ * @author lwh
+ */
+@Slf4j
+@Component
+public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService {
+ @Resource
+ private AbstractDictService dictService;
+ @Resource
+ private IBusDeviceSupportService deviceSupportService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+ @Override
+ public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ @Override
+ public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
new file mode 100644
index 0000000..bd7463f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataDig {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String ddata;
+ private String frequency;
+ private String descn;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
new file mode 100644
index 0000000..fbdaa71
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGas {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
new file mode 100644
index 0000000..a2ed0fd
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeviceDataListMapper;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据统计分析
+ *
+ * @author lwh
+ */
+@Slf4j
+@Component
+public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService {
+ @Resource
+ private AbstractDictService dictService;
+ @Resource
+ private IBusDeviceSupportService deviceSupportService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+ @Override
+ public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ @Override
+ public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
new file mode 100644
index 0000000..bd7463f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataDig {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String ddata;
+ private String frequency;
+ private String descn;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
new file mode 100644
index 0000000..fbdaa71
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGas {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java
new file mode 100644
index 0000000..ad3eca0
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGasLiquid {
+ private String devcode;
+ private String wellCode;
+ private String liquiddata;
+ private String cell;
+ private String strength;
+ private String logTime;
+ private String upTime;
+
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
new file mode 100644
index 0000000..fdf18bc
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+
+
+
+ ID AS id, WELL_CODE AS "wellCode", WELL_NAME AS "wellName", DEEP AS deep, COORDINATE_X AS "coordinateX",
+ COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu", LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode",
+ LAT_GAODE AS "latGaode", AREA AS area, POSITION AS position, DEPTID AS deptid, PHOTOS AS photos,
+ NOTES AS notes, WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
+ BFZT AS bfzt,d1.simplename AS "deptName",d2.id AS "responsibleDept",d2.simplename AS "responsibleDeptName"
+
+
+
+ and datediff(now(),dg.UPTIME) ${paramDay}
+
+
+
+ AND date_part('day',now()-dg.UPTIME) ${paramDay}
+
+
+
+ and date_part(now(),dg.UPTIME) ${paramDay}
+
+
+
+ '%' || #{keywords}|| '%'
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+ CONCAT('%',#{keywords},'%')
+
+
+
+ DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
+
+
+
+ ${paramStr}
+
+
+
+ TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+
+
+
+ TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+
+
+
+ '%' || #{wellCode}|| '%'
+
+
+ CONCAT('%',#{wellCode},'%')
+
+
+ CONCAT('%', #{wellCode}, '%')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
new file mode 100644
index 0000000..8df461f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -0,0 +1,62 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+
+import java.util.List;
+
+/**
+ * 数据统计服务接口
+ *
+ * @author zyn
+ */
+public interface DeviceDataListService extends IService {
+
+ /**
+ * 开挖监测仪数据查询
+ */
+ List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据条件检索井盖监测数据列表
+ */
+ List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ /**
+ * 根据检索条件查询液位检测数据
+ */
+ List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 燃气数据查询
+ */
+ List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 噪声记录仪数据查询
+ */
+ List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 有害气体数据查询
+ */
+ List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 温湿度数据查询
+ */
+ List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 井盖定位监测仪数据查询
+ */
+ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+ /**
+ * 管盯数据查询
+ */
+ List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+ List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
+}
\ No newline at end of file
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
new file mode 100644
index 0000000..a2ed0fd
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dao.DeviceDataListMapper;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import com.casic.missiles.modular.system.service.DeviceDataListService;
+import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据统计分析
+ *
+ * @author lwh
+ */
+@Slf4j
+@Component
+public class DeviceDataListServiceImpl extends ServiceImpl implements DeviceDataListService {
+ @Resource
+ private AbstractDictService dictService;
+ @Resource
+ private IBusDeviceSupportService deviceSupportService;
+ @Resource
+ private AbstractPermissionContext permissionService;
+
+ @Override
+ public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+
+ @Override
+ public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ @Override
+ public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+ return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ }
+
+ @Override
+ public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+
+ public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+ List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
+ return mapList;
+ }
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
new file mode 100644
index 0000000..bd7463f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataDig.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataDig {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String ddata;
+ private String frequency;
+ private String descn;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
new file mode 100644
index 0000000..fbdaa71
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGas.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGas {
+ private String logtime;
+ private String uptime;
+ private String devcode;
+ private String wellCode;
+ private String strength;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java
new file mode 100644
index 0000000..ad3eca0
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGasLiquid {
+ private String devcode;
+ private String wellCode;
+ private String liquiddata;
+ private String cell;
+ private String strength;
+ private String logTime;
+ private String upTime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java
new file mode 100644
index 0000000..33239d1
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataHarmfulGas {
+
+ private String devcode;
+ private String CO;
+ private String CH4;
+ private String H2S;
+ private String O2;
+ private String switchStart;
+ private String logtime;
+ private String uptime;
+}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
new file mode 100644
index 0000000..f167c0f
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.*;
+import com.casic.missiles.modular.system.model.BusWellInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 闸井信息表 Mapper 接口
+ *
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DeviceDataListMapper extends BaseMapper {
+ List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+ List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+
+ List