最新版本541200007

jiangping

2024-12-13 6ef74724e5da3271b77c8953df3c556439eed13d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -1174,7 +1174,7 @@
        3) 自来水二氧化碳排放量(kg)=自来水使用量(m3)×0.91；*/
        data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
                .add(carbonGas.multiply(new BigDecimal(0.19)))
                .add(carbonWater.multiply(new BigDecimal(0.91)))));
                .add(carbonWater.multiply(new BigDecimal(0.91)))).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
        return data;

    }
@@ -1258,8 +1258,21 @@
            data.setRingPercent("0");
            data.setSecondRegionDataList(new ArrayList<>());
        }
        return data;
        if(data.getSecondRegionDataList()!=null && data.getSecondRegionDataList().size()>1){
            int index =-1;
            for (int i = 0; i <data.getSecondRegionDataList().size() ; i++) {
                RegionTopPowerResponse t=data.getSecondRegionDataList().get(i);
                if(Constants.formatBigdecimal(t.getPercent()).compareTo(new BigDecimal(1)) == 0){
                    index =i;
                    break;
                }
            }
            if(index>-1){
                data.getSecondRegionDataList().remove(index);//删除根节点数据
            }
        }

        return  data;
    }
    /**
     * 近12个水电气油耗数据统计
@@ -1734,6 +1747,12 @@
                }

            }

            data.setVideoPluginUrl(getVideoUrl());
            String indexCodes = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_CHANGNEI_SCREEN_INDEXCODES).getCode();
            if(StringUtils.isNotBlank(indexCodes)){
                data.setVideoIndexCodes(indexCodes.split(","));
            }
        }

        return  data;