Changes

liuhaonan

2022-05-05 1191ee2f17238364542ec93f53a201abadc619dc

Changes

 .run/²âÊÔ-¹ÜÀí¶Ë.run.xml

@@ -28,7 +28,7 @@
    </option>
    <option name="hostTagId" value="0" />
    <option name="location" value="cd /usr/local/project/ximon-light-20017" />
    <option name="pathOrUrl" value="D:\IdeaProjects\XMPoleManager\ximon-admin\target\ximon-admin-0.0.1-SNAPSHOT.jar" />
    <option name="pathOrUrl" value="E:\IdeaProjects\XMPoleManager\ximon-admin\target\ximon-admin-0.0.1-SNAPSHOT.jar" />
    <option name="tagId" value="0" />
    <option name="terminalCommand" />
    <option name="type" value="HOST" />

 dao/pom.xml

@@ -23,6 +23,12 @@
            <groupId>com.alibaba</groupId>
            <artifactId>easyexcel</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-annotation</artifactId>
            <version>3.4.2</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

</project>

 dao/src/main/java/com/sandu/ximon/dao/bo/PoleTaskLightPowerBo.java

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

import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;

/**
 * ä»»åŠ¡çš„灯杆id和灯的功率
 */
@Data
public class PoleTaskLightPowerBo {
    @JsonIgnore
    private Long id;

    private Long PoleId;
    private Long taskId;
    private Integer power1;
    private Integer power2;
}

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

@@ -1,7 +1,8 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.LightTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
import com.sandu.ximon.dao.domain.LightTask;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
@@ -13,6 +14,8 @@
public interface LightTaskMapper extends BaseMapper<LightTask> {

    List<LightTask> listLightTask(Long userId);

    List<PoleTaskLightPowerBo> listLightTaskByTaskId(Long taskId);
}



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

@@ -39,4 +39,23 @@
            AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
        </if>
    </select>
    <select id="listLightTaskByTaskId" resultType="com.sandu.ximon.dao.bo.PoleTaskLightPowerBo"
            parameterType="java.lang.Long">
        SELECT
        t1.id ,
        t2.task_id,
        t4.power1,
        t4.power2
        FROM
        pole t1
        LEFT JOIN light_task_pole_relation t2 ON t1.id = t2.pole_id
        LEFT JOIN pole_binding t3 ON t3.device_code = t1.device_code
        LEFT JOIN light t4 ON t4.device_code = t1.device_code
        WHERE
        t3.device_type=0
        <if test=" taskId != null">
            AND
            task_id = taskId
        </if>
    </select>
</mapper>

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

@@ -3,6 +3,7 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightControlParam;
import com.sandu.ximon.admin.param.LightPowerSettingParam;
@@ -120,6 +121,13 @@
        return ResponseUtil.success(lightService.controlEnergySaving());
    }


    @PostMapping("/Energy")
    @AnonymousAccess
    public ResponseVO<Object> Energy() {
        return ResponseUtil.success(lightService.controlEnergy());
    }

//    /**
//     * èŽ·å–设备码
//     */

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

@@ -25,12 +25,14 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.ControlLightCommandVO;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
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;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -106,16 +108,15 @@
            List<LightReportData> reportDataList = lightReportDataService.getNewestReportByDeviceCode(deviceCodeList);
            for (LightBo lightBo : listLight) {
                deviceCodeList.forEach(code -> {
                            PoleBinding bind = bindingService.getPoleIdByMac(code);
                            if (bind != null && lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
                                Long poleId = bind.getPoleId();
                                Pole pole = poleService.getById(poleId);
                                lightBo.setPoleId(pole.getId());
                                lightBo.setPoleCode(pole.getDeviceCode());
                                lightBo.setPoleName(pole.getPoleName());
                            }
                        }
                );
                    PoleBinding bind = bindingService.getPoleIdByMac(code);
                    if (bind != null && lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
                        Long poleId = bind.getPoleId();
                        Pole pole = poleService.getById(poleId);
                        lightBo.setPoleId(pole.getId());
                        lightBo.setPoleCode(pole.getDeviceCode());
                        lightBo.setPoleName(pole.getPoleName());
                    }
                });
                for (LightReportData lightReportData : reportDataList) {
                    if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
                        lightBo.setReportTime(lightReportData.getCreateTime1());
@@ -173,8 +174,7 @@
            Map<String, Object> map = new HashMap<>();
            try {
                map.put("deviceCode", param.getDeviceCode());
                WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
                        .sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
                WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance().sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
                if (frame == null) {
                    map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    resultList.add(map);
@@ -206,10 +206,6 @@
     * @return
     */
    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());

        //获取到正在执行的任务列表
        List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
        LocalDateTime now = LocalDateTime.now();
@@ -264,7 +260,75 @@
                week = 7;
            }
            map.put(i, "周" + week);
//            map.put(i, getlist(week));
            map.put(i, getlist(week));
        }


        return map;
    }


    /**
     * å•ç¯èƒ½è€—
     *
     * @return
     */
    public Map controlEnergy() {
        //获取到正在执行的任务列表
        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:
                }
            }
        }

        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));
        }


