Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-06 490e61bcf958e840f221f8d21d0a54ac7c99a7c4

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

@@ -7,10 +7,8 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.quartz.ExecutionJob;
import com.sandu.common.quartz.service.QuartzService;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.constant.Constants;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import com.sandu.ximon.admin.param.LightTaskParam;
@@ -69,7 +67,7 @@
        SingleLightOrderDto openLightOrder = TaskOrderUtil.parseLightOrder(lightTask.getOpenOrder());
        SingleLightOrderDto closeLightOrder = TaskOrderUtil.parseLightOrder(lightTask.getCloseOrder());
        String[] controlOrderArray = StrUtil.split(lightTask.getControlOrder(), LightTaskParam.REQUEST_ORDER_LENGTH);
        Integer[] weekArrays = TaskOrderUtil.parseLightWeek(lightTask.getWeek());
        Integer[] weekArrays = TaskOrderUtil.parseLightCronWeek2List(lightTask.getWeek()).toArray(new Integer[0]);
        if (openLightOrder == null || closeLightOrder == null) {
            throw new BusinessException("解析单灯命令失败");
        }