Merge remote-tracking branch 'origin/master'

YYC

2023-10-19 a4d1e11a3ee5739d0f3089c53510baad571d9427

 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java

@@ -106,10 +106,10 @@
        grain.setDepotId(response.getHouseId());
        grain.setCompanyId(depotConf.getCompanyId());
        //惠新暂时使用-暂时处理温湿度检测为负值
        if(response.getHIn() < 0){
        if(null != response.getHIn() && response.getHIn() < 0){
            response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));
        }
        if(response.getTIn() < 0){
        if(null != response.getTIn() && response.getTIn() < 0){
            response.setTIn(response.getTAvg());
        }
        grain.setHumidityIn(response.getHIn());