Commit 46665809 authored by duanruiming's avatar duanruiming

[update] 优化调度特殊日期,普通星期执行逻辑

parent 46d5995b
......@@ -598,7 +598,8 @@ public class PlanSendServiceImpl implements PlanSendService {
phaseListByTimeVO = getPhaseListByTimeVO(planName, datetime, runningPlanDTO, crossIdBO);
}
}
} else if (CollectionUtil.isNotEmpty(week)) {
}
if (CollectionUtil.isNotEmpty(week) && Objects.isNull(phaseListByTimeVO.getPhaseScheme())) {
for (Integer day : week) {
// 1表示周日,2表示周一
int today = DateUtil.dayOfWeek(datetime);
......
......@@ -15,7 +15,8 @@ import org.apache.commons.lang3.StringUtils;
public enum DataBrainLampStatusEnum {
RED("red", "21"),
YELLOW("yellow", "22"),
GREEN("green", "23");
GREEN("green", "23"),
CLOSE("off", "11");
private String wjLampStatus;
private String hisenseLamStatus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment