aijinhui
2023-10-07 22311d8b024f0414cc60a2c408211fdfb9c2f1d3
报警数量统计月
已添加1个文件
已修改24个文件
299 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/access/mapper/ArdAlarmAccessMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/apponekey/mapper/ArdAlarmApponekeyMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/digitization3/mapper/ArdAlarmDigitization3Mapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarFireMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/steal/mapper/ArdAlarmStealelecMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/tube/mapper/ArdAlarmTubeMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/wall/mapper/ArdAlarmWallMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/param/MonthParam.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/statistical/vo/CountVo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmAccessMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmDigitization3Mapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/access/mapper/ArdAlarmAccessMapper.java
@@ -71,4 +71,6 @@
    //根据月份统计数量
    List<CountVo> accessYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> accessMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/apponekey/mapper/ArdAlarmApponekeyMapper.java
@@ -72,4 +72,6 @@
    //根据月份统计数量
    List<CountVo> apponekeyYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> apponekeyMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/camera/mapper/ArdAlarmCameraMapper.java
@@ -71,4 +71,6 @@
    //根据月份统计数量
    List<CountVo> cameraYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> cameraMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/digitization3/mapper/ArdAlarmDigitization3Mapper.java
@@ -70,4 +70,6 @@
    //根据月份统计数量
    List<CountVo> digitizationYear(ESParam esParam);
    //根据月份统计数量
    List<CountVo> digitizationMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java
@@ -70,5 +70,7 @@
    //根据月份统计数量
    List<CountVo> externalYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> externalMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarFireMapper.java
@@ -73,4 +73,6 @@
    //根据月份统计数量
    List<CountVo> fileYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> fileMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java
@@ -72,4 +72,6 @@
    //根据月份统计数量
    List<CountVo> moveYear(ESParam esParam);
    //根据天份统计数量
    List<CountVo> moveMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/steal/mapper/ArdAlarmStealelecMapper.java
@@ -33,4 +33,6 @@
    //根据月份统计数量
    List<CountVo> stealelecYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> stealelecMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/tube/mapper/ArdAlarmTubeMapper.java
@@ -70,4 +70,6 @@
    //根据月份统计数量
    List<CountVo> tubeYear(ESParam esParam);
    //根据月份统计数量
    List<CountVo> tubeMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/alarm/wall/mapper/ArdAlarmWallMapper.java
@@ -73,4 +73,6 @@
    //根据月份统计数量
    List<CountVo> wallYear(ESParam esParam);
    //根据天统计数量
    List<CountVo> wallMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
