diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java
index 50931a7..9e31844 100644
--- a/src/main/java/com/casic/config/DeviceTypesConfig.java
+++ b/src/main/java/com/casic/config/DeviceTypesConfig.java
@@ -14,7 +14,7 @@
     @Value("${casic.config.deptId}")
     private Long topDeptId;
 
-    @Value("${casic.config.alarmDay}")
+    @Value("7")
     private Integer alarmDay;
 
     @Value("${casic.config.deviceYT}")

diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java
index 50931a7..9e31844 100644
--- a/src/main/java/com/casic/config/DeviceTypesConfig.java
+++ b/src/main/java/com/casic/config/DeviceTypesConfig.java
@@ -14,7 +14,7 @@
     @Value("${casic.config.deptId}")
     private Long topDeptId;
 
-    @Value("${casic.config.alarmDay}")
+    @Value("7")
     private Integer alarmDay;
 
     @Value("${casic.config.deviceYT}")
diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java
index 100d79a..370ad6b 100644
--- a/src/main/java/com/casic/service/impl/AlarmBulider.java
+++ b/src/main/java/com/casic/service/impl/AlarmBulider.java
@@ -52,7 +52,7 @@
              );
             Calendar beginDate = Calendar.getInstance();
             beginDate.setTime(new Date());
-            beginDate.add(Calendar.DAY_OF_MONTH, 0-deviceTypesConfig.getAlarmDay());
+            beginDate.add(Calendar.DAY_OF_MONTH, 1-deviceTypesConfig.getAlarmDay());
             Calendar endDate = Calendar.getInstance();
             endDate.setTime(new Date());
             while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
@@ -91,7 +91,7 @@
             Map<String, String> rateDeviceMap = new HashMap<>();
             Integer totalAlarm = deviceCountMap.containsKey(deviceType) ? Integer.valueOf(deviceCountMap.get(deviceType)) : 0;
             Integer alarmCount = alarmCountMap.containsKey(deviceType) ? Integer.valueOf(alarmCountMap.get(deviceType)) : 0;
-            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(Double.valueOf(alarmCount) / totalAlarm));
+            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(alarmCount.doubleValue() / totalAlarm.doubleValue()));
             rateDeviceMap.put("typeName", typeNameMap.get(deviceType));
             rateDeviceList.add(rateDeviceMap);
         }

diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java
index 50931a7..9e31844 100644
--- a/src/main/java/com/casic/config/DeviceTypesConfig.java
+++ b/src/main/java/com/casic/config/DeviceTypesConfig.java
@@ -14,7 +14,7 @@
     @Value("${casic.config.deptId}")
     private Long topDeptId;
 
-    @Value("${casic.config.alarmDay}")
+    @Value("7")
     private Integer alarmDay;
 
     @Value("${casic.config.deviceYT}")
diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java
index 100d79a..370ad6b 100644
--- a/src/main/java/com/casic/service/impl/AlarmBulider.java
+++ b/src/main/java/com/casic/service/impl/AlarmBulider.java
@@ -52,7 +52,7 @@
              );
             Calendar beginDate = Calendar.getInstance();
             beginDate.setTime(new Date());
-            beginDate.add(Calendar.DAY_OF_MONTH, 0-deviceTypesConfig.getAlarmDay());
+            beginDate.add(Calendar.DAY_OF_MONTH, 1-deviceTypesConfig.getAlarmDay());
             Calendar endDate = Calendar.getInstance();
             endDate.setTime(new Date());
             while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
@@ -91,7 +91,7 @@
             Map<String, String> rateDeviceMap = new HashMap<>();
             Integer totalAlarm = deviceCountMap.containsKey(deviceType) ? Integer.valueOf(deviceCountMap.get(deviceType)) : 0;
             Integer alarmCount = alarmCountMap.containsKey(deviceType) ? Integer.valueOf(alarmCountMap.get(deviceType)) : 0;
