changes

liuhaonan

2022-10-26 c7be2ef037c5aebb0cd8f1f33e5fa934389e6083

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

@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.utils;

import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
@@ -18,17 +17,22 @@
public class TaskOrderUtil {

    public static SingleLightOrderDto parseLightOrder(String lightOrder) {
        if (StrUtil.length(lightOrder) != 6) {
        if (StrUtil.length(lightOrder) != 7) {
            return null;
        }
        SingleLightOrderDto singleLightOrderDto = new SingleLightOrderDto();
        singleLightOrderDto.setHour(NumberUtil.parseInt(lightOrder.substring(0, 2)));
        singleLightOrderDto.setMinute(NumberUtil.parseInt(lightOrder.substring(2, 4)));
        singleLightOrderDto.setBrightness(NumberUtil.parseInt(lightOrder.substring(4, 6)));
        singleLightOrderDto.setBrightness(NumberUtil.parseInt(lightOrder.substring(4, 7)));
        return singleLightOrderDto;
    }

    public static Integer[] parseLightWeek(Integer week) {
    /**
     * 转成cron的星期表达式
     * @param week
     * @return
     */
    public static List<Integer> parseLightCronWeek2List(Integer week) {
        if (week == null) {
            return null;
        }
@@ -54,7 +58,7 @@
        if((WeekEnums.SATURDAY.getCode() & week) > 0){
            list.add(DateBuilder.SATURDAY);
        }
        return list.toArray(new Integer[0]);
        return list;
    }

    /**
@@ -73,4 +77,38 @@
        }
        return cronExpression.toString();
    }

    /**
     * 转成的给前端星期表达式
     * @param week
     * @return
     */
    public static List<Integer> parseLightWeek2List(Integer week) {
        if (week == null) {
            return null;
        }
        List<Integer> list = new ArrayList<>();
        if((WeekEnums.MONDAY.getCode() & week) > 0){
            list.add(WeekEnums.MONDAY.getCode());
        }
        if((WeekEnums.TUESDAY.getCode() & week) > 0){
            list.add(WeekEnums.TUESDAY.getCode());
        }
        if((WeekEnums.WEDNESDAY.getCode() & week) > 0){
            list.add(WeekEnums.WEDNESDAY.getCode());
        }
        if((WeekEnums.THURSDAY.getCode() & week) > 0){
            list.add(WeekEnums.THURSDAY.getCode());
        }
        if((WeekEnums.FRIDAY.getCode() & week) > 0){
            list.add(WeekEnums.FRIDAY.getCode());
        }
        if((WeekEnums.SATURDAY.getCode() & week) > 0){
            list.add(WeekEnums.SATURDAY.getCode());
        }
        if((WeekEnums.SUNDAY.getCode() & week) > 0){
            list.add(WeekEnums.SUNDAY.getCode());
        }
        return list;
    }
}