修改意见问题修改

zengh

2021-07-26 2deeeb8b1e671cfeb421f973c644ffc2d3182841

修改意见问题修改

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

@@ -136,6 +136,28 @@
    }

    /**
     * 自定义分页
     */
    @GetMapping("/page_az")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入alarm")
    public R<IPage<AlarmVO>> page_az(AlarmVO alarm, Query query) {
        IPage<AlarmVO> pages = alarmService.selectazPage(Condition.getPage(query), alarm);
        return R.data(pages);
    }

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

    /**
     * 查询所有
     * @return
     */
@@ -529,7 +551,7 @@
                bs = "0";
            }else if(operation.getZc().equals("办结")){
                bs = "1";
            }else {
            }else if(operation.getZc().equals("推送110")){
                bs = "2";
            }
        }

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

@@ -46,6 +46,8 @@
     * @return
     */
    List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
    List<AlarmVO> selectazPage(IPage page, AlarmVO alarm);
    List<Map<String,Object>> getChartData(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

@@ -239,6 +239,55 @@
        a.alarmTime DESC
    </select>

    <select id="selectazPage" resultMap="alarmResultMap">
        SELECT
        *
        FROM
            sys_alarm
        WHERE
            1 = 1
            <if test="alarm.district!=null">
                and district like concat('%',#{alarm.district},'%')
            </if>
            <if test="alarm.province!=null">
                and province like concat('%',#{alarm.province},'%')
            </if>
            <if test="alarm.city!=null">
                and city like concat('%',#{alarm.city},'%')
            </if>
            <if test="alarm.alarmPeople!=null">
                and alarmPeople like concat('%',#{alarm.alarmPeople},'%')
            </if>
            <if test="alarm.jtype!=null">
                and jtype = #{alarm.jtype}
            </if>
            AND waringType IN ( "安装任务" )
        ORDER BY
            jtype ASC,
            alarmTime DESC
    </select>

    <select id="getChartData" 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 = 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,
        a.deviceNumber,a.region,e.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,a.vaddress

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

@@ -44,6 +44,8 @@
     * @return
     */
    IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm);
    IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm);
    List<Map<String,Object>> getChartData(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

@@ -48,6 +48,16 @@
    }

    @Override
    public IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm) {
        return page.setRecords(baseMapper.selectazPage(page, alarm));
    }

    @Override
    public List<Map<String, Object>> getChartData(AlarmVO alarm) {
        return baseMapper.getChartData(alarm);
    }

    @Override
    public List<AlarmVO> listAll() {
        return baseMapper.listAll();
    }