1.条码解析不使用确认尺寸

2.温湿度为0的不算在平均值中

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -250,7 +250,7 @@ public class CodeResolve {
                             log.info("档案["+barcodeFromRule.getPartNumber()+"]不存在");
                             log.info("档案["+barcodeFromRule.getPartNumber()+"]不存在");
 //                            throw new ValidateException("component.error.notExist",new String[]{barcodeFromRule.getPartNumber()});
 //                            throw new ValidateException("component.error.notExist",new String[]{barcodeFromRule.getPartNumber()});
                             throw new ValidateException("smfcore.valueNotExist","{0}[{1}]不存在",new String[]{"component",barcodeFromRule.getPartNumber()});
                             throw new ValidateException("smfcore.valueNotExist","{0}[{1}]不存在",new String[]{"component",barcodeFromRule.getPartNumber()});
-                        }else if(component.isSizeConfirmed() || ((component.hasSizeInfo())&&(!codeBeanFromRule.hasReelSizeInfo()))){
+                        }else if(/*component.isSizeConfirmed() || */((component.hasSizeInfo())&&(!codeBeanFromRule.hasReelSizeInfo()))){
                             //如果已经确认尺寸，使用确认的尺寸
                             //如果已经确认尺寸，使用确认的尺寸
                             codeBeanFromRule.setReelWidth(component.getPlateSize());
                             codeBeanFromRule.setReelWidth(component.getPlateSize());
                             codeBeanFromRule.setReelHeight(component.getHeight());
                             codeBeanFromRule.setReelHeight(component.getHeight());

src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java

@@ -101,12 +101,20 @@ public class HumitureController {
                     resultHumiture.setId(humiture.getId());
                     resultHumiture.setId(humiture.getId());
 
 
                     List<HumiAndtemp> humiAndtempList = JsonUtil.toList(humiAndtempListStr, HumiAndtemp.class);
                     List<HumiAndtemp> humiAndtempList = JsonUtil.toList(humiAndtempListStr, HumiAndtemp.class);
-                    Double humidityAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity));
+                    List<HumiAndtemp> newHumiAndtempList = new ArrayList<>();
+                    for (HumiAndtemp humiAndtemp : humiAndtempList) {
+                        if (humiAndtemp.getHumidity() == 0 || humiAndtemp.getTemperature() == 0){
+
+                        } else {
+                            newHumiAndtempList.add(humiAndtemp);
+                        }
+                    }
+                    Double humidityAgv = newHumiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getHumidity));
                     if (humidityAgv != null){
                     if (humidityAgv != null){
                         resultHumiture.setHumidity(df.format(humidityAgv));
                         resultHumiture.setHumidity(df.format(humidityAgv));
                     }
                     }
 
 
-                    Double temperatureAgv = humiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature));
+                    Double temperatureAgv = newHumiAndtempList.stream().collect(Collectors.averagingDouble(HumiAndtemp::getTemperature));
                     if (temperatureAgv != null){
                     if (temperatureAgv != null){
                         resultHumiture.setTemperature(df.format(temperatureAgv));
                         resultHumiture.setTemperature(df.format(temperatureAgv));
                     }
                     }