changes

liuhaonan

2022-09-23 0f5b61e7faf30dce9281c913fae59aa9d05c61c4

changes

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

@@ -4,21 +4,19 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import lombok.Data;

/**
 * å•ç¯ä»»åŠ¡èƒ½è€—/节能率表
 *
 * @TableName light_energy_data
 */
@TableName(value = "light_energy_data")
@TableName(value ="light_energy_data")
@Data
public class LightEnergyData implements Serializable {
    /**
     *
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;
@@ -49,6 +47,11 @@
    private Long poleId;

    /**
     * ç¯å¤´åœ°å€
     */
    private String lightAdderss;

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

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

@@ -9,6 +9,7 @@

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;

/**
 * è·¯ç¯ä»»åŠ¡è¡¨
@@ -42,11 +43,13 @@
    /**
     * 1暂停、0启用
     */
    @JsonIgnore
    private Integer pause;

    /**
     * æ˜ŸæœŸå‡ ï¼Œä½è¿ç®—保存，1代表星期一，2星期二，4星期三，8星期四，16星期五，32星期六，64星期日
     */
    @JsonIgnore
    private Integer week;

    /**
@@ -91,4 +94,8 @@

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


    @TableField(exist = false)
    private List<Integer> weekList;
}

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

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

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

@@ -5,21 +5,21 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightEnergyDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightEnergyData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="taskId" column="task_id" jdbcType="BIGINT"/>
        <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
        <result property="energy" column="energy" jdbcType="DOUBLE"/>
        <result property="energySaving" column="energy_saving" jdbcType="DOUBLE"/>
        <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="clientId" column="client_id" jdbcType="BIGINT"/>
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="taskId" column="task_id" jdbcType="BIGINT"/>
            <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
            <result property="energy" column="energy" jdbcType="DECIMAL"/>
            <result property="energySaving" column="energy_saving" jdbcType="DECIMAL"/>
            <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
            <result property="lightAdderss" column="light_adderss" jdbcType="VARCHAR"/>
            <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,user_id,
        client_id
        id,task_id,ytd_time,
        energy,energy_saving,pole_id,
        light_adderss,user_id,client_id
    </sql>
    <select id="getEnergyList" resultType="com.sandu.ximon.dao.domain.LightEnergyData">
        SELECT

 ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java

@@ -29,15 +29,14 @@
    DEL_TASK("/del_task"),

    ADD_REGION("/add_region"),
    GET_REGION_LIST("/get_region_list");
    GET_REGION_LIST("/get_region_list");;

    ;
    private static final String SERVER = "http://47.106.172.9:8000";//todo  æå–到配置文件

    private static final String SERVER = "http://47.106.172.9:8000";

    BroadcastAPI(String url){
    BroadcastAPI(String url) {
        this.url = url;
    }

    private String url;

    public String getUrl() {

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

@@ -2,6 +2,7 @@

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.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.param.ReceiveParam;
@@ -83,4 +84,11 @@
            return ResponseUtil.success("修改音量失败！");
        }
    }

    @AnonymousAccess
    @PostMapping("/getInfo")
    public ResponseVO<Object> getInfo() {
       return ResponseUtil.success(IpVolumeService.getInfo());
    }

}

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

@@ -17,7 +17,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * è·¯ç¯ä»»åŠ¡ç›¸å…³æŽ§åˆ¶ç±»
@@ -58,7 +57,7 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = lightTaskService.delLightTask(param.getTaskIdList());
        String result = lightTaskService.delLightTask(param.getTaskId());
        return ResponseUtil.success(result);

    }
@@ -80,22 +79,21 @@
     * @param
     * @return
     */
    @PostMapping("/clear")
    public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.clearLightTask(poleIds);
        return ResponseUtil.success(result);
    }

//    @PostMapping("/clear")
//    public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
//        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
//        boolean result = lightTaskService.clearLightTask(poleIds);
//        return ResponseUtil.success(result);
//    }
    @GetMapping("/{taskId}")
    public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
        return ResponseUtil.success(objectObjectMap);

        return ResponseUtil.success(lightTaskService.detailLightTask(taskId));
    }

    /**

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java

@@ -22,10 +22,10 @@
    /**
     * ç¯å¤´1是否执行
     */
    private Boolean light1 = false;
//    private Boolean light1 = false;

    /**
     * ç¯å¤´2是否执行
     */
    private Boolean light2 = false;
//    private Boolean light2 = false;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java

@@ -15,6 +15,8 @@
    //  ç»ˆç«¯ IP åœ°å€
    private String ip;
    //  ç»ˆç«¯éŸ³é‡(1-100)
    private Integer volume;
    //  ç»ˆç«¯éŸ³é‡(1-100)
    private Integer volumn;
    //  ç»ˆç«¯ç™»é™†çš„默认音量
    private Integer defaultVolumn;
@@ -35,4 +37,6 @@
    //  å‘¼å«ç­–ç•¥ ID，要终端有呼叫功能支持
    private Integer strategy_id;



}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java

@@ -1,11 +1,8 @@
package com.sandu.ximon.admin.param;

import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;

/**
 * @author chenjiantian
@@ -14,7 +11,7 @@
@Data
public class LightTaskDelParam {

    @NotEmpty(message = "任务id不能为空")
    private List<Long> taskIdList;
    @NotNull(message = "任务id不能为空")
    private Long taskId;

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java

@@ -5,7 +5,6 @@

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;

/**
@@ -51,4 +50,7 @@
    private String lightAddress;

    private List<Long> poleIdList;


    private Long taskId;
}

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

@@ -6,12 +6,12 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -332,4 +332,9 @@
         */
        return flag;
    }


    public static Object getInfo() {
        return TerminalAPIUtils.getTerminalInfo(23);
    }
}

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

@@ -29,10 +29,7 @@
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.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.domain.*;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightMapper;
@@ -636,7 +633,7 @@
     *
     * @return
     */
    public BigDecimal jisuan(LightTaskDto Task) {
    public BigDecimal jisuan(LightTaskDto Task, LightTaskPoleRelation bean) {
        final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
        /**
         * èŠ‚能率计算开始
@@ -758,9 +755,10 @@
     * ä¸€å¤©çš„能耗
     *
     * @param
     * @param bean
     * @return
     */
    public BigDecimal jisuanEnergy(LightTaskDto Task) {
    public BigDecimal jisuanEnergy(LightTaskDto Task, LightTaskPoleRelation bean) {
        //存放能耗
        final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};

@@ -779,9 +777,21 @@
        }

        /**
         * èŠ‚能率计算开始
         * èƒ½è€—计算开始
         */
        List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
//        List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
        List<PoleTaskLightPowerBo> poleTaskLightPowerBos = new ArrayList<>();
        PoleTaskLightPowerBo poleTaskLightPowerBo = new PoleTaskLightPowerBo();
        Light one = getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, bean.getDeviceCode()));

        if (one != null) {
            if ("0001".equals(bean.getLightAddress())) {
                poleTaskLightPowerBo.setPower1(one.getPower1());
            } else {
                poleTaskLightPowerBo.setPower2(one.getPower2());
            }
        }
        poleTaskLightPowerBos.add(poleTaskLightPowerBo);
        ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
        ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
        //获取到单灯任务的节能率
@@ -1009,14 +1019,14 @@
    /**
     * èŽ·å–用户所有的设备码
     */
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode,String orderBy) {
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode, String orderBy) {
        List<String> list;
        if (SecurityUtils.getClientId() != null) {
            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
        } else {

            PageHelper.startPage(pageNo, pageSize,orderBy);
            PageHelper.startPage(pageNo, pageSize, orderBy);
            list = baseMapper.listCode(null, keyword, deviceCode);
        }


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

@@ -2,11 +2,11 @@

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -29,8 +29,9 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskPoleRelationBo;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.admin.vo.LightTaskInfoVO;
import com.sandu.ximon.admin.vo.LightTaskRelationVO;
import com.sandu.ximon.admin.vo.LightTaskVO;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
@@ -38,7 +39,6 @@
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
import com.sandu.ximon.dao.mapper.LightTaskPoleRelationMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -94,7 +94,7 @@
        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());

        newLightTask.setClientId(clientService.getClientId());
        newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
        newLightTask.setUserId(SecurityUtils.getUserId());

        newLightTask.setWeek(week);
@@ -150,18 +150,18 @@
//                        s = s + newLightTask.getControlOrder();
//                    }
//                    // æ›´æ–°ç³»ç»Ÿå®šæ—¶
//                    commend.setSysScheduled(s);
                    commend.setSysScheduled(JSON.toJSONString(newLightTask));
                    System.out.println(commend.getIssueStatus() + "状态");
                    if (commend.getIssueStatus() == 0) {
                        //下发成功  æ›´æ–°ç³»ç»Ÿå®šæ—¶å’Œç¡¬ä»¶å®šæ—¶
                        commend.setDeviceScheduled(JSONUtils.toJSONString(newLightTask));
                        commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
                    } else {
                        //下发失败  æ›´æ–°ç³»ç»Ÿå®šæ—¶  ä¿ç•™ç¡¬ä»¶å®šæ—¶ ç¡¬ä»¶å®šæ—¶
//                        commend.setSysScheduled(s);
                        oldLightTaskStatusAndPoles.forEach(task -> {
                            if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
                                //同一个灯头
                                LightTask oldTask = getById(task.getTaskId());
                                commend.setDeviceScheduled(JSONUtils.toJSONString(oldTask));
                                commend.setDeviceScheduled(task.getDeviceScheduled());
                            }
                        });

@@ -183,7 +183,7 @@

        //删除旧的关系
        lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()).in(LightTaskPoleRelation::getPoleId, poleIdList));
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));

        boolean b = true;
        //保存任务关系
@@ -227,7 +227,7 @@
//        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());

        newLightTask.setClientId(clientService.getClientId());
        newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
        newLightTask.setUserId(SecurityUtils.getUserId());

        newLightTask.setWeek(week);
@@ -347,24 +347,17 @@
            List<LightTaskPoleRelation> finalOldRelation = relations;
            all.forEach(
                    commend -> {
                        commend.setTaskId(newLightTask.getTaskId());
                        //开关灯时间
                        String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
                        if (newLightTask.getControlOrder() != null) {
                            //控灯时间
                            s = s + newLightTask.getControlOrder();
                        }
                        // æ›´æ–°ç³»ç»Ÿå®šæ—¶
                        commend.setSysScheduled(s);
                        commend.setSysScheduled(JSON.toJSONString(newLightTask));
                        commend.setTaskId(taskId);
                        // å…ˆè®¾ç½®ç¡¬ä»¶å®šæ—¶ä¸ºä¸Šæ¬¡çš„硬件定时   ä¸è®ºæˆåŠŸå¤±è´¥
                        String finalS = s;
                        finalOldRelation.forEach(task -> {
                            if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
                                //同一个灯头
                                commend.setDeviceScheduled(task.getDeviceScheduled());
                                if (commend.getIssueStatus() == 0) {
                                    //下发成功  æ›´æ–°ç³»ç»Ÿå®šæ—¶å’Œç¡¬ä»¶å®šæ—¶
                                    commend.setDeviceScheduled(finalS);
                                    commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
                                }
                            }
                        });
@@ -376,8 +369,17 @@

        //编辑前后所有的灯杆ID集合
        poleIdList.addAll(oldList);
        if (!poleIdList.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
        List<Long> longs = new ArrayList<>();
        //去重
        List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
//        for (Long item : poleIdList) {
//            if (!poleIdList.contains(item)) {
//                longs.add(item);
//            }
//        }
        if (!collect.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                    .in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));

        }

@@ -550,48 +552,6 @@
            lightTaskPoleRelation.setTaskId(lightTask.getTaskId());

            // rrpc å‘生定时命令
//            if ("FFFF".equals(lightAddress)) {
//                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
//                lightTaskPoleRelation01.setPoleId(pole.getId());
//                lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
//                lightTaskPoleRelation01.setLightAddress("0001");
//
//                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
//                lightTaskPoleRelation02.setPoleId(pole.getId());
//                lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
//                lightTaskPoleRelation02.setLightAddress("0002");
//
//                // ç¯å¤´1 rrpc å‘生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
//                    //灯头1
//                    if (a5LightTimerRespInnerFrame01 == null) {
//                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    } else {
//                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                }
//
//                //  ç¯å¤´2 rrpc å‘生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
//                    //灯头2
//                    if (a5LightTimerRespInnerFrame02 == null) {
//                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    } else {
//                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                }
//
//                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
//                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
//            } else {
            lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
            lightTaskPoleRelation.setLightAddress(lightAddress);
            // rrpc å‘生定时命令
