Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

tangzy

2021-04-23 8b4825afee9300eee48ffdc61dd87e46f19a1201

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

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

@@ -631,4 +631,19 @@
        List<AlarmExcel> list = alarmService.exportAlarm(alarmVO);
        ExcelUtil.export(response, "主动报警数据" + DateUtil.time(), "主动报警数据表", list, AlarmExcel.class);
    }

    /**
     * APP查询警情
     * @param alarmVO
     * @param response
     * @return
     */
    @PostMapping("/APP-getAlarm")
    public R getAlarm(AlarmVO alarmVO, HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        return R.data(alarmService.getAlarm(alarmVO));
    }

}

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

@@ -94,6 +94,8 @@

    List<Map<String, Object>> queryBa();

    List<Map<String, Object>> getAlarm(AlarmVO alarm);

    /**
     * 查询当前时间段一键求助报警总次数
     * @param conditionVo

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

@@ -398,7 +398,13 @@


    <update id="updateJtype">
        update sys_alarm SET jtype=#{jtype},bz=#{bz},securityArr =#{securityArr} where id=#{id}
        update sys_alarm SET jtype=#{jtype},bz=#{bz}

        <if test="securityArr!=null and id!=''">
            ,securityArr =#{securityArr}
        </if>

        where id=#{id}
    </update>

    <update id="updatePoliceStatus">
@@ -547,6 +553,17 @@
        AND role_id = "1370562810882502657"
    </select>

    <select id="getAlarm" resultType="java.util.HashMap">
        SELECT
            *
        FROM
            sys_alarm
        WHERE
            securityId IS NULL
            AND securityArr LIKE concat('%',#{alarm.securityArr},'%')

    </select>

    <update id="updateVaddress">
        update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
    </update>
@@ -628,7 +645,7 @@
        from sys_alarm a
        LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
        where 1=1
            <include refid="alarmCondition"></include>
        <include refid="alarmCondition"></include>
        and a.waringType IN("紧急求救")
        ORDER BY
        a.jtype ASC,
@@ -638,7 +655,7 @@
    <!--获取实时警情图表统计数据-->
    <select id="getAlarmPie" resultType="org.springblade.common.entity.ReportReturnData">
        select if(1=1,"紧急求救",0) type,ifnull(count(*),0) count from sys_alarm
            where waringType="紧急求救"
        where waringType="紧急求救"
        <include refid="alarmConditionPie"></include>
    </select>


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

@@ -85,6 +85,8 @@

    List<Map<String, Object>> queryBa();

    List<Map<String, Object>> getAlarm(AlarmVO alarmVO);

    /**
     * 查询当前时间段一键求助报警总次数
     * @param conditionVo

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

@@ -176,6 +176,11 @@
        return baseMapper.queryBa();
    }

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

    /**
     * 查询当前时间段一键求助报警总次数
     * @param conditionVo