diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
new file mode 100644
index 0000000..6d18616
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowAlarmProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    public List<List<Map<String, String>>> gasFlowAlarmBuilder(Integer intervalDays) {
+        DataScope scope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getGasFlowDevType(scope);
+        List<Map<String, String>> alarmByDayList = gasFlowHomeMapper.countAlarmByDay(scope, intervalDays);
+        List<List<Map<String, String>>> gasFlowAlarmList = alarmDayBuilder(deviceList, alarmByDayList, intervalDays);
+        return gasFlowAlarmList;
+    }
+
+    private List<List<Map<String, String>>> alarmDayBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("typeName"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("count")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
new file mode 100644
index 0000000..6d18616
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowAlarmProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    public List<List<Map<String, String>>> gasFlowAlarmBuilder(Integer intervalDays) {
+        DataScope scope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getGasFlowDevType(scope);
+        List<Map<String, String>> alarmByDayList = gasFlowHomeMapper.countAlarmByDay(scope, intervalDays);
+        List<List<Map<String, String>>> gasFlowAlarmList = alarmDayBuilder(deviceList, alarmByDayList, intervalDays);
+        return gasFlowAlarmList;
+    }
+
+    private List<List<Map<String, String>>> alarmDayBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("typeName"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("count")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
new file mode 100644
index 0000000..4dd12de
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowDataProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    /* 1、去当前日期格式   2、构建相应的结构
+     * */
+    public Map<String, Double> dateBuilder(String deviceType) throws DataAccessException {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        Map<String, String> dateMap = dateBuilder();
+        Map<String, Double> dataMap = new HashMap<>();
+        dataMap.put("total", gasFlowHomeMapper.gasTotalUsed(dataScope, Long.valueOf(deviceType)));
+        dataMap.put("month", gasFlowHomeMapper.gasMonthUsed(dataScope, Long.valueOf(deviceType), dateMap.get("month")));
+        dataMap.put("day", gasFlowHomeMapper.gasDayUsed(dataScope, Long.valueOf(deviceType), dateMap.get("day")));
+        return dataMap;
+    }
+
+    /**
+     * 1、取设备基础数据 2、取各设备近七日数据、总数据  3、构建返回结构
+     */
+    public  List<List<Map<String, String>>>  trendBuilder(String deviceType, Integer intervalDay) {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getDevice(Long.valueOf(deviceType));
+        deviceList.add("total");
+        List<Map<String, String>> gasDayList = gasFlowHomeMapper.countGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        List<Map<String, String>> totalGasDayList = gasFlowHomeMapper.totalGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        gasDayList.addAll(totalGasDayList);
+        List<List<Map<String, String>>> devcodeTrendList = devcodeDataBuilder(deviceList, gasDayList, intervalDay);
+        return devcodeTrendList;
+    }
+
+    private Map<String, String> dateBuilder() {
+        Map<String, String> dateMap = new HashMap<>();
+        Calendar currentDate = Calendar.getInstance();
+        currentDate.setTime(new Date());
+        dateMap.put("day", dayFormate.format(currentDate.getTime()));
+        dateMap.put("month", monthFormate.format(currentDate.getTime()));
+        return dateMap;
+    }
+
+    private List<List<Map<String, String>>> devcodeDataBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("devcode"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("dayTotal")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
new file mode 100644
index 0000000..6d18616
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowAlarmProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    public List<List<Map<String, String>>> gasFlowAlarmBuilder(Integer intervalDays) {
+        DataScope scope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getGasFlowDevType(scope);
+        List<Map<String, String>> alarmByDayList = gasFlowHomeMapper.countAlarmByDay(scope, intervalDays);
+        List<List<Map<String, String>>> gasFlowAlarmList = alarmDayBuilder(deviceList, alarmByDayList, intervalDays);
+        return gasFlowAlarmList;
+    }
+
+    private List<List<Map<String, String>>> alarmDayBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("typeName"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("count")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
new file mode 100644
index 0000000..4dd12de
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowDataProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    /* 1、去当前日期格式   2、构建相应的结构
+     * */
+    public Map<String, Double> dateBuilder(String deviceType) throws DataAccessException {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        Map<String, String> dateMap = dateBuilder();
+        Map<String, Double> dataMap = new HashMap<>();
+        dataMap.put("total", gasFlowHomeMapper.gasTotalUsed(dataScope, Long.valueOf(deviceType)));
+        dataMap.put("month", gasFlowHomeMapper.gasMonthUsed(dataScope, Long.valueOf(deviceType), dateMap.get("month")));
+        dataMap.put("day", gasFlowHomeMapper.gasDayUsed(dataScope, Long.valueOf(deviceType), dateMap.get("day")));
+        return dataMap;
+    }
+
+    /**
+     * 1、取设备基础数据 2、取各设备近七日数据、总数据  3、构建返回结构
+     */
+    public  List<List<Map<String, String>>>  trendBuilder(String deviceType, Integer intervalDay) {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getDevice(Long.valueOf(deviceType));
+        deviceList.add("total");
+        List<Map<String, String>> gasDayList = gasFlowHomeMapper.countGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        List<Map<String, String>> totalGasDayList = gasFlowHomeMapper.totalGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        gasDayList.addAll(totalGasDayList);
+        List<List<Map<String, String>>> devcodeTrendList = devcodeDataBuilder(deviceList, gasDayList, intervalDay);
+        return devcodeTrendList;
+    }
+
+    private Map<String, String> dateBuilder() {
+        Map<String, String> dateMap = new HashMap<>();
+        Calendar currentDate = Calendar.getInstance();
+        currentDate.setTime(new Date());
+        dateMap.put("day", dayFormate.format(currentDate.getTime()));
+        dateMap.put("month", monthFormate.format(currentDate.getTime()));
+        return dateMap;
+    }
+
+    private List<List<Map<String, String>>> devcodeDataBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("devcode"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("dayTotal")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 677ff1e..f0f94b6 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -57,12 +57,13 @@
                 lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
                 checkDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
             } catch (Exception ex) {
-                log.error("主题:供气表接收展示，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
+                log.error("主题:供气表接收日期出现异常，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex.getMessage());
             }
             gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
             gasFlowMonth.setMonth(sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataGasFlow.getUptime());
+
             // 计算与上一条日用气量的差值
             Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
 
@@ -74,9 +75,11 @@
             int dateDelta = (int) delhour / 24;
             totalFlowDayRet = delhour == 0 ? 0 : totalFlowDelta / delhour * 24;
             checkDay.add(Calendar.DATE, 1);
+            //如果间隔为1，可能是同一天，或者是间隔一天，进行时差的进一步判断
+            checkDay.add(Calendar.DATE, 1);
             //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
             if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
-                noIntervalDayGasFlow(gasFlowDay, delhour,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
+                noIntervalDayGasFlow(gasFlowDay,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
             } else if (today.get(Calendar.DATE) - checkDay.get(Calendar.DATE) == 0) {
                 intervalOfDayGasFlow(gasFlowDay, lastDay, totalFlowDayRet, totalFlowDelta, lastDayAcc, gasFlowMonth, dataGasFlow);
             } else {
@@ -94,15 +97,17 @@
         return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 
+
+
     /**
      * 没有间隔
      */
     private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay,
-                                      long delhour,
                                       Map<String, Object> lastDayAcc,
                                       Double flowAccDayRet,
-                                      Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
-
+                                      Double flowAccDelta,
+                                      DataGasFlowMonth gasFlowMonth,
+                                      DataGasFlow dataGasFlow) {
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
         gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
         this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getWellCode(), gasFlowDay.getDate(),
@@ -115,8 +120,7 @@
             gasFlowMonth.setId((Long) monthExist.get("id"));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         } else {
-            Double totalFlowMonth = flowAccDelta - Double.valueOf(gasFlowMonth.getFirstTotal());
-            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(totalFlowMonth.toString())));
+            gasFlowMonth.setTotalFlowMonth(df2.format(flowAccDayRet));
             gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
@@ -133,7 +137,7 @@
                                       Map<String, Object> lastDayAcc,
                                       DataGasFlowMonth gasFlowMonth,
                                       DataGasFlow dataGasFlow) {
-        // 更新月用水量
+        // 更新月用气量
         lastDay.add(Calendar.DATE, 1);
         gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
@@ -202,7 +206,7 @@
                 }
             }
         }
-        if (dayDelta > 0) {
+        if (dayDelta > 0&&monthExist!=null) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
             Double flowMonth = lastDay.get(Calendar.DATE) == 1 ? lastTimeDiff : Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + lastTimeDiff;

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
new file mode 100644
index 0000000..6d18616
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowAlarmProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    public List<List<Map<String, String>>> gasFlowAlarmBuilder(Integer intervalDays) {
+        DataScope scope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getGasFlowDevType(scope);
+        List<Map<String, String>> alarmByDayList = gasFlowHomeMapper.countAlarmByDay(scope, intervalDays);
+        List<List<Map<String, String>>> gasFlowAlarmList = alarmDayBuilder(deviceList, alarmByDayList, intervalDays);
+        return gasFlowAlarmList;
+    }
+
+    private List<List<Map<String, String>>> alarmDayBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("typeName"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("count")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
new file mode 100644
index 0000000..4dd12de
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowDataProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    /* 1、去当前日期格式   2、构建相应的结构
+     * */
+    public Map<String, Double> dateBuilder(String deviceType) throws DataAccessException {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        Map<String, String> dateMap = dateBuilder();
+        Map<String, Double> dataMap = new HashMap<>();
+        dataMap.put("total", gasFlowHomeMapper.gasTotalUsed(dataScope, Long.valueOf(deviceType)));
+        dataMap.put("month", gasFlowHomeMapper.gasMonthUsed(dataScope, Long.valueOf(deviceType), dateMap.get("month")));
+        dataMap.put("day", gasFlowHomeMapper.gasDayUsed(dataScope, Long.valueOf(deviceType), dateMap.get("day")));
+        return dataMap;
+    }
+
+    /**
+     * 1、取设备基础数据 2、取各设备近七日数据、总数据  3、构建返回结构
+     */
+    public  List<List<Map<String, String>>>  trendBuilder(String deviceType, Integer intervalDay) {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getDevice(Long.valueOf(deviceType));
+        deviceList.add("total");
+        List<Map<String, String>> gasDayList = gasFlowHomeMapper.countGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        List<Map<String, String>> totalGasDayList = gasFlowHomeMapper.totalGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        gasDayList.addAll(totalGasDayList);
+        List<List<Map<String, String>>> devcodeTrendList = devcodeDataBuilder(deviceList, gasDayList, intervalDay);
+        return devcodeTrendList;
+    }
+
+    private Map<String, String> dateBuilder() {
+        Map<String, String> dateMap = new HashMap<>();
+        Calendar currentDate = Calendar.getInstance();
+        currentDate.setTime(new Date());
+        dateMap.put("day", dayFormate.format(currentDate.getTime()));
+        dateMap.put("month", monthFormate.format(currentDate.getTime()));
+        return dateMap;
+    }
+
+    private List<List<Map<String, String>>> devcodeDataBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("devcode"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("dayTotal")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 677ff1e..f0f94b6 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -57,12 +57,13 @@
                 lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
                 checkDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
             } catch (Exception ex) {
-                log.error("主题:供气表接收展示，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
+                log.error("主题:供气表接收日期出现异常，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex.getMessage());
             }
             gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
             gasFlowMonth.setMonth(sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataGasFlow.getUptime());
+
             // 计算与上一条日用气量的差值
             Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
 
@@ -74,9 +75,11 @@
             int dateDelta = (int) delhour / 24;
             totalFlowDayRet = delhour == 0 ? 0 : totalFlowDelta / delhour * 24;
             checkDay.add(Calendar.DATE, 1);
+            //如果间隔为1，可能是同一天，或者是间隔一天，进行时差的进一步判断
+            checkDay.add(Calendar.DATE, 1);
             //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
             if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
-                noIntervalDayGasFlow(gasFlowDay, delhour,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
+                noIntervalDayGasFlow(gasFlowDay,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
             } else if (today.get(Calendar.DATE) - checkDay.get(Calendar.DATE) == 0) {
                 intervalOfDayGasFlow(gasFlowDay, lastDay, totalFlowDayRet, totalFlowDelta, lastDayAcc, gasFlowMonth, dataGasFlow);
             } else {
@@ -94,15 +97,17 @@
         return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 
+
+
     /**
      * 没有间隔
      */
     private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay,
-                                      long delhour,
                                       Map<String, Object> lastDayAcc,
                                       Double flowAccDayRet,
-                                      Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
-
+                                      Double flowAccDelta,
+                                      DataGasFlowMonth gasFlowMonth,
+                                      DataGasFlow dataGasFlow) {
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
         gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
         this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getWellCode(), gasFlowDay.getDate(),
@@ -115,8 +120,7 @@
             gasFlowMonth.setId((Long) monthExist.get("id"));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         } else {
-            Double totalFlowMonth = flowAccDelta - Double.valueOf(gasFlowMonth.getFirstTotal());
-            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(totalFlowMonth.toString())));
+            gasFlowMonth.setTotalFlowMonth(df2.format(flowAccDayRet));
             gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
@@ -133,7 +137,7 @@
                                       Map<String, Object> lastDayAcc,
                                       DataGasFlowMonth gasFlowMonth,
                                       DataGasFlow dataGasFlow) {
-        // 更新月用水量
+        // 更新月用气量
         lastDay.add(Calendar.DATE, 1);
         gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
@@ -202,7 +206,7 @@
                 }
             }
         }
-        if (dayDelta > 0) {
+        if (dayDelta > 0&&monthExist!=null) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
             Double flowMonth = lastDay.get(Calendar.DATE) == 1 ? lastTimeDiff : Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + lastTimeDiff;
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java
new file mode 100644
index 0000000..3ad57f6
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java
@@ -0,0 +1,155 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class GasFlowHomeServiceImpl implements GasFlowHomeService {
+
+    private final GasFlowHomeMapper gasFlowHomeMapper;
+    private final GasFlowDataProvider gasFlowDataProvider;
+    private final ICommonPermissionService permissionService;
+    private final GasFlowAlarmProvider gasFlowAlarmProvider;
+
+    public Object statisticsUsed(String deviceType, String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                Map<String, Double> dataMap = gasFlowDataProvider.dateBuilder(deviceType);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(dataMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                log.error("主题：气体用气量统计查询异常，设备类型{}，异常信息{}", deviceType, dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    public Object statisticsTrend(String deviceType, Integer intervalDay) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                List<List<Map<String, String>>> dataMap = gasFlowDataProvider.trendBuilder(deviceType, intervalDay);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(dataMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+                log.error("主题：气体用气量走势图查询异常,设备类型{}，异常信息{}", deviceType, dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    /**
+     * 1、如果是在范围内，取范围内的数据
+     * 2、如果不在范围内，取当前最大范围的平均值*天数，但小于当前的最大值
+     *
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    public Object gasUsed(String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, String>> dataList = gasFlowHomeMapper.gasUsedByDevice(permissionService.getCurrUserDataScope(), beginTime, endTime);
+            Map<String, String> dataMap = dataList.stream().collect(
+                    Collectors.toMap(e -> e.get("devcode"), e -> e.get("count"))
+            );
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(dataMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+
+    public Object alarmTrend(Integer intervalDays) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<List<Map<String, String>>> dataMap = gasFlowAlarmProvider.gasFlowAlarmBuilder(intervalDays);
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(dataMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+    public Object leakRate(String deviceType, String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                Map<String, Integer> resultMap = new HashMap<>();
+                Integer total = gasFlowHomeMapper.countRecData(permissionService.getCurrUserDataScope(), beginTime, endTime, Long.valueOf(deviceType));
+                Integer leakNum = gasFlowHomeMapper.countRecAlarm(permissionService.getCurrUserDataScope(), beginTime, endTime, Long.valueOf(deviceType));
+                resultMap.put("leakage", leakNum);
+                resultMap.put("normal", total - leakNum);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(resultMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+                log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    public Object statisticsRate(String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, String>> alarmList = gasFlowHomeMapper.statisticsRate(permissionService.getCurrUserDataScope(), beginTime, endTime);
+            Map<String, String> resultMap = alarmList.stream().collect(
+                    Collectors.toMap(e -> e.get("deviceName"), e -> e.get("count"))
+            );
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(resultMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+    private Boolean CheckType(String deviceType) {
+        return "15,16,17".contains(deviceType);
+    }
+
+}

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
new file mode 100644
index 0000000..2685c0a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import com.casic.missiles.modular.system.service.IGasFlowDataService;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author cz
+ * @Date 2022-11-10
+ */
+@RestController
+@RequestMapping("/gas")
+@AllArgsConstructor
+public class GasFlowHomeController {
+
+    private final GasFlowHomeService gasFlowHomeService;
+
+    @ApiOperation("气体用气量统计")
+    @RequestMapping("/statistics/used")
+    public Object statisticsUsed(@RequestParam(required = false) String deviceType,
+                                 @RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime);
+    }
+
+    @ApiOperation("气体用气量走势图")
+    @RequestMapping("/statistics/trend")
+    public Object statisticsTrend(@RequestParam(required = false) String deviceType,
+                                  @RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.statisticsTrend(deviceType,intervalDay);
+    }
+
+    @ApiOperation("设备用气量统计")
+    @RequestMapping("/used")
+    public Object gasUsed(@RequestParam(required = false) String beginTime,
+                          @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.gasUsed(beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计")
+    @RequestMapping("/alarm/trend")
+    public Object alarmTrend(@RequestParam(required = true) Integer intervalDay) {
+        return gasFlowHomeService.alarmTrend(intervalDay);
+    }
+
+    @ApiOperation("气体泄露监测")
+    @RequestMapping("/leakage/rate")
+    public Object leakRate(@RequestParam(required = true) String deviceType,
+                            @RequestParam(required = false) String beginTime,
+                           @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.leakRate(deviceType,beginTime, endTime);
+    }
+
+    @ApiOperation("用气量超量报警统计占比")
+    @RequestMapping("/statistics/rate")
+    public Object statisticsRate(@RequestParam(required = false) String beginTime,
+                                 @RequestParam(required = false) String endTime) {
+        return gasFlowHomeService.statisticsRate(beginTime, endTime);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
new file mode 100644
index 0000000..e5118df
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/GasFlowHomeMapper.java
@@ -0,0 +1,53 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.core.datascope.DataScope;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface GasFlowHomeMapper {
+
+    /**
+     *  气体用气量统计
+     */
+    Double gasTotalUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType);
+
+    Double gasMonthUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                        @Param("month") String month);
+    Double gasDayUsed(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType,
+                      @Param("day") String dayTime);
+
+    /**
+     *  气体用气量走势图
+     */
+    List<String> getDevice(@Param("deviceType") Long deviceType);
+
+    List<Map<String, String>> countGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    List<Map<String, String>> totalGasByDay(@Param("scope") DataScope dataScope, @Param("deviceType") Long deviceType, @Param("IntervalDay") Integer IntervalDay);
+
+    /**
+     *  设备用气量统计
+     */
+    List<Map<String, String>> gasUsedByDevice(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /**
+     *  气体泄露监测
+     */
+    Integer countRecData(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+
+    Integer countRecAlarm(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") Long deviceType);
+     /*  用气量超量报警统计占比
+     */
+    List<Map<String, String>> statisticsRate(@Param("scope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    /**
+     *  用气量超量报警统计
+     */
+    List<Map<String, String>> countAlarmByDay(@Param("scope") DataScope dataScope,@Param("IntervalDay") Integer IntervalDay);
+
+    List<String> getGasFlowDevType(@Param("scope") DataScope dataScope);
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
new file mode 100644
index 0000000..d0bd58c
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasHomeMapper.xml
@@ -0,0 +1,211 @@
+<?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.casic.missiles.modular.system.dao.GasFlowHomeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="INSTANT_FLOW" property="instantFlow"/>
+        <result column="INSTANTS_VELOCITY" property="instantsVelocity"/>
+        <result column="AMBOCETOR_TEMPERTURE" property="ambocetorTemperture"/>
+        <result column="TOTAL_FLOW" property="totalFlow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+          ID AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, INSTANT_FLOW AS instantFlow,
+          INSTANTS_VELOCITY AS instantsVelocity, AMBOCETOR_TEMPERTURE AS ambocetorTemperture,
+          TOTAL_FLOW AS totalFlow,UPTIME AS uptime, LOGTIME AS logtime,DESCN AS descn,
+    </sql>
+
+    <select id="gasTotalUsed" resultType="java.lang.Double">
+        SELECT CAST(SUM(total_Flow) AS DECIMAL (10, 2)) AS sumComm
+        FROM (
+                SELECT
+                    total_Flow,
+                    MAX( UPTIME )
+                FROM
+                    data_gasflow dg
+                    JOIN bus_device bd ON bd.devcode = dg.devcode
+                WHERE
+                    bd.VALID = '1'
+                    AND bd.device_type =#{deviceType}
+                GROUP BY
+                    dg.DEVCODE
+              )bgd
+    </select>
+
+    <select id="gasMonthUsed" resultType="java.lang.Double">
+        SELECT
+	        cast( SUM( TOTAL_FLOW_MONTH ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_MONTH
+            FROM
+                data_gasflow_month dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type = #{deviceType}
+                AND MONTH=#{month}
+        ) bgd
+    </select>
+
+    <select id="gasDayUsed" resultType="java.lang.Double">
+        SELECT
+            cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS sumComm
+        FROM
+        (
+            SELECT
+                TOTAL_FLOW_DATE
+            FROM
+                data_gasflow_day dg
+                JOIN bus_device bd ON bd.devcode = dg.devcode
+            WHERE
+                bd.VALID = '1'
+                AND bd.device_type =#{deviceType}
+              AND DATE=#{day}
+        ) bgd
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT TOTAL_FLOW_DATE  as "dayTotal",DATE,dg.devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type =#{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+    </select>
+
+    <select id="countGasByDay" resultType="map">
+        SELECT   cast( SUM( TOTAL_FLOW_DATE ) AS DECIMAL ( 10, 2 ) ) AS "dayTotal",DATE,"total"  AS devcode
+        FROM  data_gasflow_day dg
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        AND bd.device_type = #{deviceType}
+        AND datediff(now(), date_format(DATE, '%Y%m%d')) <![CDATA[< ]]>  #{IntervalDay}
+        GROUP BY  DATE
+    </select>
+
+    <select id="getDevice" resultType="java.lang.String">
+        SELECT  devcode
+        FROM   bus_device
+        WHERE  device_type = #{deviceType}
+                AND  VALID = '1'
+    </select>
+
+    <select id="gasUsed" resultType="Map">
+        SELECT bd.devcode,MAX(TOTAL_FLOW)-MIN(TOTAL_FLOW) AS count
+        FROM (
+        SELECT DISTINCT dg.devcode
+        FROM data_gasflow dg
+        JOIN bus_device bd ON bd.DEVCODE=dg.DEVCODE
+        WHERE bd.VALID='1'
+        )bd
+        LEFT JOIN (SELECT *
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) dg on bd.DEVCODE=dg.DEVCODE
+        GROUP BY bd.devcode
+    </select>
+
+    <select id="countRecData" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data_gasflow
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="countRecAlarm" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM alarm_records
+        JOIN bus_device bd ON bd.devcode = dg.devcode
+        WHERE bd.VALID = '1' AND bd.device_type = #{deviceType}
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+
+    <select id="statisticsRate" resultType="Map">
+        SELECT SUM(CASE WHEN ALARM_CONTENT like '%报警' THEN 1 ELSE 0 END ) AS "报警",
+        SUM(CASE WHEN ALARM_CONTENT like '%预警' THEN 1 ELSE 0 END ) AS "预警",TYPE_NAME AS "deviceName"
+        FROM
+        (
+        SELECT DISTINCT
+        TYPE_NAME,
+        bd.devcode
+        FROM
+        data_gasflow dg
+        JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE
+        WHERE
+        bd.VALID = '1'
+        ) bd
+        LEFT JOIN (
+        SELECT *
+        FROM alarm_records
+        WHERE 1 = 1
+        <if test="beginTime != null and beginTime != '' ">
+            AND UPTIME <![CDATA[ >= ]]>
+            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND UPTIME  <![CDATA[ <= ]]>
+            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        ) ar ON bd.devcode = ar.DEVCODE
+        GROUP BY bd.TYPE_NAME
+    </select>
+
+    <select id="countAlarmByDay" resultType="map">
+        SELECT count( ar.id ) AS "count",(SELECT date_format( ALARM_TIME, '%Y%m%d' )) alarmTime,bdt.type_name as "typeName"
+        FROM
+        bus_device bd
+        JOIN base_device_type bdt  ON  bd.DEVICE_TYPE=bdt.id
+        JOIN data_gasflow dg   ON bd.devcode = dg.devcode
+        JOIN ( SELECT *
+               FROM alarm_records
+               WHERE datediff( now(), date_format( ALARM_TIME, '%Y%m%d' )) <![CDATA[< ]]>  #{IntervalDay}
+        ) ar ON ar.devcode = bd.devcode
+        WHERE bd.VALID = '1'
+        GROUP BY alarmTime
+    </select>
+
+    <select id="getGasFlowDevType" resultType="java.lang.String">
+            SELECT  distinct TYPE_NAME
+            FROM
+                bus_device bd
+                JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.id
+                JOIN data_gasflow dg ON bd.devcode = dg.devcode
+            WHERE  bd.VALID='1'
+    </select>
+
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index faf1e9e..12144d2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -127,10 +127,7 @@
 
 
     <sql id="WatchData_Column_List">
-        d
-        .
-        ID
-        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
     </sql>
 
     <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
new file mode 100644
index 0000000..698919a
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service;
+
+
+/**
+ * 气体流量计首页接口
+ */
+public interface GasFlowHomeService {
+
+    Object statisticsUsed(String deviceType, String beginTime, String endTime);
+
+    Object statisticsTrend(String deviceType,Integer intervalDay);
+
+    Object gasUsed(String beginTime, String endTime);
+
+    Object alarmTrend(Integer intervalDays);
+
+    Object leakRate(String deviceType,String beginTime, String endTime);
+
+    Object statisticsRate(String beginTime, String endTime);
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
index c196fdf..fd2b31e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IGasFlowDataService.java
@@ -6,7 +6,7 @@
 
 import java.util.Map;
 
-public interface IGasFlowDataService  extends IService<DataGasFlow> {
+public interface IGasFlowDataService extends IService<DataGasFlow> {
 
     double saveGasFlowData(DataGasFlow dataGasFlow);
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
new file mode 100644
index 0000000..6d18616
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java
@@ -0,0 +1,60 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowAlarmProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    public List<List<Map<String, String>>> gasFlowAlarmBuilder(Integer intervalDays) {
+        DataScope scope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getGasFlowDevType(scope);
+        List<Map<String, String>> alarmByDayList = gasFlowHomeMapper.countAlarmByDay(scope, intervalDays);
+        List<List<Map<String, String>>> gasFlowAlarmList = alarmDayBuilder(deviceList, alarmByDayList, intervalDays);
+        return gasFlowAlarmList;
+    }
+
+    private List<List<Map<String, String>>> alarmDayBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("typeName"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("count")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
new file mode 100644
index 0000000..4dd12de
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataProvider.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class GasFlowDataProvider {
+    private SimpleDateFormat dayFormate = new SimpleDateFormat("yyyy-MM-dd");
+    private SimpleDateFormat dayFormate2 = new SimpleDateFormat("yyyy/MM/dd");
+    private SimpleDateFormat monthFormate = new SimpleDateFormat("yyyy-MM");
+    @Autowired
+    private ICommonPermissionService permissionService;
+    @Resource
+    private GasFlowHomeMapper gasFlowHomeMapper;
+
+    /* 1、去当前日期格式   2、构建相应的结构
+     * */
+    public Map<String, Double> dateBuilder(String deviceType) throws DataAccessException {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        Map<String, String> dateMap = dateBuilder();
+        Map<String, Double> dataMap = new HashMap<>();
+        dataMap.put("total", gasFlowHomeMapper.gasTotalUsed(dataScope, Long.valueOf(deviceType)));
+        dataMap.put("month", gasFlowHomeMapper.gasMonthUsed(dataScope, Long.valueOf(deviceType), dateMap.get("month")));
+        dataMap.put("day", gasFlowHomeMapper.gasDayUsed(dataScope, Long.valueOf(deviceType), dateMap.get("day")));
+        return dataMap;
+    }
+
+    /**
+     * 1、取设备基础数据 2、取各设备近七日数据、总数据  3、构建返回结构
+     */
+    public  List<List<Map<String, String>>>  trendBuilder(String deviceType, Integer intervalDay) {
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> deviceList = gasFlowHomeMapper.getDevice(Long.valueOf(deviceType));
+        deviceList.add("total");
+        List<Map<String, String>> gasDayList = gasFlowHomeMapper.countGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        List<Map<String, String>> totalGasDayList = gasFlowHomeMapper.totalGasByDay(dataScope, Long.valueOf(deviceType), intervalDay);
+        gasDayList.addAll(totalGasDayList);
+        List<List<Map<String, String>>> devcodeTrendList = devcodeDataBuilder(deviceList, gasDayList, intervalDay);
+        return devcodeTrendList;
+    }
+
+    private Map<String, String> dateBuilder() {
+        Map<String, String> dateMap = new HashMap<>();
+        Calendar currentDate = Calendar.getInstance();
+        currentDate.setTime(new Date());
+        dateMap.put("day", dayFormate.format(currentDate.getTime()));
+        dateMap.put("month", monthFormate.format(currentDate.getTime()));
+        return dateMap;
+    }
+
+    private List<List<Map<String, String>>> devcodeDataBuilder(List<String> deviceList, List<Map<String, String>> gasDayList, Integer intervalDay) {
+        Map<String, Map<String, String>> gasDayMap = gasDayList.stream().collect(
+                Collectors.groupingBy(e -> e.get("devcode"),
+                        Collectors.toMap(e -> String.valueOf(e.get("date")), e -> String.valueOf(e.get("dayTotal")))
+                ));
+        List<List<Map<String, String>>> devcodeTrendList = new ArrayList<>();
+        Calendar beginDate = Calendar.getInstance();
+        beginDate.setTime(new Date());
+        beginDate.add(Calendar.DAY_OF_MONTH, 0 - intervalDay);
+        Calendar endDate = Calendar.getInstance();
+        endDate.setTime(new Date());
+        deviceList.stream().forEach(
+                devcode -> {
+                    List<Map<String, String>> mapList = new ArrayList<>();
+                    Map<String, String> gasDayDeviceMap = gasDayMap.get(devcode);
+                    while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
+                        Map dataMap = new HashMap();
+                        dataMap.put("date", dayFormate2.format(beginDate.getTime()));
+                        dataMap.put("count", gasDayDeviceMap.containsKey(dayFormate.format(beginDate.getTime())) ? gasDayDeviceMap.get(dayFormate.format(beginDate.getTime())) : "0");
+                        dataMap.put("typeTime", devcode);
+                        mapList.add(dataMap);
+                        beginDate.add(Calendar.DAY_OF_MONTH, 1);
+                    }
+                    devcodeTrendList.add(mapList);
+                }
+        );
+        return devcodeTrendList;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 677ff1e..f0f94b6 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -57,12 +57,13 @@
                 lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
                 checkDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
             } catch (Exception ex) {
-                log.error("主题:供气表接收展示，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
+                log.error("主题:供气表接收日期出现异常，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex.getMessage());
             }
             gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
             gasFlowMonth.setMonth(sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataGasFlow.getUptime());
+
             // 计算与上一条日用气量的差值
             Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
 
@@ -74,9 +75,11 @@
             int dateDelta = (int) delhour / 24;
             totalFlowDayRet = delhour == 0 ? 0 : totalFlowDelta / delhour * 24;
             checkDay.add(Calendar.DATE, 1);
+            //如果间隔为1，可能是同一天，或者是间隔一天，进行时差的进一步判断
+            checkDay.add(Calendar.DATE, 1);
             //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
             if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
-                noIntervalDayGasFlow(gasFlowDay, delhour,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
+                noIntervalDayGasFlow(gasFlowDay,lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
             } else if (today.get(Calendar.DATE) - checkDay.get(Calendar.DATE) == 0) {
                 intervalOfDayGasFlow(gasFlowDay, lastDay, totalFlowDayRet, totalFlowDelta, lastDayAcc, gasFlowMonth, dataGasFlow);
             } else {
@@ -94,15 +97,17 @@
         return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 
+
+
     /**
      * 没有间隔
      */
     private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay,
-                                      long delhour,
                                       Map<String, Object> lastDayAcc,
                                       Double flowAccDayRet,
-                                      Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
-
+                                      Double flowAccDelta,
+                                      DataGasFlowMonth gasFlowMonth,
+                                      DataGasFlow dataGasFlow) {
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
         gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
         this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getWellCode(), gasFlowDay.getDate(),
@@ -115,8 +120,7 @@
             gasFlowMonth.setId((Long) monthExist.get("id"));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         } else {
-            Double totalFlowMonth = flowAccDelta - Double.valueOf(gasFlowMonth.getFirstTotal());
-            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(totalFlowMonth.toString())));
+            gasFlowMonth.setTotalFlowMonth(df2.format(flowAccDayRet));
             gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
@@ -133,7 +137,7 @@
                                       Map<String, Object> lastDayAcc,
                                       DataGasFlowMonth gasFlowMonth,
                                       DataGasFlow dataGasFlow) {
-        // 更新月用水量
+        // 更新月用气量
         lastDay.add(Calendar.DATE, 1);
         gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
         gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
@@ -202,7 +206,7 @@
                 }
             }
         }
-        if (dayDelta > 0) {
+        if (dayDelta > 0&&monthExist!=null) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
             Double flowMonth = lastDay.get(Calendar.DATE) == 1 ? lastTimeDiff : Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + lastTimeDiff;
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java
new file mode 100644
index 0000000..3ad57f6
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java
@@ -0,0 +1,155 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.modular.system.dao.GasFlowHomeMapper;
+import com.casic.missiles.modular.system.service.GasFlowHomeService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class GasFlowHomeServiceImpl implements GasFlowHomeService {
+
+    private final GasFlowHomeMapper gasFlowHomeMapper;
+    private final GasFlowDataProvider gasFlowDataProvider;
+    private final ICommonPermissionService permissionService;
+    private final GasFlowAlarmProvider gasFlowAlarmProvider;
+
+    public Object statisticsUsed(String deviceType, String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                Map<String, Double> dataMap = gasFlowDataProvider.dateBuilder(deviceType);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(dataMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                log.error("主题：气体用气量统计查询异常，设备类型{}，异常信息{}", deviceType, dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    public Object statisticsTrend(String deviceType, Integer intervalDay) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                List<List<Map<String, String>>> dataMap = gasFlowDataProvider.trendBuilder(deviceType, intervalDay);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(dataMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+                log.error("主题：气体用气量走势图查询异常,设备类型{}，异常信息{}", deviceType, dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    /**
+     * 1、如果是在范围内，取范围内的数据
+     * 2、如果不在范围内，取当前最大范围的平均值*天数，但小于当前的最大值
+     *
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    public Object gasUsed(String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, String>> dataList = gasFlowHomeMapper.gasUsedByDevice(permissionService.getCurrUserDataScope(), beginTime, endTime);
+            Map<String, String> dataMap = dataList.stream().collect(
+                    Collectors.toMap(e -> e.get("devcode"), e -> e.get("count"))
+            );
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(dataMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+
+    public Object alarmTrend(Integer intervalDays) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<List<Map<String, String>>> dataMap = gasFlowAlarmProvider.gasFlowAlarmBuilder(intervalDays);
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(dataMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+    public Object leakRate(String deviceType, String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        if (CheckType(deviceType)) {
+            try {
+                Map<String, Integer> resultMap = new HashMap<>();
+                Integer total = gasFlowHomeMapper.countRecData(permissionService.getCurrUserDataScope(), beginTime, endTime, Long.valueOf(deviceType));
+                Integer leakNum = gasFlowHomeMapper.countRecAlarm(permissionService.getCurrUserDataScope(), beginTime, endTime, Long.valueOf(deviceType));
+                resultMap.put("leakage", leakNum);
+                resultMap.put("normal", total - leakNum);
+                responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+                responseData.setMessage("查询成功");
+                responseData.setData(resultMap);
+            } catch (DataAccessException dae) {
+                responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+                responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+                log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+            }
+        } else {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage("设备类型不正确");
+        }
+        return responseData;
+    }
+
+    public Object statisticsRate(String beginTime, String endTime) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<Map<String, String>> alarmList = gasFlowHomeMapper.statisticsRate(permissionService.getCurrUserDataScope(), beginTime, endTime);
+            Map<String, String> resultMap = alarmList.stream().collect(
+                    Collectors.toMap(e -> e.get("deviceName"), e -> e.get("count"))
+            );
+            responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
+            responseData.setMessage("查询成功");
+            responseData.setData(resultMap);
+        } catch (DataAccessException dae) {
+            responseData.setCode(ResponseData.DEFAULT_ERROR_CODE);
+            responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE);
+            log.error("主题：气体用量查询异常，异常信息{}", dae.getMessage());
+        }
+        return responseData;
+    }
+
+    private Boolean CheckType(String deviceType) {
+        return "15,16,17".contains(deviceType);
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
index 030e4d6..0bb7a2b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
@@ -95,7 +95,8 @@
                                          Map<String, Object> lastDayAcc,
                                          Double flowAccDayRet,
                                          Double flowAccDelta,
-                                         Map<String, Object> waterMeterMonth, DataWaterMeter dataWaterMeter) {
+                                         Map<String, Object> waterMeterMonth,
+                                         DataWaterMeter dataWaterMeter) {
         waterMeterDay.put("flowAccDate", df2.format(flowAccDayRet));
         waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc()); // 当日水表读数
         // 当日用水量 = 当日水表读数 - 昨日水表读数