@@ -648,52 +608,6 @@


            // rrpc å‘生定时命令
//            if ("FFFF".equals(lightAddress)) {
//                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
//                lightTaskPoleRelation01.setPoleId(pole.getId());
//                lightTaskPoleRelation01.setLightAddress("0001");
//
//                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
//                lightTaskPoleRelation02.setPoleId(pole.getId());
//                lightTaskPoleRelation02.setLightAddress("0002");
//
//                // ç¯å¤´1 rrpc å‘生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
//                    //灯头1
//                    if (a5LightTimerRespInnerFrame01 == null) {
//                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                        fail.add(lightTaskPoleRelation01);
//                    } else {
//                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
//                        success.add(lightTaskPoleRelation01);
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    fail.add(lightTaskPoleRelation01);
//                }
//
//                //  ç¯å¤´2 rrpc å‘生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
//                    //灯头2
//                    if (a5LightTimerRespInnerFrame02 == null) {
//                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                        fail.add(lightTaskPoleRelation02);
//                    } else {
//                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
//                        success.add(lightTaskPoleRelation02);
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    fail.add(lightTaskPoleRelation02);
//                }
//
//                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
//                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
//            } else {
            lightTaskPoleRelation.setLightAddress(lightAddress);
            lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
            // rrpc å‘生定时命令
@@ -713,7 +627,6 @@
            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }

//        }
        map.put("success", success);
        map.put("fail", fail);
        map.put("all", lightTaskPoleRelationList);
