vince
2025-01-08 caf2599a9869244ded811018811c37a2aabac3fc
优化测温协议
已修改4个文件
56 ■■■■■ 文件已修改
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/ProtocolRunner.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -121,25 +121,33 @@
        }
        BaseReqData reqData = new BaseReqData();
        BaseResp resp;
        for (GatewayDevice device : list) {
            try{
                //如果不是粮情分机跳过
                if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
                    continue;
            for (GatewayDevice device : list) {
                for (int i = 0 ;i<3;i++){
                    try{
                        //如果不是粮情分机跳过
                        if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
                            continue;
                        }
                        if( i>0 && !device.getDeviceSn().startsWith("91510704731594658J002")){
                            continue;
                        }
                        reqData.setDeviceId(device.getDeviceId());
                        reqData.setProductId(device.getProductId());
                        reqData.setDeviceName(device.getDeviceName());
                        reqData.setDevice(device);
                        reqData.setAutoReplay(true);
                        GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
                        resp = syncGrainService.syncGrain(reqData);
                        log.info("命令发送结果:"+resp.toString());
                        Thread.sleep(60000);
                    }catch (Exception e){
                        log.error(e.getMessage(),e);
                    }
                }
                reqData.setDeviceId(device.getDeviceId());
                reqData.setProductId(device.getProductId());
                reqData.setDeviceName(device.getDeviceName());
                reqData.setDevice(device);
                reqData.setAutoReplay(true);
                GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
                 resp = syncGrainService.syncGrain(reqData);
                log.info("命令发送结果:"+resp.toString());
                Thread.sleep(30000);
            }catch (Exception e){
                log.error(e.getMessage(),e);
            }
        }
    }
    /**
src/main/java/com/fzzy/protocol/ProtocolRunner.java
@@ -39,7 +39,7 @@
        //邦海智能无线主机设备协议
        BhznGrainV0ServerEngine.start(null);
        //邦海智能无线主机设备协议
        //BhznGrainV01ServerEngine.start(null);
        BhznGrainV01ServerEngine.start(null);
    }
}
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -277,13 +277,13 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
            if (curTemp > max  && curTemp < 38) {
            if (curTemp > max  && curTemp < 40) {
                max = curTemp;
            }
            if (curTemp < min && curTemp > 5) {
            if (curTemp < min && curTemp > 3) {
                min = curTemp;
            }
            if(curTemp > 5 &&  curTemp < 38){
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java
@@ -228,13 +228,13 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
            if (curTemp > max  && curTemp < 38) {
            if (curTemp > max  && curTemp < 40) {
                max = curTemp;
            }
            if (curTemp < min && curTemp > 5) {
            if (curTemp < min && curTemp > 3) {
                min = curTemp;
            }
            if(curTemp > 5 &&  curTemp < 38){
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }