修改意见问题修改

zengh

2021-07-26 bf673eb643fd990ae44a953c5302b18dfa52510a

修改意见问题修改

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -158,6 +158,28 @@
    }

    /**
     * 警情类型图表接口
     */
    @GetMapping("/getChartDataAlarm")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入alarm")
    public R<List> getChartDataAlarm(AlarmVO alarm) {
        List<Map<String,Object>> list = alarmService.getChartDataAlarm(alarm);
        return R.data(list);
    }

    /**
     * 警情标识图表接口
     */
    @GetMapping("/getChartDataAlarmBs")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入alarm")
    public R<List> getChartDataAlarmBs(AlarmVO alarm) {
        List<Map<String,Object>> list = alarmService.getChartDataAlarmBs(alarm);
        return R.data(list);
    }

    /**
     * 查询所有
     * @return
     */

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java

@@ -48,6 +48,8 @@
    List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
    List<AlarmVO> selectazPage(IPage page, AlarmVO alarm);
    List<Map<String,Object>> getChartData(AlarmVO alarm);
    List<Map<String,Object>> getChartDataAlarm(AlarmVO alarm);
    List<Map<String,Object>> getChartDataAlarmBs(AlarmVO alarm);
    List<AlarmVO> listAll();
    List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
    List<AlarmVO> getLimit();

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -287,6 +287,78 @@
            AND jtype = 2
            AND waringType IN ( "安装任务" )
    </select>
    <select id="getChartDataAlarm" resultType="java.util.Map">
        SELECT
            COUNT( * ) AS
        value
            ,
            "未处理" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND jtype = 0
            AND waringType IN ( "紧急求救" ) UNION ALL
        SELECT
            COUNT( * ) AS
        value
            ,
            "处理中" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND jtype = 1
            AND waringType IN ( "紧急求救" )
            UNION ALL
        SELECT
            COUNT( * ) AS
        value
            ,
            "已处理" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND jtype = 2
            AND waringType IN ( "紧急求救" )
    </select>
    <select id="getChartDataAlarmBs" resultType="java.util.Map">
        SELECT
            COUNT( * ) AS
        value
            ,
            "一般警情" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND alarmbs = 0
            AND waringType IN ( "紧急求救" ) UNION ALL
        SELECT
            COUNT( * ) AS
        value
            ,
            "误报警情" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND alarmbs = 1
            AND waringType IN ( "紧急求救" )
            UNION ALL
        SELECT
            COUNT( * ) AS
        value
            ,
            "严重警情" AS name
        FROM
            sys_alarm
        WHERE
            1 = 1
            AND alarmbs = 2
            AND waringType IN ( "紧急求救" )
    </select>

    <select id="listAll" resultMap="alarmResultMap">
       select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java

@@ -46,6 +46,8 @@
    IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm);
    IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm);
    List<Map<String,Object>> getChartData(AlarmVO alarm);
    List<Map<String,Object>> getChartDataAlarm(AlarmVO alarm);
    List<Map<String,Object>> getChartDataAlarmBs(AlarmVO alarm);
    List<AlarmVO> listAll();
    List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
    List<AlarmVO> getLimit();

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java

@@ -56,6 +56,14 @@
    public List<Map<String, Object>> getChartData(AlarmVO alarm) {
        return baseMapper.getChartData(alarm);
    }
    @Override
    public List<Map<String, Object>> getChartDataAlarm(AlarmVO alarm) {
        return baseMapper.getChartDataAlarm(alarm);
    }
    @Override
    public List<Map<String, Object>> getChartDataAlarmBs(AlarmVO alarm) {
        return baseMapper.getChartDataAlarmBs(alarm);
    }

    @Override
    public List<AlarmVO> listAll() {