@@ -723,65 +636,106 @@


    @Transactional(rollbackFor = Exception.class)
    public String delLightTask(List<Long> taskIdList) {
        List<LightTask> lightTaskList = listByIds(taskIdList);
        if (CollectionUtil.isEmpty(lightTaskList)) {
    public String delLightTask(Long taskId) {
        LightTask byId = getById(taskId);
        if (byId == null) {
            throw new BusinessException("找不到任务信息");
        }

        //取出任务关系
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));

        //取出灯杆id
        List<Long> poleIds = relations.stream().map(LightTaskPoleRelation::getPoleId).distinct().collect(Collectors.toList());

        //下发清除任务指令
//        boolean b = clearLightTask(lightTaskIds);
        Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
        /**
         * åˆ é™¤æŽ§ç¯ä»»åŠ¡æ—¥å¿—记录开始
         */
        String content = "{控灯任务id：" + taskIdList + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
        /**
         * åˆ é™¤æŽ§ç¯ä»»åŠ¡æ—¥å¿—记录结束
         */
        if (ffff.get("fail").size() == 0) {
            //全部清除成功  åˆ é™¤å…¨éƒ¨ä»»åŠ¡å…³ç³»
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
            //删除任务
            removeByIds(taskIdList);
            return "任务删除成功";
        if (poleIds != null && poleIds.size() > 0) {
            //存在任务关系   ä¸‹å‘清除任务指令
            Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());

            /**
             * åˆ é™¤æŽ§ç¯ä»»åŠ¡æ—¥å¿—记录开始
             */
            String content = "{控灯任务id：" + taskId + " }";
            StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
            /**
             * åˆ é™¤æŽ§ç¯ä»»åŠ¡æ—¥å¿—记录结束
             */
            if (ffff.get("fail").size() == 0) {
                //全部清除成功  åˆ é™¤å…¨éƒ¨ä»»åŠ¡å…³ç³»
                lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
                //删除任务
                removeById(taskId);
                return "任务删除成功";
            } else if (ffff.get("success").size() != ffff.get("all").size()) {
                //部分成功  åˆ é™¤æˆåŠŸéƒ¨åˆ†çš„关系  ä¿ç•™ä»»åŠ¡
                List<LightTaskPoleRelation> relations1 = ffff.get("success");
                if (relations1 != null && relations1.size() > 0) {
                    relations1.forEach(lightTaskPoleRelation -> {
                        lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
                                .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, taskId));
                    });
                }
                return "部分任务删除成功,清除任务失败的任务及数据保留!";
            } else if (ffff.get("fail").size() == ffff.get("all").size()) {
                //全部失败  ä¿ç•™ä»»åŠ¡
                return "任务删除失败 ,请检查硬件设备!";
            } else {
                return "任务删除失败,未知错误类型!";
            }
        } else {
            //部分清除成功   åˆ é™¤æˆåŠŸéƒ¨åˆ†çš„任务关系
            ffff.get("success").forEach(lightTaskPoleRelation -> {
                lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
                        .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
            });
            //删除任务
            lightTaskList.forEach(
                    taskId -> {
                        List<LightTaskPoleRelation> poleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
                        if (poleRelations.size() == 0) {
                            //不存在任务关系   åˆ é™¤ä»»åŠ¡
                            removeById(taskId);
                        }
                    }
            );
            return "部分任务删除成功,清除任务失败的任务及数据保留";
            //不存在任务关系    ç©ºä»»åŠ¡ç›´æŽ¥åˆ é™¤
            removeById(taskId);
            return "任务删除成功";
        }
    }

    /**
     * ä»»åŠ¡è¯¦æƒ…
     */
    public Map<Object, Object> detailLightTask(Long taskId) {
    public Object detailLightTask(Long taskId) {
        LightTask lightTask = getById(taskId);
        if (lightTask == null) {
            throw new BusinessException("找不到任务");
        }
        List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
        LightTaskInfoVO vo = new LightTaskInfoVO();

//        LightTaskDto lightTaskDto = new LightTaskDto();
//        BeanUtils.copyProperties(lightTask, lightTaskDto);

        lightTask.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));

        vo.setLightTask(lightTask);
        List<LightTaskRelationVO> relations = new ArrayList<>();
        List<LightTaskPoleRelation> taskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getTaskId, taskId));
        if (taskPoleRelations != null && !taskPoleRelations.isEmpty()) {
            taskPoleRelations.forEach(
                    relation -> {
                        LightTaskRelationVO lightTaskRelationVO = new LightTaskRelationVO();
                        lightTaskRelationVO.setLightAddress(relation.getLightAddress());
                        lightTaskRelationVO.setIssueStatus(relation.getIssueStatus());
                        lightTaskRelationVO.setPoleId(relation.getPoleId());

                        LightTaskVO sys = JSONObject.parseObject(relation.getSysScheduled(), LightTaskVO.class);
                        sys.setWeekList(TaskOrderUtil.parseLightWeek2List(sys.getWeek()));
                        lightTaskRelationVO.setSysScheduled(sys);

                        LightTaskVO device = JSONObject.parseObject(relation.getDeviceScheduled(), LightTaskVO.class);
                        if (device != null) {
                            device.setWeekList(TaskOrderUtil.parseLightWeek2List(device.getWeek()));
                            lightTaskRelationVO.setDeviceScheduled(device);
                        }
                        relations.add(lightTaskRelationVO);
                    }
            );

            vo.setRelations(relations);
        }

//        List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);

