#

野心家

2023-10-11 0c1f961082a72b72d29eec170b1559de0485dae3

 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java

@@ -35,7 +35,7 @@

    @Autowired
    private MainServiceImpl mainService;

    //消防心跳，火警
    @Override
    protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
        FireDataType dataType = FireDataType.get(pac.getBytes()[1], pac.getBytes()[2]);
@@ -45,20 +45,16 @@
                ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
                Constant.errorMap.remove(fire3030.getNo());
                LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
                LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","0101804"));
                if(null != locMast2) {
                    locMast2.setChannel(10000);
                    locMast2.setModiTime(new Date());
                    locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "0101804"));
                }
                break;
            case FIRE_ALARM:
                //消防IO点编号
//                String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
                String fireNo =fire3030.getPartNo().toString();  //0100201 对应  30 31   0200201 对应 34 35
                String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
                        + " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
                Date dt = DateUtils.convert(fireTime);
                int count=Integer.valueOf(fireNo)/2+Integer.valueOf(fireNo)%2;
                fireNo=""+count;
//                String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
//                        + " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
                Date dt = new Date();
                LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
                if(null != locMastService){
                    //报警信号更新到库存主档 fire_status字段