修改报警相关功能

101captain

2021-09-13 ad90d1f00cac52bb06ac20280e54c45321a99e13

修改报警相关功能

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java

@@ -40,6 +40,7 @@
    private RabbitTemplate rabbitTemplate;

    private static NettyServerHandler nettyServerHandler;

    /**
     * 客户端连接会触发
     */
@@ -70,7 +71,14 @@
//            comPropertyAlarm.setType(ComPropertyAlarm.type.one);
//            nettyServerHandler.comPropertyAlarmDao.insert(comPropertyAlarm);
            if(msg.toString().startsWith("4A18031")){
                delayAlarm(serial);
                //正式处理
                // delayAlarm(serial);
                //展会处理
                ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
                comPropertyAlarm.setCreateTime(DateUtil.date());
                comPropertyAlarm.setSerialNo(serial);
                comPropertyAlarm.setType(ComPropertyAlarm.type.one);
                nettyServerHandler.comPropertyAlarmDao.insert(comPropertyAlarm);
            }

        }
@@ -93,6 +101,7 @@
        nettyServerHandler.stringRedisTemplate=this.stringRedisTemplate;
        nettyServerHandler.rabbitTemplate=this.rabbitTemplate;
    }

    //报警事件包延迟处理方法
    private void delayAlarm(String serial){
        int duration=0;
@@ -103,8 +112,7 @@
                comPropertyEquipment= JSONObject.parseObject(nettyServerHandler.stringRedisTemplate.boundValueOps(serial).get(),ComPropertyEquipment.class);
                duration = getDuration(Objects.requireNonNull(comPropertyEquipment));
                nettyServerHandler.stringRedisTemplate.boundValueOps(serial).set(JSONObject.toJSONString(comPropertyEquipment), Duration.ofHours(duration));
            }
            else {
            } else {
                comPropertyEquipment=nettyServerHandler.comPropertyEquipmentDao.selectOne(new QueryWrapper<ComPropertyEquipment>().eq("serial_no",serial));
                duration = getDuration(comPropertyEquipment);
                nettyServerHandler.stringRedisTemplate.boundValueOps(serial).set(JSONObject.toJSONString(comPropertyEquipment));