//        return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
        return vo;
    }

    /**
@@ -871,46 +825,31 @@
     * è®¡ç®—功率及能耗
     */
    public void energy() {
        List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));

        List<Long> taskIdList = new ArrayList<>();
        for (LightTask bean : lightTasks) {
            taskIdList.add(bean.getTaskId());
        }
        if (taskIdList.size() != 0) {
            List<LightTaskPoleRelationBo> list = SpringContextHolder.getBean(LightTaskPoleRelationMapper.class).test(taskIdList);
            for (LightTaskPoleRelationBo bean : list) {

        //所有存在任务的灯杆关系
        List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list();
        for (LightTaskPoleRelation bean : list) {
            if (bean.getDeviceScheduled() != null) {
                //存在硬件任务
                LightTask lightTask = JSONObject.parseObject(bean.getDeviceScheduled(), LightTask.class);
                LightTaskDto lightTaskDto = new LightTaskDto();
                BeanUtils.copyProperties(bean, lightTaskDto);
                lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
                BeanUtils.copyProperties(lightTask, lightTaskDto);
                lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
                BigDecimal energySaving;
                BigDecimal energy;
                //获取昨天的星期数
                LocalDateTime now = LocalDateTime.now();
                LocalDateTime yesterday = now.minusDays(1);
                int week = yesterday.getDayOfWeek().getValue();
                if (!list.isEmpty()) {
                    //有绑定灯杆  è¿›è¡Œè®¡ç®—
                    if (lightTaskDto.getWeekList().contains(week)) {
                        //任务有该星期数  è®¡ç®—
                        energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
                        energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
                    } else {
                        //任务无该星期数  è¿”回
                        energySaving = new BigDecimal(1);
                        energy = BigDecimal.ZERO;
                    }
                    for (int i = 0; i < list.size(); i++) {
                        LightTaskPoleRelation relation = list.get(i);
                        if (relation.getIssueStatus() != 0) {
                            //任务下发失败  è¿”回
                            energySaving = new BigDecimal(1);
                            energy = BigDecimal.ZERO;
                        }
                    }

                if (lightTaskDto.getWeekList().contains(week)) {
                    //任务有该星期数  è®¡ç®—
                    energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto, bean);
                    energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto, bean);
                    System.out.println("能耗: " + energy + ", èŠ‚能率: " + energySaving);
                } else {
                    //未绑定灯杆  ç›´æŽ¥è¿”回
                    //任务无该星期数  è¿”回
                    energySaving = new BigDecimal(1);
                    energy = BigDecimal.ZERO;
                }
@@ -919,19 +858,22 @@
                 * å­˜å‚¨æ•°æ®
                 */

                System.out.println("能耗: " + energy + ", èŠ‚能率: " + energySaving);
                LightEnergyData lightEnergyData = new LightEnergyData();
                lightEnergyData.setTaskId(bean.getTaskId());
                lightEnergyData.setTaskId(lightTask.getTaskId());
                lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                lightEnergyData.setEnergySaving(energySaving);
                lightEnergyData.setEnergy(energy);
                lightEnergyData.setUserId(bean.getUserId());
                lightEnergyData.setClientId(bean.getClientId());
                lightEnergyData.setLightAdderss(lightTask.getLightAdress());
                lightEnergyData.setUserId(lightTask.getUserId());
                lightEnergyData.setClientId(lightTask.getClientId());
                lightEnergyData.setPoleId(bean.getPoleId());
                //保存能耗数据到数据库
                lightEnergyDataService.save(lightEnergyData);
            }

        }


    }

    public boolean clearLightTask(List<Long> poleIds) {
@@ -950,22 +892,29 @@
        String lightAddress = param.getLightAddress();
        List<Long> poleIdList = param.getPoleIdList();
        List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, lightAddress));
        //重复的任务id
        List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
        List<Long> poleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //poleIds中重复元素只保留一个
        //重复的灯杆id
        List<Long> oldPoleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //未重复的灯杆id
        List<Long> finalOldPoleIds = oldPoleIds;
        //取出存在于poleIdList而不在oldPoleIds中的灯杆
        List<Long> newPoleIds = poleIdList.stream().filter(id -> !finalOldPoleIds.contains(id)).collect(Collectors.toList());

        //重复元素只保留一个
        taskIds = taskIds.stream().distinct().collect(Collectors.toList());
        poleIds = poleIds.stream().distinct().collect(Collectors.toList());
        oldPoleIds = oldPoleIds.stream().distinct().collect(Collectors.toList());
        newPoleIds = newPoleIds.stream().distinct().collect(Collectors.toList());
        Map map = new HashMap();
        if (!lightTaskPoleRelations.isEmpty()) {

            map.put("request", "false");
            map.put("msg", "任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
//            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
//                    + "灯杆id为{" + poleIds + "}");
            map.put("result", "false");
            map.put("newPoleIds", newPoleIds);
            map.put("oldPoleIds", oldPoleIds);
            map.put("taskIds", taskIds);
        } else {
            map.put("request", "true");
            map.put("result", "true");
            map.put("msg", "任务中无重复灯杆地址");
        }
        return map;

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java

@@ -3,14 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.BroadcastAPI;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.utils.request.CommonRequestParams;
import com.sandu.ximon.admin.utils.response.CommonResponseVO;
import com.sandu.ximon.admin.utils.response.DataResponseVO;
import com.sandu.ximon.admin.vo.ListDataResponseVO;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.vo.TerminalVO;
import jodd.bean.BeanCopy;
import jodd.bean.BeanUtil;
import org.springframework.beans.BeanUtils;

import java.util.ArrayList;
@@ -25,13 +23,7 @@
     * @return
     */
    public static TerminalDto getTerminalInfo(Integer terminalId) {
        DataResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams().put("id", terminalId).getParams(),
                        BroadcastAPI.GET_TERMINAL.getUrl(),
                        CharUtils.GBK),
                DataResponseVO.class
        );
        DataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.GET_TERMINAL.getUrl(), CharUtils.GBK), DataResponseVO.class);

        TerminalVO bean = responseVO.convert(TerminalVO.class);

