From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
index 21083f0..cc43b35 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
@@ -7,6 +7,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
+import java.util.List;
/**
* @ClassName MonitorPointDataDisplayForm
@@ -20,21 +21,27 @@
/*
* ������id
- * */
- private Integer monitorPointId;
+ */
+// private Integer monitorPointId;
+
+
+ /**
+ * mac���
+ */
+ private List<String> macs;
/*
* ������������
* */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH")
+ @JsonFormat(pattern = "yyyy-MM-dd HH", timezone = "GMT+8")
private Date startTime;
/*
* ������������
* */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH")
+ @JsonFormat(pattern = "yyyy-MM-dd HH", timezone = "GMT+8")
private Date endTime;
/*
@@ -45,38 +52,41 @@
/*
* ������������������������
* */
- public boolean valid() {
- if (monitorPointId == null)
- return false;
- if (reportType == null) {
- if (startTime == null || endTime == null)
- return false;
- reportType = Constants.DAILYREPORT;
- //������������������������������������������
- String endTimeStr = DateUtils.dateToDateString(endTime,"yyyy-MM-dd");
- endTimeStr+=" 23:59:59";
- endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
- } else {
- if (reportType.equals(Constants.HOURYLYREPORT)) {
- //������������������������������������������
- Date previousHour = DateUtils.getDateOfMin(new Date(), -60);
- startTime = DateUtils.getHourlyStartTime(previousHour);
- } else if (reportType.equals(Constants.DAILYREPORT)) {
- //������������������������������������
- Date yesterday = DateUtils.getDateOfDay(new Date(),-1);
- startTime = DateUtils.getDailyStartTime(yesterday);
- } else if (reportType.equals(Constants.WEEKLYREPORT)) {
- //������������������������������������
- Date previous = DateUtils.getDateOfDay(new Date(),-7);
- startTime = DateUtils.getWeeklyStartTime(previous);
- } else if (reportType.equals(Constants.MONTHLYREPORT)) {
- //������������������������������������
- Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
- startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);
- } else
- return false;
- }
- return true;
- }
+// public boolean valid() {
+// if (monitorPointId == null)
+// return false;
+// if (reportType == null) {
+// if (startTime == null || endTime == null)
+// return false;
+// //������������������������������������������
+// String endTimeStr = DateUtils.dateToDateString(endTime,"yyyy-MM-dd");
+// endTimeStr+=" 23:59:59";
+// endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
+// } else {
+// if(startTime!=null&&endTime!=null)
+// return false;
+// if (reportType.equals(Constants.HOURLY_REPORT)) {
+// //������������������������������������������
+// Date previousHour = DateUtils.getDateOfMin(new Date(), -60);
+// startTime = DateUtils.getHourlyStartTime(previousHour);
+// } else if (reportType.equals(Constants.DAILY_REPORT)) {
+// //������������������������������������
+// Date yesterday = DateUtils.getDateOfDay(new Date(),-1);
+// startTime = DateUtils.getDailyStartTime(yesterday);
+// } else if (reportType.equals(Constants.WEEKLY_REPORT)) {
+// //������������������������������������
+// Date previous = DateUtils.getDateOfDay(new Date(),-7);
+// startTime = DateUtils.getWeeklyStartTime(previous);
+// endTime = DateUtils.getWeeklyEndTime(previous);
+// } else if (reportType.equals(Constants.MONTHLY_REPORT)) {
+// //������������������������������������
+// Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
+// startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);
+// endTime = DateUtils.getMonthlyEndTime(lastMonthFirstDay);
+// } else
+// return false;
+// }
+// return true;
+// }
}
--
Gitblit v1.8.0