优化测温协议

vince

2024-12-13 d3e48589ea2719cdde41b87fc1ad80f4ee509bac

 src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java

@@ -6,6 +6,8 @@
import com.fzzy.api.utils.DateUtil;
import com.fzzy.data.ConfigData;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.api.GatewayRemoteService;
import com.fzzy.gateway.api.GatewaySyncGranService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.data.WeatherWebDto;
@@ -62,7 +64,7 @@
     * <p>
     * 粮情每天11点穿上区
     */
    @Scheduled(cron = "0 0 11 * * ?")
//    @Scheduled(cron = "0 0 11 * * ?")
    public void scheduledGrain() {
        //获取设备配置，只针对粮情设备进行执行
        log.info("定时kafka粮情推送");
@@ -96,17 +98,63 @@
                gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByHand(reqData);
            }
        }

    }



    /**
     * <p>
     * 粮情每天8点采集粮情
     *
     */
//    @Scheduled(cron = "0 30 5 ? * *")
//    @Scheduled(cron = "0 32 11 ? * 1,4")
    @Scheduled(cron = "0 32 11 ? * *")
    public void scheduledGrain2() {
        //获取设备配置，只针对粮情设备进行执行
        log.info("定时粮情采集kafka推送");
        List<GatewayDevice> list = gatewayDeviceTestPR.listAll();

        if (null == list || list.isEmpty()) {
            log.error("为获取到系统中设备配置，取消执行\"");
            return ;
        }
        BaseReqData reqData = new BaseReqData();
        BaseResp resp;
        for (GatewayDevice device : list) {
            try{
                //如果不是粮情分机跳过
                if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
                    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(30000);
            }catch (Exception e){
                log.error(e.getMessage(),e);
            }
        }
    }

    /**
     * <p>
     * 每间隔3秒执行一次事件
     */
    @Scheduled(cron = "0/3 * * * * ?")
    public void scheduled3() {
        try{
            //执行HTTP地磅请求
            exeHttpWeightReq();
        }catch (Exception e){
            log.error(e.getMessage(),e);
        }

        //执行HTTP地磅请求
        exeHttpWeightReq();
    }


@@ -197,17 +245,14 @@

        BaseReqData reqData;
        for (GatewayDevice device : list) {

            if (!GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode().equals(device.getSyncProtocol())) {
                continue;
            }

            reqData = new BaseReqData();
            reqData.setDevice(device);
            reqData.setDeviceName(device.getDeviceName());
            reqData.setProductId(device.getProductId());
            reqData.setDeviceId(device.getDeviceId());

            gatewayRemoteManager.getSyncWeightService(device.getSyncProtocol()).syncWeightInfo(reqData);
        }
    }