changes

liuhaonan

2022-10-24 c5ef81f257e0176cdcfce034779a15f544d6694c

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/AirDataProcessor.java

@@ -48,7 +48,10 @@
            log.info("心跳相应——大气数据(农耕)");
            A5AtmosphereNewHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereNewHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
            if (heartbeatReportInnerFrame != null && heartbeatReportInnerFrame.isValidate()) {
                log.info(heartbeatReportInnerFrame.toString());
                if (deviceName.equals("363832544e5008ff8960ffff")) {
                    System.out.println("数据校验成功  frame: " + frame);
                }
                log.info("数据校验成功: " + heartbeatReportInnerFrame.toString());
                SpringContextHolder.getBean(AirDataNongGengService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
            } else {
                System.out.println("数据校验异常！");

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java

@@ -59,7 +59,12 @@
                    throw new BusinessException("灯杆mac为空,无法绑定大气设备");
                }

                size = SpringContextHolder.getBean(AirEquipmentService.class).list(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, param.getDeviceCode())).size();
                int size1 = SpringContextHolder.getBean(AirEquipmentService.class).list(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, param.getDeviceCode())).size();
                int size2 = SpringContextHolder.getBean(AirEquipmentNongGengService.class).list(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, param.getDeviceCode())).size();
                //一键求助两类硬件
                if (size1 > 0 || size2 > 0) {
                    size = 1;
                }
                break;
            case PoleBindingEnums.WATER:
                size = SpringContextHolder.getBean(WaterQualityEquipmentService.class).list(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode, param.getDeviceCode())).size();
@@ -77,10 +82,10 @@
                size = SpringContextHolder.getBean(LightPoleHeelingEquipmentService.class).list(Wrappers.lambdaQuery(LightPoleHeelingEquipment.class).eq(LightPoleHeelingEquipment::getMac, param.getDeviceCode())).size();
                break;
            case PoleBindingEnums.FOR_HELP:
                int size1 = SpringContextHolder.getBean(InterphoneHostService.class).list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, param.getDeviceCode())).size();
                int size2 = SpringContextHolder.getBean(InterphoneSubService.class).list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, param.getDeviceCode())).size();
                int size3 = SpringContextHolder.getBean(InterphoneHostService.class).list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, param.getDeviceCode())).size();
                int size4 = SpringContextHolder.getBean(InterphoneSubService.class).list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, param.getDeviceCode())).size();
                //一键求助两类硬件
                if (size1 > 0 || size2 > 0) {
                if (size3 > 0 || size4 > 0) {
                    size = 1;
                }
                break;
@@ -158,6 +163,7 @@
            one.setDeviceName(param.getDeviceName());
            one.setDeviceCode(param.getDeviceCode());
            return updateById(one);

        }
    }