@@ -1,15 +1,16 @@
package com.ruoyi.statistical.controller;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.param.MonthParam;
import com.ruoyi.statistical.service.StatisticalService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.Calendar;
import java.util.Map;
/**
@@ -86,4 +87,73 @@
        return Results.succeed();
    }
    /**
     * æŠ¥è­¦æ•°é‡åˆ†æžæœˆ
     */
    @ApiOperation("报警数量分析月")
    @GetMapping("alarm/month")
    public Results alarmMonth(String month,String type){
        LocalDate today = LocalDate.now();
        int year = today.getYear();
        int day =  getDaysInMonth(Integer.valueOf(month),year);
        ESParam esParam = new ESParam();
        esParam.setStart(year+"-"+month+"-01");
        esParam.setEnd(year+"-"+month+"-"+day);
        if("1001".equals(type)){
            //盗电报警
            return Results.succeed(statisticalService.stealelecMonth(esParam));
        }else if("1002".equals(type)){
            //通用光电
            return Results.succeed(statisticalService.cameraMonth(esParam));
        }else if("1003".equals(type)){
            //雷达报警
            return Results.succeed(statisticalService.moveMonth(esParam));
        }else if("1004".equals(type)){
            //防火报警
            return Results.succeed(statisticalService.fireMonth(esParam));
        }else if("1005".equals(type)){
            //外联报警
            return Results.succeed(statisticalService.externalMonth(esParam));
        }else if("1006".equals(type)){
            //门禁报警
            return Results.succeed(statisticalService.accessMonth(esParam));
        }else if("1007".equals(type)){
            //移动终端
            return Results.succeed(statisticalService.apponekeyMonth(esParam));
        }else if("1010".equals(type)){
            //电子围栏
            return Results.succeed(statisticalService.wallMonth(esParam));
        }else if("1012".equals(type)){
            //预警告警
            return Results.succeed(statisticalService.digitizationMonth(esParam));
        }else if("1014".equals(type)){
            //管线泄漏
            return Results.succeed(statisticalService.tubeMonth(esParam));
        }
        return Results.succeed();
    }
    //返回每月天数
    public int getDaysInMonth(int month, int year) {
        switch (month) {
            case Calendar.JANUARY:
            case Calendar.MARCH:
            case Calendar.MAY:
            case Calendar.JULY:
            case Calendar.AUGUST:
            case Calendar.OCTOBER:
            case Calendar.DECEMBER:
                return 31;
            case Calendar.APRIL:
            case Calendar.JUNE:
            case Calendar.SEPTEMBER:
            case Calendar.NOVEMBER:
                return 30;
            case Calendar.FEBRUARY:
                return ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)) ? 29 : 28;
            default:
                throw new IllegalArgumentException("Invalid Month");
        }
    }
}
ard-work/src/main/java/com/ruoyi/statistical/param/MonthParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.statistical.param;
import lombok.Data;
@Data
public class MonthParam {
    private String type;
    private String month;
}
ard-work/src/main/java/com/ruoyi/statistical/service/StatisticalService.java
@@ -28,4 +28,15 @@
    List<CountVo> wallYear(ESParam esParam);
    List<CountVo> digitizationYear(ESParam esParam);
    List<CountVo> tubeYear(ESParam esParam);
    List<CountVo> stealelecMonth(ESParam esParam);
    List<CountVo> cameraMonth(ESParam esParam);
    List<CountVo> moveMonth(ESParam esParam);
    List<CountVo> fireMonth(ESParam esParam);
    List<CountVo> externalMonth(ESParam esParam);
    List<CountVo> accessMonth(ESParam esParam);
    List<CountVo> apponekeyMonth(ESParam esParam);
    List<CountVo> wallMonth(ESParam esParam);
    List<CountVo> digitizationMonth(ESParam esParam);
    List<CountVo> tubeMonth(ESParam esParam);
}
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -185,9 +186,69 @@
        return es(list);
    }
    @Override
    public List<CountVo> stealelecMonth(ESParam esParam) {
        List<CountVo> list = stealelecMapper.stealelecMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> cameraMonth(ESParam esParam) {
        List<CountVo> list = cameraMapper.cameraMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> moveMonth(ESParam esParam) {
        List<CountVo> list = moveMapper.moveMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> fireMonth(ESParam esParam) {
        List<CountVo> list = fireMapper.fileMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> externalMonth(ESParam esParam) {
        List<CountVo> list = externalMapper.externalMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> accessMonth(ESParam esParam) {
        List<CountVo> list = accessMapper.accessMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> apponekeyMonth(ESParam esParam) {
        List<CountVo> list = apponekeyMapper.apponekeyMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> wallMonth(ESParam esParam) {
        List<CountVo> list = wallMapper.wallMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> digitizationMonth(ESParam esParam) {
        List<CountVo> list = digitization3Mapper.digitizationMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    @Override
    public List<CountVo> tubeMonth(ESParam esParam) {
        List<CountVo> list = tubeMapper.tubeMonth(esParam);
        return esMonth(list,esParam.getEnd());
    }
    public List<CountVo> es(List<CountVo> list){
        for (int i = 1; i <= 12 ; i++) {
            String month = null;
            String month;
            if(i<=10){
                month = "0"+i;
            }else {
@@ -196,14 +257,41 @@
            Boolean bo = false;
            for (int j = 0; j < list.size(); j++) {
                CountVo countVo = list.get(j);
                String mon = countVo.getMonth();
                String mon = countVo.getDate();
                if(mon.equals(month)){
                    bo = true;
                }
            }
            if(!bo){
                CountVo countVo = new CountVo();
                countVo.setMonth(month);
                countVo.setDate(month);
                countVo.setCount(0);
                list.add(countVo);
            }
        }
        return list;
    }
    public List<CountVo> esMonth(List<CountVo> list,String end){
        Integer day = Integer.valueOf(end.substring(end.length() - 2));
        for (int i = 1; i <= day ; i++) {
            String d;
            if(i<=10){
                d = "0"+i;
            }else {
                d = String.valueOf(i);
            }
            Boolean bo = false;
            for (int j = 0; j < list.size(); j++) {
                CountVo countVo = list.get(j);
                String mon = countVo.getDate();
                if(mon.equals(d)){
                    bo = true;
                }
            }
            if(!bo){
                CountVo countVo = new CountVo();
                countVo.setDate(d);
                countVo.setCount(0);
                list.add(countVo);
            }
ard-work/src/main/java/com/ruoyi/statistical/vo/CountVo.java
@@ -4,6 +4,6 @@
@Data
public class CountVo {
    private String month;
    private String date;
    private Integer count;
}
ard-work/src/main/resources/mapper/alarm/ArdAlarmAccessMapper.xml
@@ -171,8 +171,13 @@
    </update>
    <select id="accessYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_access
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="accessMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_access
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmApponekeyMapper.xml
@@ -130,8 +130,13 @@
    </update>
    <select id="apponekeyYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(create_time::DATE, 'MM') as month,count(id)
        select to_char(create_time::DATE, 'MM') as date,count(id)
        from ard_alarm_apponekey
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by month order by month
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
    </select>
    <select id="apponekeyMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(create_time::DATE, 'dd') as date,count(id)
        from ard_alarm_apponekey
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
@@ -168,8 +168,13 @@
    </update>
    <select id="cameraYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_camera
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="cameraMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_camera
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmDigitization3Mapper.xml
@@ -151,8 +151,13 @@
          and view_time is null
    </update>
    <select id="digitizationYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_digitization3
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="digitizationMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_digitization3
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml
@@ -185,8 +185,14 @@
    </update>
    <select id="externalYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_external
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="externalMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_external
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml
@@ -164,8 +164,13 @@
    </select>
    <select id="fileYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_radar_fire
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="fileMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_radar_fire
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -169,8 +169,13 @@
    </select>
    <select id="moveYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_radar_move
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="moveMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_radar_move
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -130,9 +130,14 @@
    </insert>
    <select id="stealelecYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(start_time::DATE, 'MM') as month,count(id)
        select to_char(start_time::DATE, 'MM') as date,count(id)
        from ard_alarm_stealelec
        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by month order by month
        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
    </select>
    <select id="stealelecMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(start_time::DATE, 'dd') as date,count(id)
        from ard_alarm_stealelec
        where start_time &gt;= #{start} and  start_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -196,8 +196,13 @@
          and view_time is null
    </update>
    <select id="tubeYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(create_time::DATE, 'MM') as month,count(id)
        select to_char(create_time::DATE, 'MM') as date,count(id)
        from ard_alarm_tube
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by month order by month
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
    </select>
    <select id="tubeMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(create_time::DATE, 'dd') as date,count(id)
        from ard_alarm_tube
        where create_time &gt;= #{start} and  create_time &lt;= #{end}  group by date order by date
    </select>
</mapper>
ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
@@ -163,8 +163,13 @@
          and view_time is null
    </update>
    <select id="wallYear" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'MM') as month,count(id)
        select to_char(alarm_time::DATE, 'MM') as date,count(id)
        from ard_alarm_wall
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by month order by month
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
    <select id="wallMonth" resultType="com.ruoyi.statistical.vo.CountVo">
        select to_char(alarm_time::DATE, 'dd') as date,count(id)
        from ard_alarm_wall
        where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
    </select>
</mapper>