From 472d4afae284575f7f0eeeadf0fa97d9031ff24a Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期四, 06 一月 2022 10:50:39 +0800
Subject: [PATCH] 路灯任务接口修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskOrderUtil.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 8ceed7f..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
@@ -29,7 +29,12 @@
return singleLightOrderDto;
}
- public static Integer[] parseLightWeek(Integer week) {
+ /**
+ * 杞垚cron鐨勬槦鏈熻〃杈惧紡
+ * @param week
+ * @return
+ */
+ public static List<Integer> parseLightCronWeek2List(Integer week) {
if (week == null) {
return null;
}
@@ -55,7 +60,7 @@
if((WeekEnums.SATURDAY.getCode() & week) > 0){
list.add(DateBuilder.SATURDAY);
}
- return list.toArray(new Integer[0]);
+ return list;
}
/**
@@ -74,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