From f89c8d19d96fdbff3081ba4ac48ea3e72168bc59 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 15:52:44 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java
index e66b74e..14a2d49 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
+import com.sandu.ximon.admin.constant.Constants;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
import com.sandu.ximon.dao.enums.WeekEnums;
import org.quartz.DateBuilder;
@@ -18,17 +19,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 +60,7 @@
if((WeekEnums.SATURDAY.getCode() & week) > 0){
list.add(DateBuilder.SATURDAY);
}
- return list.toArray(new Integer[0]);
+ return list;
}
/**
@@ -73,4 +79,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;
+ }
}
--
Gitblit v1.9.3