日志

liuhaonan

2022-05-20 f89c8d19d96fdbff3081ba4ac48ea3e72168bc59

日志

 dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -36,12 +37,22 @@
    /**
     * èƒ½è€—
     */
    private Double energy;
    private BigDecimal energy;

    /**
     * èŠ‚能率
     */
    private Double energySaving;
    private BigDecimal energySaving;

    /**
     * ç”¨æˆ·id
     */
    private Long userId;

    /**
     * å®¢æˆ·id
     */
    private Long clientId;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

 dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java

@@ -7,7 +7,7 @@
/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€light_energy_data(单灯任务能耗/节能率表)】的数据库操作Mapper
 * @createDate 2022-05-20 14:17:38
 * @createDate 2022-05-20 14:21:29
 * @Entity com.sandu.ximon.dao.domain.LightEnergyData
 */
@Mapper

 dao/src/main/resources/mapper/LightEnergyDataMapper.xml

@@ -10,10 +10,13 @@
            <result property="ytdTime" column="ytd_time" jdbcType="TIMESTAMP"/>
            <result property="energy" column="energy" jdbcType="DOUBLE"/>
            <result property="energySaving" column="energy_saving" jdbcType="DOUBLE"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,task_id,ytd_time,
        energy,energy_saving
        energy,energy_saving,user_id,
        client_id
    </sql>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java

@@ -9,7 +9,6 @@
import com.sandu.ximon.admin.param.LightTaskParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightTaskService;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -106,4 +105,13 @@
            return ResponseUtil.fail("下发失败");
        }
    }


    @PostMapping("/energy")
    public ResponseVO<Object> energy() {
        lightTaskService.energy();
        return ResponseUtil.success("true");
    }


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.sandu.ximon.admin.service;

import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.mapper.LightEnergyDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

/**
 * @author LHN
 * @date 2022/05/20
 **/
@Service
@AllArgsConstructor
public class LightEnergyDataService extends BaseServiceImpl<LightEnergyDataMapper, LightEnergyData> {


}

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

@@ -29,7 +29,10 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.mapper.LightMapper;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
@@ -616,10 +619,10 @@
        //判断Task.getWeekList()是否包含昨天的星期数   ä¸åŒ…含直接返回0  ä¸è¿›è¡Œè®¡ç®—
        if (Task.getWeekList() != null && !Task.getWeekList().isEmpty()) {
            if (!Task.getWeekList().contains(week)) {
                return new BigDecimal(0.00);
                return BigDecimal.ZERO;
            }
        } else {
            return new BigDecimal(0.00);
            return BigDecimal.ZERO;
        }


@@ -720,6 +723,87 @@
         */
    }


    /**
     * ä¸€å¤©çš„能耗
     *
     * @param list
     * @return
     */
    public BigDecimal jisuanEnergy(LightTaskDto Task) {
        //存放能耗
        final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};

        //获取昨天的星期数
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime yesterday = now.minusDays(1);
        int week = yesterday.getDayOfWeek().getValue();

        //判断Task.getWeekList()是否包含昨天的星期数   ä¸åŒ…含直接返回0  ä¸è¿›è¡Œè®¡ç®—
        if (Task.getWeekList() != null && !Task.getWeekList().isEmpty()) {
            if (!Task.getWeekList().contains(week)) {
                return BigDecimal.ZERO;
            }
        } else {
            return BigDecimal.ZERO;
        }

        /**
         * èŠ‚能率计算开始
         */
        List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
        ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
        ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
        //获取到单灯任务的节能率
        if (!Task.getControlOrder().isEmpty()) {//有控等指令 æ‹†åˆ†è®¡ç®—
            List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());


            for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                //得到时长*亮度
                BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
                //判断 Energy==0 åˆ™ä¸è®¡ç®—
                if (bigEnergy1.compareTo(new BigDecimal(0)) != 0) {
                    //计算能耗(总   æ—¶é•¿*亮度*功率)
                    BigDecimal totalEnergy = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
                    bigEnergy[0] = bigEnergy[0].add(totalEnergy);
                }
                if (controlLightCommandVOS.size() == (i + 1)) {
                    BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);

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

                    //计算能耗(总   æ—¶é•¿*亮度*功率)
                    if (bigEnergy2.compareTo(new BigDecimal(0)) != 0) {
                        BigDecimal totalEnergy3 = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
                        bigEnergy[0] = bigEnergy[0].add(totalEnergy3);
                    }
                    break;
                }
                startTime = controlLightCommandVOS.get(i);
                //计算能耗(总   æ—¶é•¿*亮度*功率)
            }
        } else {//无控灯指令 ç›´æŽ¥è®¡ç®—
            //计算能耗(部分   æ—¶é•¿*亮度)
            BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
            //计算能耗(总   æ—¶é•¿*亮度*功率)
            //判断 Energy==0 åˆ™ä¸è®¡ç®—
            if (Energy.compareTo(new BigDecimal(0)) != 0) {
                BigDecimal totalEnergy = totalEnergy(Energy, Task.getLightAdress(), poleTaskLightPowerBos);
                bigEnergy[0] = bigEnergy[0].add(totalEnergy);
            }

//                saving.add(bigDecimal);

        }
        return bigEnergy[0];

        /**
         * è®¡ç®—能耗结束
         */
    }


    private BigDecimal totalEnergy(BigDecimal bigEnergy2, String lightAdress, List<PoleTaskLightPowerBo> poleTaskLightPowerBos) {

        //poleTaskLightPowerBos   åŒ…含该任务所有的灯的功率
@@ -785,6 +869,9 @@

//        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
//        BigDecimal hour;
        if (v1.getBrightness() == 0) {
            return BigDecimal.ZERO;
        }
        double hour;
        double min;
        //计算时长
@@ -808,8 +895,13 @@
        //计算时长
        BigDecimal totalTime = BigDecimal.valueOf(hour * 60 + min);

        //计算节能率 ( (1-v1.getBrightness()/100)*totalTime/3600 )   ä¿ç•™ä¸¤ä½å°æ•°
        BigDecimal energySaving = BigDecimal.valueOf((1 - v1.getBrightness() / 100) * totalTime.doubleValue() / 3600).setScale(2, BigDecimal.ROUND_HALF_UP);

        //计算节能率 ( (1-v1.getBrightness()/100)*totalTime/1440 )   ä¿ç•™ä¸¤ä½å°æ•°
        // è®¡ç®— 1-v1.getBrightness()/100的值
        BigDecimal Brightness = BigDecimal.valueOf(100 - v1.getBrightness());
        //Brightness/100*totalTime/1440  ä¿ç•™ä¸¤ä½å°æ•°       Brightness没有除以100  åœ¨æ€»æ—¶é—´*100
        BigDecimal energySaving = Brightness.multiply(totalTime).divide(new BigDecimal(144000), 2, BigDecimal.ROUND_HALF_UP);

        System.out.println(energySaving + "节能率");
        return energySaving;
    }
@@ -817,27 +909,34 @@

    //计算能耗(部分    æ—¶é•¿*亮度)
    public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {

        if (v1.getBrightness() == 0) {
            return BigDecimal.ZERO;
        }
        double hour;
        double min;
        //计算时长
        BigDecimal hour;
        if (v2.getHour() > v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
            hour = v2.getHour() - v1.getHour();
        } else if (v2.getHour() < v1.getHour()) {
            hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
            hour = 24 + (v2.getHour() - v1.getHour());
        } else {
            hour = BigDecimal.valueOf(0);
            hour = 0;
        }
        BigDecimal min;
        //计算分钟

        if (v2.getMin() > v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
            min = v2.getMin() - v1.getMin();
        } else if (v2.getMin() < v1.getMin()) {
            min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
            hour = hour.subtract(BigDecimal.valueOf(1));
            min = 60 + (v1.getMin() - v2.getMin());
            hour = hour - 1;
        } else {
            min = BigDecimal.valueOf(0);
            min = 0;
        }
        BigDecimal totalTime = (hour.add(min));
        //计算时长
        BigDecimal totalTime = BigDecimal.valueOf(hour + min / 60);
        //计算亮灯时长*亮度
        BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100));
        BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
        return energyConsumption;
    }


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

@@ -30,6 +30,7 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
@@ -63,6 +64,7 @@
    private final LightTaskPoleRelationService lightTaskPoleRelationService;
    private final LightTaskMapper lightTaskMapper;
    private final ClientService clientService;
    private final LightEnergyDataService lightEnergyDataService;

    /**
     * æ–°å¢žè·¯ç¯ä»»åŠ¡
@@ -531,7 +533,7 @@


    //计算功率及能耗
    public void test() {
    public void energy() {
        List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
        for (LightTask lightTask : lightTasks) {
            List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class)
@@ -541,9 +543,24 @@
            BeanUtils.copyProperties(lightTask, lightTaskDto);
            lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));

            BigDecimal decimal = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
            BigDecimal energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
            BigDecimal energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);

            //获取昨天的星期数
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime yesterday = now.minusDays(1);

            LightEnergyData lightEnergyData = new LightEnergyData();
            lightEnergyData.setTaskId(lightTask.getTaskId());
            lightEnergyData.setYtdTime(yesterday);
            lightEnergyData.setEnergySaving(energySaving);
            lightEnergyData.setEnergy(energy);
            lightEnergyData.setUserId(lightTask.getUserId());
            lightEnergyData.setClientId(lightTask.getClientId());

            System.out.println(lightEnergyData + "---------------");
            //ID   ä»»åŠ¡id
        }
    }

}