Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 (d9953a03) · Commits · SUMMER2020 / students / proj-2002251

escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,7 @@ public class ResourcesService extends BaseService {
		logger.error("{} is not exist", resourcePath);
		result.setCode(Status.HDFS_OPERATION_ERROR.getCode());
		result.setMsg(String.format("%s is not exist", resourcePath));
		return result;
		}
		} catch (Exception e) {
		logger.error(e.getMessage(), e);

+6 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,9 @@ public class DependentUtils {
		case "last7Days":
		result = DependentDateUtils.getLastDayInterval(businessDate, 7);
		break;
		case "thisWeek":
		result = DependentDateUtils.getThisWeekInterval(businessDate);
		break;
		case "lastWeek":
		result = DependentDateUtils.getLastWeekInterval(businessDate);
		break;
		@@ -119,6 +122,9 @@ public class DependentUtils {
		case "lastSunday":
		result = DependentDateUtils.getLastWeekOneDayInterval(businessDate, 7);
		break;
		case "thisMonth":
		result = DependentDateUtils.getThisMonthInterval(businessDate);
		break;
		case "lastMonth":
		result = DependentDateUtils.getLastMonthInterval(businessDate);
		break;

+20 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,16 @@ public class DependentDateUtils {
		return dateIntervals;
		}

		/**
		* get interval between this month first day and businessDate
		* @param businessDate
		* @return
		*/
		public static List<DateInterval> getThisMonthInterval(Date businessDate) {
		Date firstDay = DateUtils.getFirstDayOfMonth(businessDate);
		return getDateIntervalListBetweenTwoDates(firstDay, businessDate);
		}

		/**
		* get interval between last month first day and last day
		* @param businessDate
		@@ -108,6 +118,16 @@ public class DependentDateUtils {
		}
		}

		/**
		* get interval between monday to businessDate of this week
		* @param businessDate
		* @return
		*/
		public static List<DateInterval> getThisWeekInterval(Date businessDate) {
		Date mondayThisWeek = DateUtils.getMonday(businessDate);
		return getDateIntervalListBetweenTwoDates(mondayThisWeek, businessDate);
		}

		/**
		* get interval between monday to sunday of last week
		* default set monday the first day of week

+20 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,26 @@ public class DependentUtilsTest {
		Assert.assertEquals(dateIntervals.get(0), diCur);


		dateValue = "thisWeek";
		Date firstWeekDay = DateUtils.getMonday(curDay);
		dateIntervals = DependentUtils.getDateIntervalList(curDay, dateValue);

		DateInterval weekHead = new DateInterval(DateUtils.getStartOfDay(firstWeekDay), DateUtils.getEndOfDay(firstWeekDay));
		DateInterval weekThis = new DateInterval(DateUtils.getStartOfDay(curDay), DateUtils.getEndOfDay(curDay));

		Assert.assertEquals(dateIntervals.get(0), weekHead);
		Assert.assertEquals(dateIntervals.get(dateIntervals.size() - 1), weekThis);


		dateValue = "thisMonth";
		Date firstMonthDay = DateUtils.getFirstDayOfMonth(curDay);
		dateIntervals = DependentUtils.getDateIntervalList(curDay, dateValue);

		DateInterval monthHead = new DateInterval(DateUtils.getStartOfDay(firstMonthDay), DateUtils.getEndOfDay(firstMonthDay));
		DateInterval monthThis = new DateInterval(DateUtils.getStartOfDay(curDay), DateUtils.getEndOfDay(curDay));

		Assert.assertEquals(dateIntervals.get(0), monthHead);
		Assert.assertEquals(dateIntervals.get(dateIntervals.size() - 1), monthThis);

		}

+8 −0