-            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(Double.valueOf(alarmCount) / totalAlarm));
+            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(alarmCount.doubleValue() / totalAlarm.doubleValue()));
             rateDeviceMap.put("typeName", typeNameMap.get(deviceType));
             rateDeviceList.add(rateDeviceMap);
         }
diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java
index c83053e..20c8bc6 100644
--- a/src/main/java/com/casic/service/impl/ScreenDataManger.java
+++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java
@@ -5,11 +5,14 @@
 import com.casic.dao.spantilt.TiltDataMapper;
 import com.casic.model.ResponseData;
 import com.casic.service.ScreenDataService;
+import com.casic.util.FormatUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -140,7 +143,9 @@
     public Object getAlarmRecordsByRoad(String beginTime, String endTime) {
         List<Map<String, String>> rateDeviceList = null;
         try {
-            rateDeviceList = smartwellDataMapper.countAlarmByRoad(beginTime, endTime);
+            //默认统计本年度的所有报警次数，开始时间默认本年度第一天
+            beginTime =  FormatUtil.getYearFirst();
+            rateDeviceList = smartwellDataMapper.countAlarmByRoad("'"+beginTime+"'", endTime);
         } catch (DataAccessException dex) {
             log.error("主题：以道路的维度统计燃气管线监控中的报警情况出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex);
         }

diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java
index 50931a7..9e31844 100644
--- a/src/main/java/com/casic/config/DeviceTypesConfig.java
+++ b/src/main/java/com/casic/config/DeviceTypesConfig.java
@@ -14,7 +14,7 @@
     @Value("${casic.config.deptId}")
     private Long topDeptId;
 
-    @Value("${casic.config.alarmDay}")
+    @Value("7")
     private Integer alarmDay;
 
     @Value("${casic.config.deviceYT}")
diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java
index 100d79a..370ad6b 100644
--- a/src/main/java/com/casic/service/impl/AlarmBulider.java
+++ b/src/main/java/com/casic/service/impl/AlarmBulider.java
@@ -52,7 +52,7 @@
              );
             Calendar beginDate = Calendar.getInstance();
             beginDate.setTime(new Date());
-            beginDate.add(Calendar.DAY_OF_MONTH, 0-deviceTypesConfig.getAlarmDay());
+            beginDate.add(Calendar.DAY_OF_MONTH, 1-deviceTypesConfig.getAlarmDay());
             Calendar endDate = Calendar.getInstance();
             endDate.setTime(new Date());
             while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
@@ -91,7 +91,7 @@
             Map<String, String> rateDeviceMap = new HashMap<>();
             Integer totalAlarm = deviceCountMap.containsKey(deviceType) ? Integer.valueOf(deviceCountMap.get(deviceType)) : 0;
             Integer alarmCount = alarmCountMap.containsKey(deviceType) ? Integer.valueOf(alarmCountMap.get(deviceType)) : 0;
-            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(Double.valueOf(alarmCount) / totalAlarm));
+            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(alarmCount.doubleValue() / totalAlarm.doubleValue()));
             rateDeviceMap.put("typeName", typeNameMap.get(deviceType));
             rateDeviceList.add(rateDeviceMap);
         }
diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java
index c83053e..20c8bc6 100644
--- a/src/main/java/com/casic/service/impl/ScreenDataManger.java
+++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java
@@ -5,11 +5,14 @@
 import com.casic.dao.spantilt.TiltDataMapper;
 import com.casic.model.ResponseData;
 import com.casic.service.ScreenDataService;
