fix 客户列表bug修复

zhanzhiqin

2022-04-25 35b68d05c92ae1eab2e409529a070a217ba492ae

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

@@ -203,7 +203,7 @@
     *
     * @return
     */
    public List<LightReportData> controlEnergySaving() {
    public Map controlEnergySaving() {
        Long clientId = SecurityUtils.getClientId();
//        List<LightBo> listLight = baseMapper.listLight(clientId, null);
//        List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
@@ -212,34 +212,178 @@
        List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
        LocalDateTime now = LocalDateTime.now();

        lightTaskDtos.forEach(Task -> {
        List<LightTaskDto> list1 = new ArrayList<>();
        List<LightTaskDto> list2 = new ArrayList<>();
        List<LightTaskDto> list3 = new ArrayList<>();
        List<LightTaskDto> list4 = new ArrayList<>();
        List<LightTaskDto> list5 = new ArrayList<>();
        List<LightTaskDto> list6 = new ArrayList<>();
        List<LightTaskDto> list7 = new ArrayList<>();

        for (LightTaskDto lightTaskDto : lightTaskDtos) {
            List<Integer> weekList = lightTaskDto.getWeekList();
            System.out.println(weekList + "===========================");
            for (Integer one : weekList) {
                switch (one) {
                    case 1:
                        list1.add(lightTaskDto);
                        break;
                    case 2:
                        list2.add(lightTaskDto);
                        break;
                    case 4:
                        list3.add(lightTaskDto);
                        break;
                    case 8:
                        list4.add(lightTaskDto);
                        break;
                    case 16:
                        list5.add(lightTaskDto);
                        break;
                    case 32:
                        list6.add(lightTaskDto);
                        break;
                    case 64:
                        list7.add(lightTaskDto);
                        break;
                    default:
                }
            }
        }

        Integer week = now.getDayOfWeek().getValue();

        Map map = new HashMap();


        for (int i = 1; i < 8; i++) {
            week--;
            if (week < 1) {
                week = 7;
            }
            map.put(i, "周" + week);
//            map.put(i, getlist(week));
        }


        return map;
    }


    public BigDecimal getlist(Integer week) {

        Long clientId = SecurityUtils.getClientId();
//        List<LightBo> listLight = baseMapper.listLight(clientId, null);
//        List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());

        //获取到正在执行的任务列表
        List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
        LocalDateTime now = LocalDateTime.now();

        List<LightTaskDto> list1 = new ArrayList<>();
        List<LightTaskDto> list2 = new ArrayList<>();
        List<LightTaskDto> list3 = new ArrayList<>();
        List<LightTaskDto> list4 = new ArrayList<>();
        List<LightTaskDto> list5 = new ArrayList<>();
        List<LightTaskDto> list6 = new ArrayList<>();
        List<LightTaskDto> list7 = new ArrayList<>();

        for (LightTaskDto lightTaskDto : lightTaskDtos) {
            List<Integer> weekList = lightTaskDto.getWeekList();
            System.out.println(weekList + "===========================");
            for (Integer one : weekList) {
                switch (one) {
                    case 1:
                        list1.add(lightTaskDto);
                        break;
                    case 2:
                        list2.add(lightTaskDto);
                        break;
                    case 4:
                        list3.add(lightTaskDto);
                        break;
                    case 8:
                        list4.add(lightTaskDto);
                        break;
                    case 16:
                        list5.add(lightTaskDto);
                        break;
                    case 32:
                        list6.add(lightTaskDto);
                        break;
                    case 64:
                        list7.add(lightTaskDto);
                        break;
                    default:
                }
            }
        }
        if (week == 1) {
            return jisuan(list1);
        } else if (week == 2) {
            return jisuan(list2);

        } else if (week == 3) {
            return jisuan(list3);
        } else if (week == 4) {
            return jisuan(list4);
        } else if (week == 5) {
            return jisuan(list5);

        } else if (week == 6) {
            return jisuan(list6);
        } else if (week == 7) {
            return jisuan(list7);
        }

        return null;
    }

    /**
     * 一天的节能率
     *
     * @param list
     * @return
     */
    public BigDecimal jisuan(List<LightTaskDto> list) {
        final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
        /**
         * 节能率计算开始
         */
        list.forEach(Task -> {
//            List<BigDecimal> saving = new ArrayList<>();
            ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
            ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
            //存放节能率
            List<BigDecimal> saving = new ArrayList<>();
            //获取到单灯任务的节能率
            if (Task.getControlOrder() != null) {//有控等指令 拆分计算
                List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());


                for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                    BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
                    if(controlLightCommandVOS.size()==i){
                    if (controlLightCommandVOS.size() == (i + 1)) {
                        BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
                        saving.add(bigDecimal1);
                        System.out.println(bigDecimal1 + "===========================");
//                        saving.add(bigDecimal1);
                        bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
                        break;
                    }
                    startTime = controlLightCommandVOS.get(i);
                    saving.add(bigDecimal);
//                    saving.add(bigDecimal);
                    bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
                }
            }else {//无控灯指令 直接计算
            } else {//无控灯指令 直接计算
                BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
                saving.add(bigDecimal);
//                saving.add(bigDecimal);
                bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
            }


        });
        return bigDecimalResult[0];


        return null;
        /**
         * 节能率计算结束
         */
    }

    /**
@@ -288,7 +432,7 @@
        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        BigDecimal totalTime = (hour.add(min));

        BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
        BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
        System.out.println(energySaving);
        return energySaving;
    }