排序

liuhaonan

2022-05-27 8a74d51dafd928a038dfeae9872b513ce8f62ad6

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

@@ -488,9 +488,6 @@

    public BigDecimal getlistEnergy(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();
@@ -610,7 +607,6 @@
        /**
         * 节能率计算开始
         */
        //TODO
        //获取昨天的星期数
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime yesterday = now.minusDays(1);
@@ -619,10 +615,10 @@
        //判断Task.getWeekList()是否包含昨天的星期数   不包含直接返回0  不进行计算
        if (Task.getWeekList() != null && !Task.getWeekList().isEmpty()) {
            if (!Task.getWeekList().contains(week)) {
                return BigDecimal.ZERO;
                return new BigDecimal(1);
            }
        } else {
            return BigDecimal.ZERO;
            return new BigDecimal(1);
        }


@@ -727,7 +723,7 @@
    /**
     * 一天的能耗
     *
     * @param list
     * @param
     * @return
     */
    public BigDecimal jisuanEnergy(LightTaskDto Task) {
@@ -870,7 +866,7 @@
//        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
//        BigDecimal hour;
        if (v1.getBrightness() == 0) {
            return BigDecimal.ZERO;
            return new BigDecimal(1);
        }
        double hour;
        double min;