+import com.casic.util.FormatUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -140,7 +143,9 @@
     public Object getAlarmRecordsByRoad(String beginTime, String endTime) {
         List<Map<String, String>> rateDeviceList = null;
         try {
-            rateDeviceList = smartwellDataMapper.countAlarmByRoad(beginTime, endTime);
+            //默认统计本年度的所有报警次数，开始时间默认本年度第一天
+            beginTime =  FormatUtil.getYearFirst();
+            rateDeviceList = smartwellDataMapper.countAlarmByRoad("'"+beginTime+"'", endTime);
         } catch (DataAccessException dex) {
             log.error("主题：以道路的维度统计燃气管线监控中的报警情况出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex);
         }
diff --git a/src/main/java/com/casic/util/FormatUtil.java b/src/main/java/com/casic/util/FormatUtil.java
index 5bae0a0..56325c7 100644
--- a/src/main/java/com/casic/util/FormatUtil.java
+++ b/src/main/java/com/casic/util/FormatUtil.java
@@ -1,10 +1,27 @@
 package com.casic.util;
 
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 public class FormatUtil {
 
     public static DecimalFormat DF = new DecimalFormat("0.00%");
     public static DecimalFormat DF2 = new DecimalFormat("0.00");
 
+
+    public static String DEFAULT_FORMAT = "yyyy-MM-dd";
+    public static String  getYearFirst(){
+        Calendar currCal=Calendar.getInstance();
+        int currentYear = currCal.get(Calendar.YEAR);
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+        calendar.set(Calendar.YEAR, currentYear);
+        Date currYearFirst = calendar.getTime();
+        SimpleDateFormat f = new SimpleDateFormat(DEFAULT_FORMAT);
+        String sDate = f.format(currYearFirst);
+        return sDate;
+    }
+
 }

diff --git a/src/main/java/com/casic/config/DeviceTypesConfig.java b/src/main/java/com/casic/config/DeviceTypesConfig.java
index 50931a7..9e31844 100644
--- a/src/main/java/com/casic/config/DeviceTypesConfig.java
+++ b/src/main/java/com/casic/config/DeviceTypesConfig.java
@@ -14,7 +14,7 @@
     @Value("${casic.config.deptId}")
     private Long topDeptId;
 
-    @Value("${casic.config.alarmDay}")
+    @Value("7")
     private Integer alarmDay;
 
     @Value("${casic.config.deviceYT}")
diff --git a/src/main/java/com/casic/service/impl/AlarmBulider.java b/src/main/java/com/casic/service/impl/AlarmBulider.java
index 100d79a..370ad6b 100644
--- a/src/main/java/com/casic/service/impl/AlarmBulider.java
+++ b/src/main/java/com/casic/service/impl/AlarmBulider.java
@@ -52,7 +52,7 @@
              );
             Calendar beginDate = Calendar.getInstance();
             beginDate.setTime(new Date());
-            beginDate.add(Calendar.DAY_OF_MONTH, 0-deviceTypesConfig.getAlarmDay());
+            beginDate.add(Calendar.DAY_OF_MONTH, 1-deviceTypesConfig.getAlarmDay());
             Calendar endDate = Calendar.getInstance();
             endDate.setTime(new Date());
             while (beginDate.getTime().compareTo(endDate.getTime()) <= 0) {
@@ -91,7 +91,7 @@
             Map<String, String> rateDeviceMap = new HashMap<>();
             Integer totalAlarm = deviceCountMap.containsKey(deviceType) ? Integer.valueOf(deviceCountMap.get(deviceType)) : 0;
             Integer alarmCount = alarmCountMap.containsKey(deviceType) ? Integer.valueOf(alarmCountMap.get(deviceType)) : 0;
-            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(Double.valueOf(alarmCount) / totalAlarm));
+            rateDeviceMap.put("rate", totalAlarm == 0 ? "0.00%" : FormatUtil.DF.format(alarmCount.doubleValue() / totalAlarm.doubleValue()));
             rateDeviceMap.put("typeName", typeNameMap.get(deviceType));
             rateDeviceList.add(rateDeviceMap);
         }
