添加手动推送粮情接口，以便第三方接口调用

jiazx0107@163.com

2024-01-12 efec12bd4827ddefd9b19ccc0eee3ca1c62908f3

 src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java

@@ -31,6 +31,9 @@
    @Resource
    private Fzzy40CommonService fzzy40CommonService;

    @Resource
    private DeviceReportServiceImpl deviceReportService;

    @Override
    public String getProtocol() {
        return PushProtocol.GATEWAY_SC_2023.getCode();
@@ -66,133 +69,121 @@

        if (StringUtils.isEmpty(depotIdSys)) {
            log.error("--------设备--{}-未配置系统相关仓库编码，无法执行当前操作", device.getDeviceName());
            return new BaseResp(BaseResp.CODE_50, "未配置系统相关仓库编码，无法执行当前操作");
            return new BaseResp(BaseResp.CODE_500, "未配置系统相关仓库编码，无法执行当前操作");
        }

        List<Fz40Grain> listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
        if (null == listGrain || listGrain.isEmpty()) {
            log.error("---------设备-{}-系统仓库编码-{}-未同步到粮情信息，请确认当前条件下是否有数据", device.getDeviceName(), device.getDepotIdSys());
            return new BaseResp(BaseResp.CODE_50, "未同步到粮情信息，请确认当前条件下是否有数据");
            return new BaseResp(BaseResp.CODE_500, "未同步到粮情信息，请确认当前条件下是否有数据");
        }

        //获取第一条数据执行推送
        Fz40Grain lastData = listGrain.get(0);
        KafaGrainData pushData = this.lastData2PushData(lastData, device);

        return new BaseResp(JSONObject.toJSONString(pushData));
        return deviceReportService.grainData2GatewayApiInfo(lastData,device);
    }

    /**
     * 将粮情数据转换为推送需要的数据格式
     *
     * @param grainData
     * @return
     */
    private KafaGrainData lastData2PushData(Fz40Grain grainData, GatewayDevice device) {
        KafaGrainData result = new KafaGrainData();
//    /**
//     * 将粮情数据转换为推送需要的数据格式
//     *
//     * @param grainData
//     * @return
//     */
//    private KafaGrainData lastData2PushData(Fz40Grain grainData, GatewayDevice device) {
//        KafaGrainData result = new KafaGrainData();
//
//        result.setMessageId(ScConstant.getMessageId());
//        result.setMessgeId(result.getMessageId());
//        result.setDeviceID(device.getDeviceId());
//        result.setAvgTemperature(grainData.getTempAve() + "");
//        result.setMinTemperature(grainData.getTempMin() + "");
//        result.setMaxTemperature(grainData.getTempMax() + "");
//        result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
//
//        //层-行-列
//        String[] attrCable = grainData.getCable().split("-");
//        if (StringUtils.isNotEmpty(grainData.getCableCir())) {
//            return lastData2PushData2(grainData, device);
//        }
//
//        //层行列
//        int cableZ = Integer.valueOf(attrCable[0]);
//        int cableY = Integer.valueOf(attrCable[1]);
//        int cableX = Integer.valueOf(attrCable[2]);
//
//        //温度集合
//        String[] attr = grainData.getPoints().split(",");
//
//        //根号
//        int cableNum = 1, position = 0;
//        String curTemp;
//        List<KafkaGrainDataDetail1> temperature = new ArrayList<>();
//
//        int x = 0, y = 0, z = 0;
//        for (int i = 0; i < attr.length; i++) {
//            position = i;
//            z = i % cableZ + 1;
//            x = i / (cableZ * cableY);
//            y = x * (cableZ * cableY);
//            y = (i - y) / cableZ;
//            // 倒转X轴
//            x = cableX - 1 - x;
//            //根号
//            cableNum = (i / cableZ) + 1;
//            curTemp = attr[i];
//
//
//            //如果是异常值,执行调整数据 TODO
//            if (Double.valueOf(curTemp) < -99.9) {
//
//                curTemp = grainData.getTempAve() + "";
//
//            } else {
//                //判断最大
//                if (curTemp.equals(result.getMaxTemperature())) {
//                    result.setMaxX(x + "");
//                    result.setMaxY(y + "");
//                    result.setMaxZ(position + "");
//                }
//                //判断最小
//                if (curTemp.equals(result.getMinTemperature())) {
//                    result.setMinX(x + "");
//                    result.setMinY(y + "");
//                    result.setMinZ(position + "");
//                }
//            }
//
//            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
//        }
//
//        //粮温信息
//        JSONObject trhInfo = new JSONObject();
//        // TRHInfo trhInfo = new TRHInfo();
//        trhInfo.put("temperature", temperature);
//
//
//        //仓温度信息
//        KafkaGrainTH grainTH = new KafkaGrainTH();
//        grainTH.setHumidity(grainData.getHumidityIn() + "");
//        grainTH.setTemperature(grainData.getTempIn() + "");
//        grainTH.setAirHumidity(grainData.getHumidityOut() + "");
//        grainTH.setAirTemperature(grainData.getTempOut() + "");
//
//        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
//        temperatureAndhumidity.add(grainTH);
//
//        trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
//        //trhInfo.put("temperatureAndhumidity",grainTH);
//
//        JSONObject params = new JSONObject();
//        params.put("TRHInfo", trhInfo);
//
//        result.setParams(params);
//
//        return result;
//    }

        result.setMessageId(ScConstant.getMessageId());
        result.setMessgeId(result.getMessageId());
        result.setDeviceID(device.getDeviceId());
        result.setAvgTemperature(grainData.getTempAve() + "");
        result.setMinTemperature(grainData.getTempMin() + "");
        result.setMaxTemperature(grainData.getTempMax() + "");
        result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));

        //层-行-列
        String[] attrCable = grainData.getCable().split("-");
        if (StringUtils.isNotEmpty(grainData.getCableCir())) {
            return lastData2PushData2(grainData, device);
        }

        //层行列
        int cableZ = Integer.valueOf(attrCable[0]);
        int cableY = Integer.valueOf(attrCable[1]);
        int cableX = Integer.valueOf(attrCable[2]);

        //温度集合
        String[] attr = grainData.getPoints().split(",");

        //根号
        int cableNum = 1, position = 0;
        String curTemp;
        List<KafkaGrainDataDetail1> temperature = new ArrayList<>();

        int x = 0, y = 0, z = 0;
        for (int i = 0; i < attr.length; i++) {
            position = i;
            z = i % cableZ + 1;
            x = i / (cableZ * cableY);
            y = x * (cableZ * cableY);
            y = (i - y) / cableZ;
            // 倒转X轴
            x = cableX - 1 - x;
            //根号
            cableNum = (i / cableZ) + 1;
            curTemp = attr[i];


            //如果是异常值,执行调整数据 TODO
            if (Double.valueOf(curTemp) < -99.9) {

                curTemp = grainData.getTempAve() + "";

            } else {
                //判断最大
                if (curTemp.equals(result.getMaxTemperature())) {
                    result.setMaxX(x + "");
                    result.setMaxY(y + "");
                    result.setMaxZ(position + "");
                }
                //判断最小
                if (curTemp.equals(result.getMinTemperature())) {
                    result.setMinX(x + "");
                    result.setMinY(y + "");
                    result.setMinZ(position + "");
                }
            }

            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
        }

        //粮温信息
        JSONObject trhInfo = new JSONObject();
        // TRHInfo trhInfo = new TRHInfo();
        trhInfo.put("temperature", temperature);


        //仓温度信息
        KafkaGrainTH grainTH = new KafkaGrainTH();
        grainTH.setHumidity(grainData.getHumidityIn() + "");
        grainTH.setTemperature(grainData.getTempIn() + "");
        grainTH.setAirHumidity(grainData.getHumidityOut() + "");
        grainTH.setAirTemperature(grainData.getTempOut() + "");

        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
        temperatureAndhumidity.add(grainTH);

        trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
        //trhInfo.put("temperatureAndhumidity",grainTH);

        JSONObject params = new JSONObject();
        params.put("TRHInfo", trhInfo);

        result.setParams(params);

        return result;
    }

    /**
     * 针对筒仓  TODO -----
     *
     * @param lastData
     * @param device
     * @return
     */
    private KafaGrainData lastData2PushData2(Fz40Grain lastData, GatewayDevice device) {

        return null;
    }


    @Override