优化协议

vince

2024-01-27 facc0ea3fa37091a98aa1e0a0d1081fd32fba28e

 src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java

@@ -1,9 +1,10 @@
package com.fzzy.gateway.service;

import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
@@ -35,8 +36,8 @@

    @Resource
    private GatewayDeviceRep gatewayDeviceRep;
//    @Resource
//    private Fzzy40CommonService fzzy40CommonService;
    @Resource
    private Fzzy40CommonService fzzy40CommonService;
    @Resource
    private GatewayRemoteManager gatewayRemoteManager;
//    @Resource
@@ -73,7 +74,7 @@
            return "ERROR：当前设备没有配置布线规则，无法执行";
        }

        BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain2(reqData);
        BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain(reqData);

        //自动推送
        if (200 == resp.getCode() && reqData.isAutoReplay()) {
@@ -119,7 +120,7 @@
    }


    private String pushByV40(List<GatewayDevice> list, Date start, Date end) {
    public String pushByV40(List<GatewayDevice> list, Date start, Date end) {

        String depotIdSys;
        List<Fz40Grain> listGrain;
@@ -138,8 +139,8 @@
            }

            //TODO ----》
           // listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
            listGrain = null;
            listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
            //listGrain = null;
            if (null == listGrain || listGrain.isEmpty()) {
                log.info("---------设备---{}--未同步到粮情信息，请确认当前条件下是否有数据", device.getDeviceName());
                continue;
@@ -153,11 +154,11 @@


            if (null == deviceReportService) {
                deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
                deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
            }


            deviceReportService.pushGrainData2Cloud(pushData);
           // deviceReportService.reportGrainDataByHand(pushData);

        }

@@ -290,7 +291,6 @@
    @Expose
    public String ajaxTestWeight(Map<String,Object> data) throws Exception {
        double weigh = (double) data.get("weight");
        double deviceId = (double) data.get("deviceId");


        List<GatewayDevice> devices = listAll();
@@ -382,7 +382,7 @@
            lpr.setCarNumber(carNumber);
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("carNumber", carNumber);
            jsonObject.put("position", "big");
            jsonObject.put("position", device.getPosition());
            packet.setProperties(jsonObject);

            packet.setTimestamp(System.currentTimeMillis());
@@ -401,5 +401,23 @@
        log.info("-----------test-------------------");
        return "SUCCESS";
    }
    
    
    /**
     * 
     * gatewayDeviceTestPR#testIde
     * 测试下行分机
     * @param data
     * @return
     */
    @Expose
    public String testIde(Map<String,Object> data) throws Exception {
        String deviceId = (String) data.get("deviceId");
        String bizType = (String) data.get("bizType");
    	 
        log.info("-----------下行分机调试-设备={},事件={}",deviceId,bizType);
    	 
        return "SUCCESS";
    }

}