diff --git a/src/main/java/com/casic/service/impl/ScreenDataManger.java b/src/main/java/com/casic/service/impl/ScreenDataManger.java
index c83053e..20c8bc6 100644
--- a/src/main/java/com/casic/service/impl/ScreenDataManger.java
+++ b/src/main/java/com/casic/service/impl/ScreenDataManger.java
@@ -5,11 +5,14 @@
 import com.casic.dao.spantilt.TiltDataMapper;
 import com.casic.model.ResponseData;
 import com.casic.service.ScreenDataService;
+import com.casic.util.FormatUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -140,7 +143,9 @@
     public Object getAlarmRecordsByRoad(String beginTime, String endTime) {
         List<Map<String, String>> rateDeviceList = null;
         try {
-            rateDeviceList = smartwellDataMapper.countAlarmByRoad(beginTime, endTime);
+            //默认统计本年度的所有报警次数，开始时间默认本年度第一天
+            beginTime =  FormatUtil.getYearFirst();
+            rateDeviceList = smartwellDataMapper.countAlarmByRoad("'"+beginTime+"'", endTime);
         } catch (DataAccessException dex) {
             log.error("主题：以道路的维度统计燃气管线监控中的报警情况出现数据异常,开始时间{},结束时间{},异常信息{}", beginTime, endTime, dex);
         }
diff --git a/src/main/java/com/casic/util/FormatUtil.java b/src/main/java/com/casic/util/FormatUtil.java
index 5bae0a0..56325c7 100644
--- a/src/main/java/com/casic/util/FormatUtil.java
+++ b/src/main/java/com/casic/util/FormatUtil.java
@@ -1,10 +1,27 @@
 package com.casic.util;
 
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 public class FormatUtil {
 
     public static DecimalFormat DF = new DecimalFormat("0.00%");
     public static DecimalFormat DF2 = new DecimalFormat("0.00");
 
+
+    public static String DEFAULT_FORMAT = "yyyy-MM-dd";
+    public static String  getYearFirst(){
+        Calendar currCal=Calendar.getInstance();
+        int currentYear = currCal.get(Calendar.YEAR);
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+        calendar.set(Calendar.YEAR, currentYear);
+        Date currYearFirst = calendar.getTime();
+        SimpleDateFormat f = new SimpleDateFormat(DEFAULT_FORMAT);
+        String sDate = f.format(currYearFirst);
+        return sDate;
+    }
+
 }
diff --git a/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml b/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml
index b11e603..e3365e1 100644
--- a/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml
+++ b/src/main/resources/mapper/smartwell/SmartwellDataMapper.xml
@@ -2,17 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.dao.smartwell.SmartwellDataMapper">
 
-    <sql id="date_tochar" databaseId="mysql">
-       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
-    </sql>
 
-    <sql id="date_tochar" databaseId="pgsql">
-        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
-    </sql>
-
-    <sql id="date_tochar" databaseId="oracle">
-        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
-    </sql>
 
     <select id="countAlarmType" resultType="Map">
         SELECT count(ar.Id) as count,bd.DEVICE_TYPE as "deviceType"
@@ -21,27 +11,34 @@
         WHERE bd.VALID='1'
         AND ar.status='1'
         <if test="beginTime != null and beginTime != '' ">
-            AND ar.UPTIME <![CDATA[ >= ]]>
-            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time <![CDATA[ >= ]]>
+            TO_TIMESTAMP(${beginTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
+
         </if>
         <if test="endTime != null and endTime != ''">
-            AND ar.UPTIME  <![CDATA[ <= ]]>
-            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time  <![CDATA[ <= ]]>
+            TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         GROUP BY bd.DEVICE_TYPE
     </select>
 
     <select id="getTypeName" resultType="Map">
-        SELECT  id,type_name  AS "typeName"
-        FROM   base_device_type
+        SELECT id, type_name AS "typeName"
+        FROM base_device_type
     </select>
 
     <select id="countDeviceByType" resultType="Map">
-        SELECT  count(*)  AS  count,DEVICE_TYPE AS "deviceType"
-        FROM bus_device  bd
-		JOIN BUS_DEVICE_WELL   bdw   on   bdw.device_id=bd.id
-		join bus_well_info  bwi  on   bwi.id=bdw.well_id
-        GROUP BY  DEVICE_TYPE
+        SELECT count(*) AS  count,DEVICE_TYPE AS "deviceType"
+        FROM bus_device bd
+            JOIN BUS_DEVICE_WELL bdw
+        on bdw.device_id=bd.id
+            join bus_well_info bwi on bwi.id=bdw.well_id
+        WHERE
+            bwi.VALID = '1'
+          AND bdw.VALID = '1'
+          AND bd.VALID = '1'
+          and bwi.deptid != 1727306292566474754
+        GROUP BY DEVICE_TYPE
     </select>
 
     <select id="countAlarmByRoad" resultType="Map">
@@ -49,15 +46,14 @@
         FROM bus_well_info bwi
         LEFT JOIN alarm_records ar ON ar.WELL_CODE=bwi.WELL_CODE
         WHERE bwi.VALID='1'
-        AND ar.status='1'
-        AND bwi.road is not null
+          AND bwi.road is not null
         <if test="beginTime != null and beginTime != '' ">
-            AND ar.UPTIME <![CDATA[ >= ]]>
-            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time <![CDATA[ >= ]]>
+            TO_TIMESTAMP(${beginTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         <if test="endTime != null and endTime != ''">
-            AND ar.UPTIME  <![CDATA[ <= ]]>
-            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time  <![CDATA[ <= ]]>
+            TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         GROUP BY bwi.road
         ORDER BY 总计 DESC
@@ -71,21 +67,23 @@
         JOIN alarm_records ar on bd.devcode=ar.devcode
         WHERE bwi.valid='1' AND bdw.valid='1'
         <if test="beginTime != null and beginTime != '' ">
-            AND ar.UPTIME <![CDATA[ >= ]]>
-            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time <![CDATA[ >= ]]>
+            TO_TIMESTAMP(${beginTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
+
         </if>
         <if test="endTime != null and endTime != ''">
-            AND ar.UPTIME  <![CDATA[ <= ]]>
-            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time  <![CDATA[ <= ]]>
+            TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
     </select>
 
     <select id="countDeviceNumber" resultType="Integer">
-           	SELECT  count(bd.DEVCODE)
-			FROM  bus_device  bd
-			JOIN  bus_device_well  bdw  ON bdw.device_id=bd.id
-			JOIN  bus_well_info    bwi  ON bwi.id=bdw.well_id
-			WHERE bwi.valid='1'  AND  bdw.valid='1'
+        SELECT count(bd.DEVCODE)
+        FROM bus_device bd
+                 JOIN bus_device_well bdw ON bdw.device_id = bd.id
+                 JOIN bus_well_info bwi ON bwi.id = bdw.well_id
+        WHERE bwi.valid = '1'
+          AND bdw.valid = '1'
     </select>
 
     <select id="countAlarmDeviceByDept" resultType="Map">
@@ -96,23 +94,24 @@
         JOIN alarm_records ar on bd.devcode=ar.devcode
         WHERE bwi.valid='1' AND bdw.valid='1'
         <if test="beginTime != null and beginTime != '' ">
-            AND ar.UPTIME <![CDATA[ >= ]]>
-            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time <![CDATA[ >= ]]>
+            TO_TIMESTAMP(${beginTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         <if test="endTime != null and endTime != ''">
-            AND ar.UPTIME  <![CDATA[ <= ]]>
-            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time  <![CDATA[ <= ]]>
+            TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         GROUP BY deptId
     </select>
 
     <select id="countDeviceNumberByDept" resultType="Map">
-           	SELECT  count(bd.DEVCODE)  as counts,deptId
-			FROM  bus_device  bd
-			JOIN  bus_device_well  bdw  ON bdw.device_id=bd.id
-			JOIN  bus_well_info    bwi  ON bwi.id=bdw.well_id
-			WHERE bwi.valid='1'  AND  bdw.valid='1'
-			GROUP  BY deptId
+        SELECT count(bd.DEVCODE) as counts, deptId
+        FROM bus_device bd
+                 JOIN bus_device_well bdw ON bdw.device_id = bd.id
+                 JOIN bus_well_info bwi ON bwi.id = bdw.well_id
+        WHERE bwi.valid = '1'
+          AND bdw.valid = '1'
+        GROUP BY deptId
     </select>
 
     <select id="countAlarmRoad" resultType="Map">
@@ -121,77 +120,103 @@
         JOIN bus_device_well bdw ON bdw.well_id=bwi.id
         JOIN bus_device bd ON bdw.device_id=bd.id
         JOIN (SELECT DISTINCT(devcode),status
-        from alarm_records  where status='1') ar ON bd.devcode = ar.devcode
+        from alarm_records where status='1') ar ON bd.devcode = ar.devcode
         WHERE bwi.valid='1' AND bdw.valid='1'
         AND road is NOT NULL
         <if test="beginTime != null and beginTime != '' ">
-            AND ar.UPTIME <![CDATA[ >= ]]>
-            TO_CHAR(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time <![CDATA[ >= ]]>
+            TO_TIMESTAMP(${beginTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         <if test="endTime != null and endTime != ''">
-            AND ar.UPTIME  <![CDATA[ <= ]]>
-            TO_CHAR(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            AND ar.alarm_time  <![CDATA[ <= ]]>
+            TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
         </if>
         GROUP BY bwi.road
     </select>
 
     <select id="countRoadNumber" resultType="Map">
-           	SELECT  count(bd.DEVCODE) AS count,bwi.road
-			FROM  bus_well_info  bwi
-		    JOIN  bus_device_well  bdw  ON bdw.well_id=bwi.id
-			JOIN  bus_device    bd  ON  bdw.device_id=bd.id
-			WHERE bwi.valid='1'  AND  bdw.valid='1' AND road is NOT NULL
-			GROUP BY  bwi.road
+        SELECT count(bd.DEVCODE) AS count,bwi.road
+        FROM bus_well_info bwi
+            JOIN bus_device_well bdw
+        ON bdw.well_id=bwi.id
+            JOIN bus_device bd ON bdw.device_id=bd.id
+        WHERE bwi.valid='1' AND bdw.valid='1' AND road is NOT NULL
+        GROUP BY bwi.road
     </select>
 
     <select id="getAlarmDevice" resultType="Map">
-          SELECT deptid,bd.devcode,min(arc.timespan)
-		  FROM  bus_device  bd
-		  JOIN  bus_device_well  bdw  ON bdw.device_id=bd.id
-		  JOIN  bus_well_info    bwi  ON bwi.id=bdw.well_id
-		  JOIN  ( SELECT CASE status  WHEN  '1'   THEN '0'  ELSE  round(cast(date_part('epoch', now() -ar.alarm_time)/60/60 as numeric ),1)  END  AS timespan,ar.devcode
-		          from alarm_records  ar
-							JOIN (SELECT devcode,max(alarm_time) as alarmtime FROM alarm_records GROUP BY devcode)
-							lar  ON  lar.alarmtime=ar.alarm_time AND lar.devcode=ar.devcode
-						 )  arc  ON  arc.devcode= bd.devcode
-		  WHERE bwi.valid='1'  AND  bdw.valid='1'
-		  GROUP BY bd.devcode,arc.timespan,deptid
+        SELECT deptid, bd.devcode, min(arc.timespan)
+        FROM bus_device bd
+                 JOIN bus_device_well bdw ON bdw.device_id = bd.id
+                 JOIN bus_well_info bwi ON bwi.id = bdw.well_id
+                 JOIN (SELECT CASE status
+                                  WHEN '1' THEN '0'
+                                  ELSE round(cast(date_part('epoch', now() - ar.alarm_time) / 60 / 60 as numeric),
+                                             1) END AS timespan,
+                              ar.devcode
+                       from alarm_records ar
+                                JOIN (SELECT devcode, max(alarm_time) as alarmtime
+                                      FROM alarm_records
+                                      GROUP BY devcode) lar
+                                     ON lar.alarmtime = ar.alarm_time AND lar.devcode = ar.devcode
+        ) arc ON arc.devcode = bd.devcode
+        WHERE bwi.valid = '1'
+          AND bdw.valid = '1'
+        GROUP BY bd.devcode, arc.timespan, deptid
     </select>
 
     <select id="getNormalDevice" resultType="Map">
-            SELECT  deptid,bd.devcode,round(cast(date_part('epoch', now() - bd.INSTALL_DATE)/60/60 as numeric ),1) as "timeSpan"
-            FROM  bus_device  bd
-            JOIN  bus_device_well  bdw  ON bdw.device_id=bd.id
-            JOIN  bus_well_info    bwi  ON bwi.id=bdw.well_id
-            WHERE bwi.valid='1'  AND  bdw.valid='1'
+        SELECT deptid,
+               bd.devcode,
+               round(cast(date_part('epoch', now() - bd.INSTALL_DATE) / 60 / 60 as numeric), 1) as "timeSpan"
+        FROM bus_device bd
+                 JOIN bus_device_well bdw ON bdw.device_id = bd.id
+                 JOIN bus_well_info bwi ON bwi.id = bdw.well_id
+        WHERE bwi.valid = '1'
+          AND bdw.valid = '1'
     </select>
 
     <select id="getDeptNameList" resultType="Map">
-		SELECT   id,simple_name  AS "name"
-		FROM     sys_dept
+        SELECT id, simple_name AS "name"
+        FROM sys_dept
     </select>
 
     <select id="getDeptIds" resultType="Map">
-		SELECT   id,simple_name  AS "name",dept_type  AS "deptType"
-		FROM     sys_dept
-		WHERE    pid=#{deptId}
+        SELECT id, simple_name AS "name", dept_type AS "deptType"
+        FROM sys_dept
+        WHERE pid = #{deptId}
     </select>
 
 
     <select id="getAlarmDeviceList" resultType="Map">
-	    SELECT  bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,bd.DEVCODE  AS devcode,bd.device_name  AS "deviceName",
-        LNG_GAODE  AS  "lngGaode",LAT_GAODE  AS  "latGaode",AREA  AS "area",POSITION  AS "position",
-        RESPONSIBLE_DEPT AS  "responsibleDept",PHOTOS  AS  photos,WELL_TYPE AS  wellType,STAFF AS staff,TEL AS "tel" ,
-        BFZT  AS  bfzt,DEPTID as  deptid,counts  AS  "isAlarm",DEVICE_TYPE AS  "deviceType"
-        FROM  bus_well_info  bwi
-        JOIN  bus_device_well   bdw  ON  bdw.WELL_ID=bwi.ID
-        JOIN  bus_device  bd  ON  bd.ID=bdw.DEVICE_ID
-        LEFT JOIN  (SELECT  count(*)  AS counts,ar.devcode
-				     FROM  alarm_records  ar
-					 WHERE ar.STATUS='1'
-					 GROUP BY  ar.devcode
-		            )arc  ON  bd.devcode=arc.devcode
-        WHERE bwi.valid='1'  AND  bdw.valid='1'
+        SELECT bwi.WELL_CODE    AS "wellCode",
+               WELL_NAME        AS "wellName",
+               DEEP             AS deep,
+               bd.DEVCODE       AS devcode,
+               bd.device_name   AS "deviceName",
+               LNG_GAODE        AS "lngGaode",
+               LAT_GAODE        AS "latGaode",
+               AREA             AS "area",
+               POSITION         AS "position",
+               RESPONSIBLE_DEPT AS "responsibleDept",
+               PHOTOS           AS photos,
+               WELL_TYPE        AS wellType,
+               STAFF            AS staff,
+               TEL              AS "tel",
+               BFZT             AS bfzt,
+               DEPTID           as deptid,
+               counts           AS "isAlarm",
+               DEVICE_TYPE      AS "deviceType"
+        FROM bus_well_info bwi
+                 JOIN bus_device_well bdw ON bdw.WELL_ID = bwi.ID
+                 JOIN bus_device bd ON bd.ID = bdw.DEVICE_ID
+                 LEFT JOIN (SELECT count(*) AS counts, ar.devcode
+                            FROM alarm_records ar
+                            WHERE ar.STATUS = '1'
+                            GROUP BY ar.devcode
+        ) arc ON bd.devcode = arc.devcode
+        WHERE bwi.valid = '1'
+          AND bdw.valid = '1'
     </select>
 
 
@@ -221,7 +246,7 @@
                     TO_TIMESTAMP(${endTime},'yyyy-MM-dd hh24:mi')::timestamp without time zone
                 </when>
                 <otherwise>
-                    AND date_part('day',now()-aj.create_time)   <![CDATA[< ]]> 30
+                    AND date_part('day',now()-aj.create_time)   <![CDATA[<= ]]> 30
                 </otherwise>
             </choose>
         </where>
@@ -229,25 +254,31 @@
     </select>
 
     <select id="countAlarmsByDay" resultType="map">
-        SELECT  alarmTimeDate,count(alarmTimes) AS  "count",COUNT(alarmWells) alarmWells
-        from (
-            SELECT   COUNT(*) AS alarmTimes,
-            COUNT(DISTINCT wellCode) AS alarmWells,
-            ( SELECT to_char(alarmTimeDate, 'yyyyMMdd' ) ) alarmTimeDate
-            FROM  alarm_now_view
-            where date_part('day',now()-alarmTimeDate)  <![CDATA[< ]]> #{alarmDay}
-            GROUP BY alarmTimeDate
-        ) alarmview
-        GROUP BY alarmTimeDate
+
+        SELECT COUNT
+        ( 1 )  AS "count",
+        COUNT ( DISTINCT well_code ) AS alarmWells,
+        ( SELECT to_char( alarm_time, 'yyyyMMdd' ) ) alarmTimeDate
+        FROM
+        alarm_records
+        WHERE
+        date_part( 'day', now( ) - alarm_time ) <![CDATA[< ]]> #{alarmDay}
+        GROUP BY
+        alarmTimeDate
     </select>
 
     <select id="getDeviceList" resultType="map">
-        SELECT  count(bd.devcode) AS count,device_type AS "deviceType",deptid
-        FROM  BUS_DEVICE  bd
-        JOIN  BUS_DEVICE_WELL  bdw  ON  bdw.device_id=bd.id
-        JOIN  BUS_WELL_INFO  bwi    ON  bdw.well_id=bwi.id
-        join  base_device_type  bdt  on bdt.id=bd.device_type
-        GROUP BY  deptid,device_type,type_name
+        SELECT count(bd.devcode) AS count,device_type AS "deviceType",deptid
+        FROM BUS_DEVICE bd
+            JOIN BUS_DEVICE_WELL bdw
+        ON bdw.device_id=bd.id
+            JOIN BUS_WELL_INFO bwi ON bdw.well_id=bwi.id
+            join base_device_type bdt on bdt.id=bd.device_type
+        WHERE
+            bwi.VALID = '1'
+          AND bdw.VALID = '1'
+          AND bd.VALID = '1'
+        GROUP BY deptid, device_type, type_name
     </select>
 
 </mapper>
\ No newline at end of file