南昌市物联网技防平台-后台
zengh
2021-03-20 7f8f3f1503d32a5bdb9bee7d76b318b70127f9d7
报警分发接口的同时记录日志
3 files modified
21 ■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java 15 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -176,8 +176,8 @@
        return null;
        //return R.status(alarmService.saveOrUpdate(alarm));
        //return null;
        return R.status(alarmService.saveOrUpdate(alarm));
    }
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -223,7 +223,7 @@
    </delete>
    <!--新增-->
    <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
    <insert id="s" parameterType="org.springblade.jfpt.alarm.entity.Alarm" useGeneratedKeys="true" keyProperty="id">
       INSERT INTO sys_alarm (alarmType,jjTime,alarmPeople,alarmTime,galarmPeople,sex,phoneNumber,place,content,waringType,deviceNumber,
       region,district,alarmId,level,rname,coordinate,jd,wd,jtype,province,city,cid) VALUES
        (#{alarmType},#{jjTime},#{alarmPeople},#{alarmTime},#{galarmPeople},#{sex},#{phoneNumber},#{place},#{content},#{waringType},
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -12,6 +12,8 @@
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -48,6 +50,9 @@
    @Autowired
    private IAlarmService alarmService;
    @Autowired
    private IOperationService operationService;
    private static ServerHandler serverHandler;
@@ -1737,8 +1742,16 @@
                        serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
                    }
                    serverHandler.alarmService.s(alarm);
                    OperationVO operation = new OperationVO();
                    operation.setSnumber(alarm.getAlarmId());
                    operation.setSname(alarm.getAlarmPeople());
                    operation.setJid(alarm.getId().toString());
                    operation.setZc("接警");
                    operation.setZctime(alarm.getJjTime());
                    serverHandler.operationService.save(operation);
                    outData.add("LEOK#@");
                    long endTime1 = System.currentTimeMillis();    //获取结束时间