报警分发接口完成

zengh

2021-03-20 6ab9373c0d0d3dbec39e0435142be1ccef0aa41e

报警分发接口完成

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

@@ -444,7 +444,7 @@
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getZctime());
        alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz());
        alarmService.updatePoliceStatus(operation.getRid(),"0");
        operationService.save(operation);
        return R.success("修改成功");

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

@@ -51,7 +51,7 @@
    void deletejj(String id);

    void s(Alarm alarm);
    void updateJtype(String id, String jtype, String bz,String jjtime);
    void updateJtype(String id, String jtype, String bz);
    void updatePoliceStatus(String id, String status);
    void updateOne(Alarm alarm);


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

@@ -277,7 +277,7 @@


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

    <update id="updatePoliceStatus">

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

@@ -51,7 +51,7 @@
    void updateOne(Alarm alarm);
    List<Map<String, Object>> selectScount(String time);
    List<AlarmVO> selectListSe(String beginTime, String endTime);
    void updateJtype(String id, String jtype, String bz, String jjtime);
    void updateJtype(String id, String jtype, String bz);

    void updatePoliceStatus(String id, String status);


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

@@ -98,8 +98,8 @@
    }

    @Override
    public void updateJtype(String id,String jtype,String bz,String jjtime) {
        baseMapper.updateJtype(id,jtype,bz,jjtime);
    public void updateJtype(String id,String jtype,String bz) {
        baseMapper.updateJtype(id,jtype,bz);
    }

    @Override

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -1723,17 +1723,17 @@
                    if (police.size() != 0){
                        alarm.setAlarmId( police.get(0).get("alarmId").toString());
                        alarm.setAlarmPeople( police.get(0).get("alarmPeople").toString());
//                        Date date = new Date();
//                        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                        alarm.setJjTime(dateFormat.format(date));
                        Date date = new Date();
                        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        alarm.setJjTime(dateFormat.format(date));

                        serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
                    }else {
                        alarm.setAlarmId( online_police.get(0).get("id").toString());
                        alarm.setAlarmPeople(online_police.get(0).get("name").toString());
//                        Date date = new Date();
//                        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                        alarm.setJjTime(dateFormat.format(date));
                        Date date = new Date();
                        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        alarm.setJjTime(dateFormat.format(date));

                        serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
                    }