igds-api.git - Gitblit

vince

2025-02-17 320350eb18e32a9a008c4e6409441730732e2e97

优化测温协议

已修改7个文件

	src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java	55 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/bhzn/v01/analysis/AnalysisService.java	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -122,16 +122,14 @@
        BaseReqData reqData = new BaseReqData();
        BaseResp resp;


            for (GatewayDevice device : list) {
                for (int i = 0 ;i<3;i++){

            for (GatewayDevice device : list) {
                    try{
                        //如果不是粮情分机跳过
                        if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
                            continue;
                        }
                        if( i>0 && !device.getDeviceSn().startsWith("91510704731594658J002")){
                        if( i>0 && !(device.getDeviceId().startsWith("91510704731594658J001") ||device.getDeviceId().startsWith("91510704731594658J002") || device.getDeviceId().startsWith("91510700205404914T001"))){
                            continue;
                        }
                        reqData.setDeviceId(device.getDeviceId());
@@ -142,7 +140,7 @@
                        GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
                        resp = syncGrainService.syncGrain(reqData);
                        log.info("命令发送结果："+resp.toString());
                        Thread.sleep(60000);
                        Thread.sleep(120000);
                    }catch (Exception e){
                        log.error(e.getMessage(),e);
                    }

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

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

                curTemp = output.getAvgTemperature();
                //curTemp = output.getAvgTemperature();

            } else {
                //判断最大

 src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java

@@ -277,7 +277,7 @@
        int cableZ = cableData.getCableZ();
        int cableY = cableData.getCableY();

        int sumNum = temps.size();
        int sumNum = 0;
            log.info("temps:" + temps.toString());
        //数据封装
        GrainData grain = new GrainData();
@@ -304,7 +304,7 @@

        double curTemp;
        int x = 0, y = 0, z = 0;
        for (int i = 0; i < sumNum; i++) {
        for (int i = 0; i < temps.size(); i++) {
            curTemp = temps.get(i);
            position = i;

@@ -317,17 +317,27 @@

            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            //求最大最小值
//            if (curTemp < -900) {
//            //    sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }

@@ -448,8 +458,7 @@
        GrainOutPut outPut = new GrainOutPut();


        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableX
                * cableY * cableZ;
        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = 0;

        List<GrainTemp> temperature = new ArrayList<>();
        //根号
@@ -470,16 +479,26 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }

@@ -498,7 +517,7 @@
        outPut.setTemperature(temperature);
        outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
        outPut.setMinTemperature(min + "");
        outPut.setMaxTemperature(min + "");
        outPut.setMaxTemperature(max + "");
        List<GrainTH> ths = new ArrayList<>();

        ths.add(new GrainTH(thDto.getTempIn() != null ? thDto.getTempIn() + "" : "", thDto.getHumidityIn() != null ? thDto.getHumidityIn() + "" : "", "1"));

 src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java

@@ -65,7 +65,7 @@
            // 发送命令
            InvokeResult message = BhznGrainV2ServerEngine.push(device.getIp(), device.getPort(), BytesUtil.hexStrToBytes(hexStr));

            log.error("平台------>>>>控制柜：发送粮情检测命令-{}", message);
            log.info("平台------>>>>控制柜：发送粮情检测命令-{}-{}", message,hexStr);

            // 封装返回信息
            if (!InvokeResult.SUCCESS.getCode().equals(message.getCode())) {

 src/main/java/com/fzzy/protocol/bhzn/v0/analysis/AnalysisService.java

@@ -280,7 +280,7 @@
        int cableY = cableData.getCableY();
        int cableX = cableData.getCableX();

        int sumNum = temps.size();
        int sumNum = 0;

        //数据封装
        GrainData grain = new GrainData();
@@ -307,7 +307,7 @@

        double curTemp;
        int x = 0, y = 0, z = 0;
        for (int i = 0; i < sumNum; i++) {
        for (int i = 0; i < temps.size(); i++) {
            curTemp = temps.get(i);
            position = i;

@@ -321,16 +321,26 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }

@@ -349,7 +359,7 @@
        outPut.setTemperature(temperature);
        outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
        outPut.setMinTemperature(min + "");
        outPut.setMaxTemperature(min + "");
        outPut.setMaxTemperature(max + "");


        JSONObject properties = new JSONObject();
@@ -415,7 +425,7 @@
        GrainOutPut outPut = new GrainOutPut();


        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableData.getSumNum();
        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum =0;

        List<GrainTemp> temperature = new ArrayList<>();
        //根号
@@ -437,16 +447,26 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }


 src/main/java/com/fzzy/protocol/bhzn/v01/analysis/AnalysisService.java

@@ -278,7 +278,7 @@
        int cableY = cableData.getCableY();
        int cableX = cableData.getCableX();

        int sumNum = temps.size();
        int sumNum = 0;

        //数据封装
        GrainData grain = new GrainData();
@@ -319,16 +319,26 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }

@@ -347,7 +357,7 @@
        outPut.setTemperature(temperature);
        outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
        outPut.setMinTemperature(min + "");
        outPut.setMaxTemperature(min + "");
        outPut.setMaxTemperature(max + "");


        JSONObject properties = new JSONObject();
@@ -413,7 +423,7 @@
        GrainOutPut outPut = new GrainOutPut();


        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableData.getSumNum();
        double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = 0;

        List<GrainTemp> temperature = new ArrayList<>();
        //根号
@@ -435,16 +445,26 @@
            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            //求最大最小值
            if (curTemp < -900) {
                sumNum--;
            } else {
                sumT += curTemp;
                if (curTemp > max) {
//            if (curTemp < -900) {
//                sumNum--;
//            } else {
//                sumT += curTemp;
//                if (curTemp > max) {
//                    max = curTemp;
//                }
//                if (curTemp < min) {
//                    min = curTemp;
//                }
//            }
            if (curTemp > max  && curTemp < 40) {
                    max = curTemp;
                }
                if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                    min = curTemp;
                }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }


 src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java

@@ -255,7 +255,7 @@
        outPut.setTemperature(temperature);
        outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
        outPut.setMinTemperature(min + "");
        outPut.setMaxTemperature(min + "");
        outPut.setMaxTemperature(max + "");
        List<GrainTH> ths = new ArrayList<>();

			@@ -122,16 +122,14 @@
			BaseReqData reqData = new BaseReqData();
			BaseResp resp;


			for (GatewayDevice device : list) {
			for (int i = 0 ;i<3;i++){

			for (GatewayDevice device : list) {
			try{
			//如果不是粮情分机跳过
			if (!GatewayDeviceType.TYPE_07.getCode().equals(device.getType())) {
			continue;
			}
			if( i>0 && !device.getDeviceSn().startsWith("91510704731594658J002")){
			if( i>0 && !(device.getDeviceId().startsWith("91510704731594658J001") \|\|device.getDeviceId().startsWith("91510704731594658J002") \|\| device.getDeviceId().startsWith("91510700205404914T001"))){
			continue;
			}
			reqData.setDeviceId(device.getDeviceId());
			@@ -142,7 +140,7 @@
			GatewaySyncGranService syncGrainService = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol());
			resp = syncGrainService.syncGrain(reqData);
			log.info("命令发送结果："+resp.toString());
			Thread.sleep(60000);
			Thread.sleep(120000);
			}catch (Exception e){
			log.error(e.getMessage(),e);
			}

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

			curTemp = output.getAvgTemperature();
			//curTemp = output.getAvgTemperature();

			} else {
			//判断最大

			@@ -277,7 +277,7 @@
			int cableZ = cableData.getCableZ();
			int cableY = cableData.getCableY();

			int sumNum = temps.size();
			int sumNum = 0;
			log.info("temps:" + temps.toString());
			//数据封装
			GrainData grain = new GrainData();
			@@ -304,7 +304,7 @@

			double curTemp;
			int x = 0, y = 0, z = 0;
			for (int i = 0; i < sumNum; i++) {
			for (int i = 0; i < temps.size(); i++) {
			curTemp = temps.get(i);
			position = i;

			@@ -317,17 +317,27 @@

			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// //求最大最小值
			// if (curTemp < -900) {
			// // sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -448,8 +458,7 @@
			GrainOutPut outPut = new GrainOutPut();


			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableX
			* cableY * cableZ;
			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = 0;

			List<GrainTemp> temperature = new ArrayList<>();
			//根号
			@@ -470,16 +479,26 @@
			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// if (curTemp < -900) {
			// sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -498,7 +517,7 @@
			outPut.setTemperature(temperature);
			outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
			outPut.setMinTemperature(min + "");
			outPut.setMaxTemperature(min + "");
			outPut.setMaxTemperature(max + "");
			List<GrainTH> ths = new ArrayList<>();

			ths.add(new GrainTH(thDto.getTempIn() != null ? thDto.getTempIn() + "" : "", thDto.getHumidityIn() != null ? thDto.getHumidityIn() + "" : "", "1"));

			@@ -65,7 +65,7 @@
			// 发送命令
			InvokeResult message = BhznGrainV2ServerEngine.push(device.getIp(), device.getPort(), BytesUtil.hexStrToBytes(hexStr));

			log.error("平台------>>>>控制柜：发送粮情检测命令-{}", message);
			log.info("平台------>>>>控制柜：发送粮情检测命令-{}-{}", message,hexStr);

			// 封装返回信息
			if (!InvokeResult.SUCCESS.getCode().equals(message.getCode())) {

			@@ -280,7 +280,7 @@
			int cableY = cableData.getCableY();
			int cableX = cableData.getCableX();

			int sumNum = temps.size();
			int sumNum = 0;

			//数据封装
			GrainData grain = new GrainData();
			@@ -307,7 +307,7 @@

			double curTemp;
			int x = 0, y = 0, z = 0;
			for (int i = 0; i < sumNum; i++) {
			for (int i = 0; i < temps.size(); i++) {
			curTemp = temps.get(i);
			position = i;

			@@ -321,16 +321,26 @@
			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// if (curTemp < -900) {
			// sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -349,7 +359,7 @@
			outPut.setTemperature(temperature);
			outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
			outPut.setMinTemperature(min + "");
			outPut.setMaxTemperature(min + "");
			outPut.setMaxTemperature(max + "");


			JSONObject properties = new JSONObject();
			@@ -415,7 +425,7 @@
			GrainOutPut outPut = new GrainOutPut();


			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableData.getSumNum();
			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum =0;

			List<GrainTemp> temperature = new ArrayList<>();
			//根号
			@@ -437,16 +447,26 @@
			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// if (curTemp < -900) {
			// sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -278,7 +278,7 @@
			int cableY = cableData.getCableY();
			int cableX = cableData.getCableX();

			int sumNum = temps.size();
			int sumNum = 0;

			//数据封装
			GrainData grain = new GrainData();
			@@ -319,16 +319,26 @@
			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// if (curTemp < -900) {
			// sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -347,7 +357,7 @@
			outPut.setTemperature(temperature);
			outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
			outPut.setMinTemperature(min + "");
			outPut.setMaxTemperature(min + "");
			outPut.setMaxTemperature(max + "");


			JSONObject properties = new JSONObject();
			@@ -413,7 +423,7 @@
			GrainOutPut outPut = new GrainOutPut();


			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableData.getSumNum();
			double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = 0;

			List<GrainTemp> temperature = new ArrayList<>();
			//根号
			@@ -435,16 +445,26 @@
			temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

			//求最大最小值
			if (curTemp < -900) {
			sumNum--;
			} else {
			sumT += curTemp;
			if (curTemp > max) {
			// if (curTemp < -900) {
			// sumNum--;
			// } else {
			// sumT += curTemp;
			// if (curTemp > max) {
			// max = curTemp;
			// }
			// if (curTemp < min) {
			// min = curTemp;
			// }
			// }
			if (curTemp > max && curTemp < 40) {
			max = curTemp;
			}
			if (curTemp < min) {
			if (curTemp < min && curTemp > 3) {
			min = curTemp;
			}
			if(curTemp > 3 && curTemp < 40){
			sumT += curTemp;
			sumNum++;
			}
			}

			@@ -255,7 +255,7 @@
			outPut.setTemperature(temperature);
			outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
			outPut.setMinTemperature(min + "");
			outPut.setMaxTemperature(min + "");
			outPut.setMaxTemperature(max + "");
			List<GrainTH> ths = new ArrayList<>();