四川省网关接口相关11

jiazx0107@163.com

2023-10-31 e5e40869b53a0e8c9c4e86d3f488dceb08b3b845

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

@@ -117,7 +117,7 @@
     * gatewayDeviceService#ajaxTestGrain
     * 粮情推送测试
     *
     * @param param
     * @param parameter
     * @return
     */
    @Expose
@@ -133,18 +133,17 @@

        Date dayTime = (Date) parameter.get("dayTime");
        if (null == dayTime) dayTime = new Date();
        QueryParam param = new QueryParam();
        param.setDayTime(dayTime);
        param.setStart(DateUtil.getCurZero(dayTime));
        param.setEnd(DateUtil.getNextZero(dayTime));

        Date start = DateUtil.getCurZero(dayTime);
        Date end = DateUtil.getNextZero(dayTime);


        //如果部署FZZY-IGDS-V40版本系统
        return this.pushByV40(list, param);
        return this.pushByV40(list, start,end);

    }

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

        String depotIdSys;
        List<Fz40Grain> listGrain;
@@ -162,7 +161,7 @@
                continue;
            }

            listGrain = fzzy40CommonService.listGrain(depotIdSys, param.getStart(), param.getEnd());
            listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);

            if (null == listGrain || listGrain.isEmpty()) {
                log.info("---------设备---{}--未同步到粮情信息，请确认当前条件下是否有数据",device.getDeviceName());
@@ -198,7 +197,7 @@
        GrainData result = new GrainData();

        result.setMessageId(ScConstant.getMessageId());
        result.setDeviceId(device.getDeviceId());
        result.setDeviceID(device.getDeviceId());
        result.setAvgTemperature(lastData.getTempAve() + "");
        result.setMinTemperature(lastData.getTempMin() + "");
        result.setMaxTemperature(lastData.getTempMax() + "");
@@ -252,7 +251,6 @@
                    result.setMinX(cableNum + "");
                    result.setMinZ(curTemp);
                }



                details.add(new GrainDataDetail(cableNum, layerNumber, position, curTemp));