@@ -49,13 +41,7 @@
     * èŽ·å–终端服务器对象列表
     */
    public static List<TerminalDto> getTerminalList() {
        ListDataResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams().getParams(),
                        BroadcastAPI.GET_TERMINAL_LIST.getUrl(),
                        CharUtils.GBK),
                ListDataResponseVO.class
        );
        ListDataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().getParams(), BroadcastAPI.GET_TERMINAL_LIST.getUrl(), CharUtils.GBK), ListDataResponseVO.class);

        List<TerminalDto> list = new ArrayList<>();
        if (responseVO.covertTerminalList() != null) {
@@ -81,16 +67,7 @@
     * @return
     */
    public static boolean updateTerminal(Integer terminalId, TerminalVO terminalVO, Long userId) {
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .put("data", JSON.toJSONString(terminalVO))
                                .getParams(),
                        BroadcastAPI.UPDATE_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", JSON.toJSONString(terminalVO)).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        if (responseVO.isOK()) {
//            log("修改播放终端(id:"+terminalId+", name:"+terminalVO.getName()+")",userId,null);
            return true;
@@ -107,15 +84,7 @@
     * @return
     */
    public static boolean delTerminal(Integer terminalId, Long userId) {
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .getParams(),
                        BroadcastAPI.DEL_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.DEL_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        if (responseVO.isOK()) {
//            log("删除播放终端(id:"+terminalId+")",userId,null);
            return true;
@@ -136,17 +105,10 @@
            throw new BusinessException("IP音柱硬件设备不存在");
        }
        terminalInfo.setDefaultVolumn(defaultVolumn);
        terminalInfo.setVolumn(defaultVolumn);
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .put("data", terminalInfo)
                                .getParams(),
                        BroadcastAPI.UPDATE_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        terminalInfo.setVolume(defaultVolumn);

        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", terminalInfo).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        System.out.println(responseVO + " response");
        if (responseVO.isOK()) {
            return true;
        }

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskInfoVO.java

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

import com.sandu.ximon.dao.domain.LightTask;
import lombok.Data;

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/9/23
 */
@Data
public class LightTaskInfoVO {

    /**
     * ä»»åŠ¡
     */
    private LightTask lightTask;

    private List<LightTaskRelationVO> relations;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java

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

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.ximon.dao.domain.LightTask;
import lombok.Data;

/**
 * @author LiuHaoNan
 * @date 2022/9/23
 */
@Data
public class LightTaskRelationVO {

    private  Long poleId;



    private String lightAddress;

    /**
     * ä»»åŠ¡ä¸‹å‘状态，0成功，1校验码错误，2长度错误，3写flash错误，255其他错误
     */
    private Integer issueStatus;


    /**
     * ç³»ç»Ÿå®šæ—¶
     */
    private LightTaskVO sysScheduled;

    /**
     * ç¡¬ä»¶å®šæ—¶
     */
    private LightTaskVO deviceScheduled;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskVO.java

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

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

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/9/23
 */
@Data
public class LightTaskVO {

    private Long taskId;


    /**
     * ä»»åŠ¡åç§°
     */
    private String taskName;

    /**
     * æ˜ŸæœŸå‡ ï¼Œä½è¿ç®—保存，1代表星期一，2星期二，4星期三，8星期四，16星期五，32星期六，64星期日
     */
    @JsonIgnore
    private Integer week;

    private List<Integer> weekList;

    /**
     * å¼€ç¯å‘½ä»¤
     */
    private String openOrder;

    /**
     * å…³é—­ç¯å‘½ä»¤
     */
    private String closeOrder;

    /**
     * ç¯æŽ§å‘½ä»¤
     */
    private String controlOrder;


    /**
     * æŽ§ç¯åœ°å€
     */
    private String lightAdress;


}