diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index 5918107..5975d1b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -15,12 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/waterStatistic")
@@ -34,10 +33,12 @@
     @Autowired
     private IDeviceTypeService iDeviceTypeService;
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 查询一级分区各区用水量
+     * 不用了
      *
      * @return
      */
@@ -79,6 +80,7 @@
 
     /**
      * 查询一级分区7日用水量
+     * 不用了
      *
      * @return
      */
@@ -141,6 +143,7 @@
 
     /**
      * 查询二级分区7日用水量
+     * 二级分区用水走势图
      *
      * @return
      */
@@ -271,6 +274,146 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 查询二级分区用水量对比
+     *
+     * @return
+     */
+    @RequestMapping(value = "/waterCompare")
+    @ResponseBody
+    public Object waterCompareSecond(@RequestParam String areaId, @RequestParam String type, String startTime, String endTime) {
+        List<Area> areaList = iAreaService.selectList(null);
+        List<Area> areaLevel2List = new ArrayList<>();
+
+        areaList.forEach(area -> {
+            //根据一级区域过滤二级区域
+            if ("3".equals(area.getLevel().toString()) &&area.getPids()!=null&& area.getPids().contains("[" + areaId + "]")) {
+                areaLevel2List.add(area);
+            }
+        });
+
+        Calendar now = Calendar.getInstance();
+        Calendar comp = Calendar.getInstance();
+        String startTimeThis = ""; // 对比当期起始日期
+        String endTimeThis = ""; // 对比当期结束日期
+        String startTimeLast = ""; // 对比上期起始日期
+        String endTimeLast = ""; // 对比上期结束日期
+
+        String year = sdf.format(now.getTime()).substring(0, 4);
+
+        if (type.equalsIgnoreCase("year")) {
+            // 本期起止日期
+            startTimeThis = year + "-01-01";
+            endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+            // 上期起止日期
+            comp.add(Calendar.YEAR, -1);
+            String lastYear = sdf.format(comp.getTime()).substring(0, 4);
+            startTimeLast = lastYear + "-01-01";
+            endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+        } else if (type.equalsIgnoreCase("season")) {
+            // 本期起止日期
+            switch (now.get(Calendar.MONTH)) {
+                // 一季度
+                case Calendar.JANUARY:
+                case Calendar.FEBRUARY:
+                case Calendar.MARCH:
+                {
+                    startTimeThis = startTimeThis = year + "-01-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = sdf.format(comp.getTime()).substring(0, 4) + "-10-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 二季度
+                case Calendar.APRIL:
+                case Calendar.MAY:
+                case Calendar.JUNE:
+                {
+                    startTimeThis = startTimeThis = year + "-04-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-01-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 三季度
+                case Calendar.JULY:
+                case Calendar.AUGUST:
+                case Calendar.SEPTEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-07-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-04-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 四季度
+                case Calendar.OCTOBER:
+                case Calendar.NOVEMBER:
+                case Calendar.DECEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-10-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-07-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+            }
+        } else if (type.equalsIgnoreCase("other") || type.equalsIgnoreCase("day") ||
+                   type.equalsIgnoreCase("week") || type.equalsIgnoreCase("month")) {
+            // 本期起止日期
+            startTimeThis = startTime;
+            endTimeThis = endTime;
+            try {
+                now.setTime(sdfD.parse(endTime));
+                comp.setTime(sdfD.parse(startTime));
+                int delta = (int) ((comp.getTimeInMillis() - now.getTimeInMillis()) / (3600*24*1000));
+
+                now.add(Calendar.DATE, delta - 1);
+                comp.add(Calendar.DATE, delta - 1);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            startTimeLast = sdfD.format(comp.getTime());
+            endTimeLast = sdfD.format(now.getTime());
+        }
+
+        List<Map<String, Object>> resultMapList = new ArrayList<>();
+        // 寻找生产区内的所有二级分区
+        for (Area area2 : areaLevel2List) {
+            List<Long> childIdsList = new ArrayList<>();
+            Map<String, Object> areaSecondMap = new HashMap<>();
+            areaSecondMap.put("areaId", area2.getId());
+            areaSecondMap.put("areaName", area2.getAreaName());
+            areaSecondMap.put("nowTime", startTimeThis + "~" + endTimeThis);
+            areaSecondMap.put("lastTime", startTimeLast + "~" + endTimeLast);
+
+            for (Area area : areaList) {
+                if (area.getPids() != null && area.getPids().contains("[" + area2.getId() + "]")) {
+                    childIdsList.add(area.getId());
+                }
+            }
+            if (ToolUtil.isNotEmpty(childIdsList)) {
+                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("now", countThis);
+
+                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("last", countLast);
+            }
+            resultMapList.add(areaSecondMap);
+        }
+
+        return ResponseData.success(resultMapList);
+    }
+
 
     /**
      * 查询二级分区水表告警

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index 5918107..5975d1b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -15,12 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/waterStatistic")
@@ -34,10 +33,12 @@
     @Autowired
     private IDeviceTypeService iDeviceTypeService;
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 查询一级分区各区用水量
+     * 不用了
      *
      * @return
      */
@@ -79,6 +80,7 @@
 
     /**
      * 查询一级分区7日用水量
+     * 不用了
      *
      * @return
      */
@@ -141,6 +143,7 @@
 
     /**
      * 查询二级分区7日用水量
+     * 二级分区用水走势图
      *
      * @return
      */
@@ -271,6 +274,146 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 查询二级分区用水量对比
+     *
+     * @return
+     */
+    @RequestMapping(value = "/waterCompare")
+    @ResponseBody
+    public Object waterCompareSecond(@RequestParam String areaId, @RequestParam String type, String startTime, String endTime) {
+        List<Area> areaList = iAreaService.selectList(null);
+        List<Area> areaLevel2List = new ArrayList<>();
+
+        areaList.forEach(area -> {
+            //根据一级区域过滤二级区域
+            if ("3".equals(area.getLevel().toString()) &&area.getPids()!=null&& area.getPids().contains("[" + areaId + "]")) {
+                areaLevel2List.add(area);
+            }
+        });
+
+        Calendar now = Calendar.getInstance();
+        Calendar comp = Calendar.getInstance();
+        String startTimeThis = ""; // 对比当期起始日期
+        String endTimeThis = ""; // 对比当期结束日期
+        String startTimeLast = ""; // 对比上期起始日期
+        String endTimeLast = ""; // 对比上期结束日期
+
+        String year = sdf.format(now.getTime()).substring(0, 4);
+
+        if (type.equalsIgnoreCase("year")) {
+            // 本期起止日期
+            startTimeThis = year + "-01-01";
+            endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+            // 上期起止日期
+            comp.add(Calendar.YEAR, -1);
+            String lastYear = sdf.format(comp.getTime()).substring(0, 4);
+            startTimeLast = lastYear + "-01-01";
+            endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+        } else if (type.equalsIgnoreCase("season")) {
+            // 本期起止日期
+            switch (now.get(Calendar.MONTH)) {
+                // 一季度
+                case Calendar.JANUARY:
+                case Calendar.FEBRUARY:
+                case Calendar.MARCH:
+                {
+                    startTimeThis = startTimeThis = year + "-01-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = sdf.format(comp.getTime()).substring(0, 4) + "-10-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 二季度
+                case Calendar.APRIL:
+                case Calendar.MAY:
+                case Calendar.JUNE:
+                {
+                    startTimeThis = startTimeThis = year + "-04-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-01-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 三季度
+                case Calendar.JULY:
+                case Calendar.AUGUST:
+                case Calendar.SEPTEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-07-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-04-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 四季度
+                case Calendar.OCTOBER:
+                case Calendar.NOVEMBER:
+                case Calendar.DECEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-10-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-07-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+            }
+        } else if (type.equalsIgnoreCase("other") || type.equalsIgnoreCase("day") ||
+                   type.equalsIgnoreCase("week") || type.equalsIgnoreCase("month")) {
+            // 本期起止日期
+            startTimeThis = startTime;
+            endTimeThis = endTime;
+            try {
+                now.setTime(sdfD.parse(endTime));
+                comp.setTime(sdfD.parse(startTime));
+                int delta = (int) ((comp.getTimeInMillis() - now.getTimeInMillis()) / (3600*24*1000));
+
+                now.add(Calendar.DATE, delta - 1);
+                comp.add(Calendar.DATE, delta - 1);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            startTimeLast = sdfD.format(comp.getTime());
+            endTimeLast = sdfD.format(now.getTime());
+        }
+
+        List<Map<String, Object>> resultMapList = new ArrayList<>();
+        // 寻找生产区内的所有二级分区
+        for (Area area2 : areaLevel2List) {
+            List<Long> childIdsList = new ArrayList<>();
+            Map<String, Object> areaSecondMap = new HashMap<>();
+            areaSecondMap.put("areaId", area2.getId());
+            areaSecondMap.put("areaName", area2.getAreaName());
+            areaSecondMap.put("nowTime", startTimeThis + "~" + endTimeThis);
+            areaSecondMap.put("lastTime", startTimeLast + "~" + endTimeLast);
+
+            for (Area area : areaList) {
+                if (area.getPids() != null && area.getPids().contains("[" + area2.getId() + "]")) {
+                    childIdsList.add(area.getId());
+                }
+            }
+            if (ToolUtil.isNotEmpty(childIdsList)) {
+                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("now", countThis);
+
+                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("last", countLast);
+            }
+            resultMapList.add(areaSecondMap);
+        }
+
+        return ResponseData.success(resultMapList);
+    }
+
 
     /**
      * 查询二级分区水表告警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7e30d95..310b3c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,5 +17,6 @@
     List<Map<String,Object>> countByDayFirst(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     List<Map<String,Object>> alarmCountByDay(@Param("startTime")String startTime,@Param("endTime")String endTime);
     Map<String,Object> alarmBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
+    Map<String,Object> warningBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     Long countByFirstArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index 5918107..5975d1b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -15,12 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/waterStatistic")
@@ -34,10 +33,12 @@
     @Autowired
     private IDeviceTypeService iDeviceTypeService;
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 查询一级分区各区用水量
+     * 不用了
      *
      * @return
      */
@@ -79,6 +80,7 @@
 
     /**
      * 查询一级分区7日用水量
+     * 不用了
      *
      * @return
      */
@@ -141,6 +143,7 @@
 
     /**
      * 查询二级分区7日用水量
+     * 二级分区用水走势图
      *
      * @return
      */
@@ -271,6 +274,146 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 查询二级分区用水量对比
+     *
+     * @return
+     */
+    @RequestMapping(value = "/waterCompare")
+    @ResponseBody
+    public Object waterCompareSecond(@RequestParam String areaId, @RequestParam String type, String startTime, String endTime) {
+        List<Area> areaList = iAreaService.selectList(null);
+        List<Area> areaLevel2List = new ArrayList<>();
+
+        areaList.forEach(area -> {
+            //根据一级区域过滤二级区域
+            if ("3".equals(area.getLevel().toString()) &&area.getPids()!=null&& area.getPids().contains("[" + areaId + "]")) {
+                areaLevel2List.add(area);
+            }
+        });
+
+        Calendar now = Calendar.getInstance();
+        Calendar comp = Calendar.getInstance();
+        String startTimeThis = ""; // 对比当期起始日期
+        String endTimeThis = ""; // 对比当期结束日期
+        String startTimeLast = ""; // 对比上期起始日期
+        String endTimeLast = ""; // 对比上期结束日期
+
+        String year = sdf.format(now.getTime()).substring(0, 4);
+
+        if (type.equalsIgnoreCase("year")) {
+            // 本期起止日期
+            startTimeThis = year + "-01-01";
+            endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+            // 上期起止日期
+            comp.add(Calendar.YEAR, -1);
+            String lastYear = sdf.format(comp.getTime()).substring(0, 4);
+            startTimeLast = lastYear + "-01-01";
+            endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+        } else if (type.equalsIgnoreCase("season")) {
+            // 本期起止日期
+            switch (now.get(Calendar.MONTH)) {
+                // 一季度
+                case Calendar.JANUARY:
+                case Calendar.FEBRUARY:
+                case Calendar.MARCH:
+                {
+                    startTimeThis = startTimeThis = year + "-01-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = sdf.format(comp.getTime()).substring(0, 4) + "-10-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 二季度
+                case Calendar.APRIL:
+                case Calendar.MAY:
+                case Calendar.JUNE:
+                {
+                    startTimeThis = startTimeThis = year + "-04-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-01-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 三季度
+                case Calendar.JULY:
+                case Calendar.AUGUST:
+                case Calendar.SEPTEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-07-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-04-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 四季度
+                case Calendar.OCTOBER:
+                case Calendar.NOVEMBER:
+                case Calendar.DECEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-10-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-07-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+            }
+        } else if (type.equalsIgnoreCase("other") || type.equalsIgnoreCase("day") ||
+                   type.equalsIgnoreCase("week") || type.equalsIgnoreCase("month")) {
+            // 本期起止日期
+            startTimeThis = startTime;
+            endTimeThis = endTime;
+            try {
+                now.setTime(sdfD.parse(endTime));
+                comp.setTime(sdfD.parse(startTime));
+                int delta = (int) ((comp.getTimeInMillis() - now.getTimeInMillis()) / (3600*24*1000));
+
+                now.add(Calendar.DATE, delta - 1);
+                comp.add(Calendar.DATE, delta - 1);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            startTimeLast = sdfD.format(comp.getTime());
+            endTimeLast = sdfD.format(now.getTime());
+        }
+
+        List<Map<String, Object>> resultMapList = new ArrayList<>();
+        // 寻找生产区内的所有二级分区
+        for (Area area2 : areaLevel2List) {
+            List<Long> childIdsList = new ArrayList<>();
+            Map<String, Object> areaSecondMap = new HashMap<>();
+            areaSecondMap.put("areaId", area2.getId());
+            areaSecondMap.put("areaName", area2.getAreaName());
+            areaSecondMap.put("nowTime", startTimeThis + "~" + endTimeThis);
+            areaSecondMap.put("lastTime", startTimeLast + "~" + endTimeLast);
+
+            for (Area area : areaList) {
+                if (area.getPids() != null && area.getPids().contains("[" + area2.getId() + "]")) {
+                    childIdsList.add(area.getId());
+                }
+            }
+            if (ToolUtil.isNotEmpty(childIdsList)) {
+                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("now", countThis);
+
+                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("last", countLast);
+            }
+            resultMapList.add(areaSecondMap);
+        }
+
+        return ResponseData.success(resultMapList);
+    }
+
 
     /**
      * 查询二级分区水表告警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7e30d95..310b3c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,5 +17,6 @@
     List<Map<String,Object>> countByDayFirst(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     List<Map<String,Object>> alarmCountByDay(@Param("startTime")String startTime,@Param("endTime")String endTime);
     Map<String,Object> alarmBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
+    Map<String,Object> warningBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     Long countByFirstArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 0869697..ec384b1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -152,13 +152,32 @@
     </select>
     <select id="alarmBySecondArea" resultType="map">
         SELECT
-        IFNULL(COUNT(dd.`ID`),0) AS 'alarm',
+        IFNULL(COUNT(dd.`ID`),0) AS 'alarm'
+        FROM
+        alarm_records dd
+        LEFT JOIN device_view dv
+        ON dd.`DEVCODE` = dv.`DEVCODE`
+        where dv.VALID = '1' and dd.alarm_type = '1'
+        <if test="startTime != null and startTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ <= ]]>  #{endTime}
+        </if>
+        <if test="areaIds != null and areaIds != ''">
+            AND dv.`AREA` IN (${areaIds})
+        </if>
+        LIMIT 1
+    </select>
+
+    <select id="warningBySecondArea" resultType="map">
+        SELECT
         IFNULL(COUNT(dd.`ID`),0) AS 'warning'
         FROM
         alarm_records dd
         LEFT JOIN device_view dv
         ON dd.`DEVCODE` = dv.`DEVCODE`
-        where dv.VALID = '1'
+        where dv.VALID = '1' and dd.alarm_type = '3'
         <if test="startTime != null and startTime != ''">
             AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index 5918107..5975d1b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -15,12 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/waterStatistic")
@@ -34,10 +33,12 @@
     @Autowired
     private IDeviceTypeService iDeviceTypeService;
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 查询一级分区各区用水量
+     * 不用了
      *
      * @return
      */
@@ -79,6 +80,7 @@
 
     /**
      * 查询一级分区7日用水量
+     * 不用了
      *
      * @return
      */
@@ -141,6 +143,7 @@
 
     /**
      * 查询二级分区7日用水量
+     * 二级分区用水走势图
      *
      * @return
      */
@@ -271,6 +274,146 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 查询二级分区用水量对比
+     *
+     * @return
+     */
+    @RequestMapping(value = "/waterCompare")
+    @ResponseBody
+    public Object waterCompareSecond(@RequestParam String areaId, @RequestParam String type, String startTime, String endTime) {
+        List<Area> areaList = iAreaService.selectList(null);
+        List<Area> areaLevel2List = new ArrayList<>();
+
+        areaList.forEach(area -> {
+            //根据一级区域过滤二级区域
+            if ("3".equals(area.getLevel().toString()) &&area.getPids()!=null&& area.getPids().contains("[" + areaId + "]")) {
+                areaLevel2List.add(area);
+            }
+        });
+
+        Calendar now = Calendar.getInstance();
+        Calendar comp = Calendar.getInstance();
+        String startTimeThis = ""; // 对比当期起始日期
+        String endTimeThis = ""; // 对比当期结束日期
+        String startTimeLast = ""; // 对比上期起始日期
+        String endTimeLast = ""; // 对比上期结束日期
+
+        String year = sdf.format(now.getTime()).substring(0, 4);
+
+        if (type.equalsIgnoreCase("year")) {
+            // 本期起止日期
+            startTimeThis = year + "-01-01";
+            endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+            // 上期起止日期
+            comp.add(Calendar.YEAR, -1);
+            String lastYear = sdf.format(comp.getTime()).substring(0, 4);
+            startTimeLast = lastYear + "-01-01";
+            endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+        } else if (type.equalsIgnoreCase("season")) {
+            // 本期起止日期
+            switch (now.get(Calendar.MONTH)) {
+                // 一季度
+                case Calendar.JANUARY:
+                case Calendar.FEBRUARY:
+                case Calendar.MARCH:
+                {
+                    startTimeThis = startTimeThis = year + "-01-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = sdf.format(comp.getTime()).substring(0, 4) + "-10-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 二季度
+                case Calendar.APRIL:
+                case Calendar.MAY:
+                case Calendar.JUNE:
+                {
+                    startTimeThis = startTimeThis = year + "-04-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-01-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 三季度
+                case Calendar.JULY:
+                case Calendar.AUGUST:
+                case Calendar.SEPTEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-07-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-04-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 四季度
+                case Calendar.OCTOBER:
+                case Calendar.NOVEMBER:
+                case Calendar.DECEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-10-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-07-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+            }
+        } else if (type.equalsIgnoreCase("other") || type.equalsIgnoreCase("day") ||
+                   type.equalsIgnoreCase("week") || type.equalsIgnoreCase("month")) {
+            // 本期起止日期
+            startTimeThis = startTime;
+            endTimeThis = endTime;
+            try {
+                now.setTime(sdfD.parse(endTime));
+                comp.setTime(sdfD.parse(startTime));
+                int delta = (int) ((comp.getTimeInMillis() - now.getTimeInMillis()) / (3600*24*1000));
+
+                now.add(Calendar.DATE, delta - 1);
+                comp.add(Calendar.DATE, delta - 1);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            startTimeLast = sdfD.format(comp.getTime());
+            endTimeLast = sdfD.format(now.getTime());
+        }
+
+        List<Map<String, Object>> resultMapList = new ArrayList<>();
+        // 寻找生产区内的所有二级分区
+        for (Area area2 : areaLevel2List) {
+            List<Long> childIdsList = new ArrayList<>();
+            Map<String, Object> areaSecondMap = new HashMap<>();
+            areaSecondMap.put("areaId", area2.getId());
+            areaSecondMap.put("areaName", area2.getAreaName());
+            areaSecondMap.put("nowTime", startTimeThis + "~" + endTimeThis);
+            areaSecondMap.put("lastTime", startTimeLast + "~" + endTimeLast);
+
+            for (Area area : areaList) {
+                if (area.getPids() != null && area.getPids().contains("[" + area2.getId() + "]")) {
+                    childIdsList.add(area.getId());
+                }
+            }
+            if (ToolUtil.isNotEmpty(childIdsList)) {
+                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("now", countThis);
+
+                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("last", countLast);
+            }
+            resultMapList.add(areaSecondMap);
+        }
+
+        return ResponseData.success(resultMapList);
+    }
+
 
     /**
      * 查询二级分区水表告警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7e30d95..310b3c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,5 +17,6 @@
     List<Map<String,Object>> countByDayFirst(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     List<Map<String,Object>> alarmCountByDay(@Param("startTime")String startTime,@Param("endTime")String endTime);
     Map<String,Object> alarmBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
+    Map<String,Object> warningBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     Long countByFirstArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 0869697..ec384b1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -152,13 +152,32 @@
     </select>
     <select id="alarmBySecondArea" resultType="map">
         SELECT
-        IFNULL(COUNT(dd.`ID`),0) AS 'alarm',
+        IFNULL(COUNT(dd.`ID`),0) AS 'alarm'
+        FROM
+        alarm_records dd
+        LEFT JOIN device_view dv
+        ON dd.`DEVCODE` = dv.`DEVCODE`
+        where dv.VALID = '1' and dd.alarm_type = '1'
+        <if test="startTime != null and startTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ <= ]]>  #{endTime}
+        </if>
+        <if test="areaIds != null and areaIds != ''">
+            AND dv.`AREA` IN (${areaIds})
+        </if>
+        LIMIT 1
+    </select>
+
+    <select id="warningBySecondArea" resultType="map">
+        SELECT
         IFNULL(COUNT(dd.`ID`),0) AS 'warning'
         FROM
         alarm_records dd
         LEFT JOIN device_view dv
         ON dd.`DEVCODE` = dv.`DEVCODE`
-        where dv.VALID = '1'
+        where dv.VALID = '1' and dd.alarm_type = '3'
         <if test="startTime != null and startTime != ''">
             AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
         </if>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bc54695..fd41de5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -144,7 +144,10 @@
 
     @Override
     public Map<String, Object> alarmBySecondArea(String startTime, String endTime, String areaIds) {
-        return statisticMapper.alarmBySecondArea(startTime,endTime,areaIds);
+        Map<String, Object> alarm = statisticMapper.alarmBySecondArea(startTime,endTime,areaIds);
+        Map<String, Object> warning = statisticMapper.warningBySecondArea(startTime, endTime, areaIds);
+        alarm.put("warning", warning.get("warning"));
+        return alarm;
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 7b510c6..12e2736 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -54,7 +54,7 @@
 
     @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
-        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
+//        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index 5918107..5975d1b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -15,12 +15,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/waterStatistic")
@@ -34,10 +33,12 @@
     @Autowired
     private IDeviceTypeService iDeviceTypeService;
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 查询一级分区各区用水量
+     * 不用了
      *
      * @return
      */
@@ -79,6 +80,7 @@
 
     /**
      * 查询一级分区7日用水量
+     * 不用了
      *
      * @return
      */
@@ -141,6 +143,7 @@
 
     /**
      * 查询二级分区7日用水量
+     * 二级分区用水走势图
      *
      * @return
      */
@@ -271,6 +274,146 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 查询二级分区用水量对比
+     *
+     * @return
+     */
+    @RequestMapping(value = "/waterCompare")
+    @ResponseBody
+    public Object waterCompareSecond(@RequestParam String areaId, @RequestParam String type, String startTime, String endTime) {
+        List<Area> areaList = iAreaService.selectList(null);
+        List<Area> areaLevel2List = new ArrayList<>();
+
+        areaList.forEach(area -> {
+            //根据一级区域过滤二级区域
+            if ("3".equals(area.getLevel().toString()) &&area.getPids()!=null&& area.getPids().contains("[" + areaId + "]")) {
+                areaLevel2List.add(area);
+            }
+        });
+
+        Calendar now = Calendar.getInstance();
+        Calendar comp = Calendar.getInstance();
+        String startTimeThis = ""; // 对比当期起始日期
+        String endTimeThis = ""; // 对比当期结束日期
+        String startTimeLast = ""; // 对比上期起始日期
+        String endTimeLast = ""; // 对比上期结束日期
+
+        String year = sdf.format(now.getTime()).substring(0, 4);
+
+        if (type.equalsIgnoreCase("year")) {
+            // 本期起止日期
+            startTimeThis = year + "-01-01";
+            endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+            // 上期起止日期
+            comp.add(Calendar.YEAR, -1);
+            String lastYear = sdf.format(comp.getTime()).substring(0, 4);
+            startTimeLast = lastYear + "-01-01";
+            endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+        } else if (type.equalsIgnoreCase("season")) {
+            // 本期起止日期
+            switch (now.get(Calendar.MONTH)) {
+                // 一季度
+                case Calendar.JANUARY:
+                case Calendar.FEBRUARY:
+                case Calendar.MARCH:
+                {
+                    startTimeThis = startTimeThis = year + "-01-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = sdf.format(comp.getTime()).substring(0, 4) + "-10-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 二季度
+                case Calendar.APRIL:
+                case Calendar.MAY:
+                case Calendar.JUNE:
+                {
+                    startTimeThis = startTimeThis = year + "-04-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-01-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 三季度
+                case Calendar.JULY:
+                case Calendar.AUGUST:
+                case Calendar.SEPTEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-07-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-04-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+                // 四季度
+                case Calendar.OCTOBER:
+                case Calendar.NOVEMBER:
+                case Calendar.DECEMBER:
+                {
+                    startTimeThis = startTimeThis = year + "-10-01";
+                    endTimeThis = sdf.format(now.getTime()).substring(0, 10);
+
+                    comp.add(Calendar.MONTH, -3);
+                    startTimeLast = year + "-07-01";
+                    endTimeLast = sdf.format(comp.getTime()).substring(0, 10);
+                    break;
+                }
+            }
+        } else if (type.equalsIgnoreCase("other") || type.equalsIgnoreCase("day") ||
+                   type.equalsIgnoreCase("week") || type.equalsIgnoreCase("month")) {
+            // 本期起止日期
+            startTimeThis = startTime;
+            endTimeThis = endTime;
+            try {
+                now.setTime(sdfD.parse(endTime));
+                comp.setTime(sdfD.parse(startTime));
+                int delta = (int) ((comp.getTimeInMillis() - now.getTimeInMillis()) / (3600*24*1000));
+
+                now.add(Calendar.DATE, delta - 1);
+                comp.add(Calendar.DATE, delta - 1);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            startTimeLast = sdfD.format(comp.getTime());
+            endTimeLast = sdfD.format(now.getTime());
+        }
+
+        List<Map<String, Object>> resultMapList = new ArrayList<>();
+        // 寻找生产区内的所有二级分区
+        for (Area area2 : areaLevel2List) {
+            List<Long> childIdsList = new ArrayList<>();
+            Map<String, Object> areaSecondMap = new HashMap<>();
+            areaSecondMap.put("areaId", area2.getId());
+            areaSecondMap.put("areaName", area2.getAreaName());
+            areaSecondMap.put("nowTime", startTimeThis + "~" + endTimeThis);
+            areaSecondMap.put("lastTime", startTimeLast + "~" + endTimeLast);
+
+            for (Area area : areaList) {
+                if (area.getPids() != null && area.getPids().contains("[" + area2.getId() + "]")) {
+                    childIdsList.add(area.getId());
+                }
+            }
+            if (ToolUtil.isNotEmpty(childIdsList)) {
+                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("now", countThis);
+
+                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                areaSecondMap.put("last", countLast);
+            }
+            resultMapList.add(areaSecondMap);
+        }
+
+        return ResponseData.success(resultMapList);
+    }
+
 
     /**
      * 查询二级分区水表告警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 7e30d95..310b3c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -17,5 +17,6 @@
     List<Map<String,Object>> countByDayFirst(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     List<Map<String,Object>> alarmCountByDay(@Param("startTime")String startTime,@Param("endTime")String endTime);
     Map<String,Object> alarmBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
+    Map<String,Object> warningBySecondArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
     Long countByFirstArea(@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("areaIds")String areaIds);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 0869697..ec384b1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -152,13 +152,32 @@
     </select>
     <select id="alarmBySecondArea" resultType="map">
         SELECT
-        IFNULL(COUNT(dd.`ID`),0) AS 'alarm',
+        IFNULL(COUNT(dd.`ID`),0) AS 'alarm'
+        FROM
+        alarm_records dd
+        LEFT JOIN device_view dv
+        ON dd.`DEVCODE` = dv.`DEVCODE`
+        where dv.VALID = '1' and dd.alarm_type = '1'
+        <if test="startTime != null and startTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND dd.`ALARM_TIME`<![CDATA[ <= ]]>  #{endTime}
+        </if>
+        <if test="areaIds != null and areaIds != ''">
+            AND dv.`AREA` IN (${areaIds})
+        </if>
+        LIMIT 1
+    </select>
+
+    <select id="warningBySecondArea" resultType="map">
+        SELECT
         IFNULL(COUNT(dd.`ID`),0) AS 'warning'
         FROM
         alarm_records dd
         LEFT JOIN device_view dv
         ON dd.`DEVCODE` = dv.`DEVCODE`
-        where dv.VALID = '1'
+        where dv.VALID = '1' and dd.alarm_type = '3'
         <if test="startTime != null and startTime != ''">
             AND dd.`ALARM_TIME`<![CDATA[ >= ]]>  #{startTime}
         </if>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bc54695..fd41de5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -144,7 +144,10 @@
 
     @Override
     public Map<String, Object> alarmBySecondArea(String startTime, String endTime, String areaIds) {
-        return statisticMapper.alarmBySecondArea(startTime,endTime,areaIds);
+        Map<String, Object> alarm = statisticMapper.alarmBySecondArea(startTime,endTime,areaIds);
+        Map<String, Object> warning = statisticMapper.warningBySecondArea(startTime, endTime, areaIds);
+        alarm.put("warning", warning.get("warning"));
+        return alarm;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index bc64955..99e9f5b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -1021,21 +1021,21 @@
     </select>
 
     <select id="getWaterMeter" resultType="map">
-        SELECT SUM(dw.FLOW_ACC_MONTH) AS total
+        SELECT IFNULL(SUM(dw.FLOW_ACC_MONTH), 0) AS total
         FROM data_watermeter_month AS dw, device_view as dv
         where substring(dw.month, 1, 4) = #{year}
         and dv.devcode = dw.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
     <select id="getWaterMeterMonth" resultType="map">
-        SELECT SUM(dwm.FLOW_ACC_MONTH) AS `monthAcc`
+        SELECT IFNULL(SUM(dwm.FLOW_ACC_MONTH), 0) AS `monthAcc`
         FROM data_watermeter_month AS dwm, device_view as dv
         WHERE dwm.`MONTH` = #{month}
         and dv.devcode = dwm.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
     <select id="getWaterMeterDay" resultType="map">
-        SELECT SUM(dwd.FLOW_ACC_DATE) AS todayAcc
+        SELECT IFNULL(SUM(dwd.FLOW_ACC_DATE), 0) AS todayAcc
         FROM data_watermeter_day AS dwd, device_view as dv
         WHERE dwd.`DATE` = #{date}
         <if test="area != null and area !=''">