@@ -324,18 +388,85 @@
            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;
    }


    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();

        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 jisuanEnergy(list1);
        } else if (week == 2) {
            return jisuanEnergy(list2);
        } else if (week == 3) {
            return jisuanEnergy(list3);
        } else if (week == 4) {
            return jisuanEnergy(list4);
        } else if (week == 5) {
            return jisuanEnergy(list5);
        } else if (week == 6) {
            return jisuanEnergy(list6);
        } else if (week == 7) {
            return jisuanEnergy(list7);
        }

        return null;
@@ -349,6 +480,7 @@
     */
    public BigDecimal jisuan(List<LightTaskDto> list) {
        final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
        final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
        /**
         * èŠ‚能率计算开始
         */
@@ -364,21 +496,29 @@

                for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                    BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
                    BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
                    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];
@@ -386,6 +526,84 @@
        /**
         * èŠ‚能率计算结束
         */
    }


    /**
     * ä¸€å¤©çš„能耗
     *
     * @param list
     * @return
     */
    public BigDecimal jisuanEnergy(List<LightTaskDto> list) {
        //存放能耗
        final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
        /**
         * èŠ‚能率计算开始
         */
        list.forEach(Task -> {
            List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
            ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
            ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
            //获取到单灯任务的节能率
            if (Task.getControlOrder() != null) {//有控等指令 æ‹†åˆ†è®¡ç®—
                List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());


                for (int i = 0; i < controlLightCommandVOS.size(); i++) {
                    //得到时长*亮度
                    BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
                    if (controlLightCommandVOS.size() == (i + 1)) {
                        BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);

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

                        //计算能耗(总   æ—¶é•¿*亮度*功率)
                        BigDecimal totalEnergy = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
//                        saving.add(bigDecimal1);
                        bigEnergy[0] = bigEnergy[0].add(totalEnergy);
                        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);
                //计算能耗(总   æ—¶é•¿*亮度*功率)
                BigDecimal totalEnergy = totalEnergy(Energy, Task.getLightAdress(), poleTaskLightPowerBos);
//                saving.add(bigDecimal);
                bigEnergy[0] = bigEnergy[0].add(totalEnergy);
            }
        });
        return bigEnergy[0];

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

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

        //poleTaskLightPowerBos   åŒ…含该任务所有的灯的功率
        //计算功率之和
        BigDecimal totalPower = new BigDecimal(0.00);
        if ("FFFF".equals(lightAdress)) {
            int totalPower1 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower1).sum();
            int totalPower2 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower2).sum();
            totalPower = new BigDecimal(totalPower1 + totalPower2);
        } else if ("0001".equals(lightAdress)) {
            int totalPower1 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower1).sum();
            totalPower = new BigDecimal(totalPower1);
        } else if ("0002".equals(lightAdress)) {
            int totalPower2 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower2).sum();
            totalPower = new BigDecimal(totalPower2);
        } else {
            return null;
        }
        return totalPower.multiply(bigEnergy2);
    }

    /**
@@ -439,14 +657,17 @@
        return energySaving;
    }

//    //计算节能率
//    public void calculateEnergySaving(ControlLightCommandVO v1,ControlLightCommandVO v2){
//      int hour = v2.getHour()- v1.getHour();
//      int min = (v2.getMin()- v1.getMin());
//      int brightness = v2.getBrightness()- v1.getBrightness();
//      int totalTime=(hour*60+min)*60;
//      Double energySaving = (1-(v1.getBrightness()/100.0))*totalTime/(36*24);
//    }

    //计算能耗(部分    æ—¶é•¿*亮度)
    public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {
        //计算时长
        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        BigDecimal totalTime = (hour.add(min));
        //计算亮灯时长*亮度
        BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness()));
        return energyConsumption;
    }


    /**
@@ -492,11 +713,10 @@
        }
        List<Light> lights = listByIds(lightPowerSettingParam.getLightIds());
        lights.forEach(light -> {
                    light.setPower1(lightPowerSettingParam.getPower1());
                    light.setPower2(lightPowerSettingParam.getPower2());
                    light.setLightCount(lightPowerSettingParam.getLightCount());
                }
        );
            light.setPower1(lightPowerSettingParam.getPower1());
            light.setPower2(lightPowerSettingParam.getPower2());
            light.setLightCount(lightPowerSettingParam.getLightCount());
        });
        return updateBatchById(lights);
    }
}