Changes

liuhaonan

2022-05-07 c197ffe1a7b5ed3c94c95a95d86ce2ec201c8556

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -259,7 +259,6 @@
            if (week < 1) {
                week = 7;
            }
            map.put(i, "周" + week);
            map.put(i, getlist(week));
        }

@@ -479,7 +478,6 @@
     */
    public BigDecimal jisuan(List<LightTaskDto> list) {
        final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
        final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
        /**
         * 节能率计算开始
         */
@@ -489,35 +487,26 @@
            ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
            //存放节能率
            //获取到单灯任务的节能率
            if (Task.getControlOrder() != null) {//有控等指令 拆分计算
            if (Task.getControlOrder() != null && !Task.getControlOrder().isEmpty()) {//有控等指令 拆分计算
                List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());


                for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                    BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
                    BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
                    bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
                    if (controlLightCommandVOS.size() == (i + 1)) {
                        BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
                        BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);

                        System.out.println(bigDecimal1 + "===========================");
                        System.out.println(bigEnergy + "时长*亮度===========================");
//                        saving.add(bigDecimal1);
                        bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
                        bigEnergy[0] = bigEnergy[0].add(bigEnergy2);
                        break;
                    }
                    startTime = controlLightCommandVOS.get(i);
//                    saving.add(bigDecimal);
                    bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
                    bigEnergy[0] = bigEnergy[0].add(bigEnergy1);
                }
            } else {//无控灯指令 直接计算
                BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
                BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
//                saving.add(bigDecimal);
                bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
                bigEnergy[0] = bigEnergy[0].add(Energy);
            }
        });
        return bigDecimalResult[0];
@@ -552,24 +541,26 @@
                for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                    //得到时长*亮度
                    BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
//                    //计算能耗(总   时长*亮度*功率)
                    BigDecimal totalEnergy = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
                    bigEnergy[0] = bigEnergy[0].add(totalEnergy);
//                    BigDecimal totalEnergy4 = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
//                    bigEnergy[0] = bigEnergy[0].add(totalEnergy4);
                    if (controlLightCommandVOS.size() == (i + 1)) {
                        BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);

                        System.out.println(bigEnergy + "时长*亮度===========================");
                        System.out.println(bigEnergy2 + "时长*亮度===========================");

                        //计算能耗(总   时长*亮度*功率)
                        BigDecimal totalEnergy = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
                        BigDecimal totalEnergy3 = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
//                        saving.add(bigDecimal1);
                        bigEnergy[0] = bigEnergy[0].add(totalEnergy);
                        bigEnergy[0] = bigEnergy[0].add(totalEnergy3);
                        break;
                    }
                    startTime = controlLightCommandVOS.get(i);
                    //计算能耗(总   时长*亮度*功率)
                    BigDecimal totalEnergy = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
                    bigEnergy[0] = bigEnergy[0].add(totalEnergy);
                }
            } else {//无控灯指令 直接计算
                BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
                //计算能耗(部分   时长*亮度)
                BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
                //计算能耗(总   时长*亮度*功率)
@@ -648,8 +639,25 @@
    //计算节能率
    public BigDecimal calculateEnergySaving(ControlLightCommandVO v1, ControlLightCommandVO v2) {

        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
//        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
        BigDecimal hour;
        if (v2.getHour() > v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
        } else if (v2.getHour() < v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
        } else {
            hour = BigDecimal.valueOf(0);
        }
//        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        BigDecimal min;
        if (v2.getMin() > v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        } else if (v2.getMin() < v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
        } else {
            min = BigDecimal.valueOf(0);
        }

        BigDecimal totalTime = (hour.add(min));

        BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
@@ -662,17 +670,24 @@
    public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {
        //计算时长
        BigDecimal hour;
        if (v2.getHour() > v1.getHour()){
        if (v2.getHour() > v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
        }else if (v2.getHour() < v1.getHour()) {
        } else if (v2.getHour() < v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
        } else {
            hour = BigDecimal.valueOf(0);
        }
        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        BigDecimal min;
        if (v2.getMin() > v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        } else if (v2.getMin() < v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
        } else {
            min = BigDecimal.valueOf(0);
        }
        BigDecimal totalTime = (hour.add(min));
        //计算亮灯时长*亮度
        BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness()));
        BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100));
        return energyConsumption;
    }