行业贡献率因子上下限判断

jinpengyong

2021-12-29 caf0e22cb16cc01d3775db11b82787d5ba22c402

 screen-api/src/main/java/com/moral/api/service/impl/RegionServiceImpl.java

@@ -254,7 +254,7 @@
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                    if (allDeviceSum != null && (Double) allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                        System.out.println(regionSum + "===" + allDeviceSum);
                    }
@@ -365,7 +365,7 @@
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                    if (allDeviceSum != null && (Double) allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                    }
                }
@@ -392,8 +392,13 @@
        QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
        sensorQueryWrapper.select("lower", "upper").eq("code", sensorCode);
        Sensor sensor = sensorService.getOne(sensorQueryWrapper);
        Double sensorLower = sensor.getLower();
        Double sensorUpper = sensor.getUpper();
        Double sensorLower = null;
        Double sensorUpper = null;
        if (sensor != null) {
            sensorLower = sensor.getLower();
            sensorUpper = sensor.getUpper();
        }


        //该组织所有设备信息
        List<String> allMacs = deviceService.getMacsByOrganizationId(orgId);
@@ -482,7 +487,7 @@
                    //行业贡献率计算
                    NumberFormat numberFormat = NumberFormat.getInstance();
                    numberFormat.setMaximumFractionDigits(2);
                    if (allDeviceSum != null) {
                    if (allDeviceSum != null && (Double) allDeviceSum != 0d) {
                        contributionRate = numberFormat.format(regionSum / ((Double) allDeviceSum) * 100) + "%";
                    }
                }