From cb888577b99892706860d2732785d22842aae9b0 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 18 Sep 2020 15:14:34 +0800
Subject: [PATCH] 走行车update
---
src/main/java/com/moral/controller/ScreenController.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 637e37d..547446e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -34,26 +34,7 @@
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
-import com.moral.service.AccountService;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmDailyService;
-import com.moral.service.AreaService;
-import com.moral.service.DeviceService;
-import com.moral.service.DeviceVersionService;
-import com.moral.service.DictionaryDataService;
-import com.moral.service.HangzhouAqiService;
-import com.moral.service.HistoryDailyService;
-import com.moral.service.HistoryHourlyService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.OrganizationLayoutService;
-import com.moral.service.OrganizationService;
-import com.moral.service.QualityDailyService;
-import com.moral.service.SensorService;
-import com.moral.service.SensorUnitService;
-import com.moral.service.WeatherService;
+import com.moral.service.*;
import com.moral.util.*;
import com.rabbitmq.client.*;
@@ -115,6 +96,9 @@
MonitorPointService monitorPointService;
@Resource
DeviceVersionService deviceVersionService;
+
+ /* @Resource
+ HistorySpecialService historySpecialService;*/
/**
* The screen service.
@@ -1500,13 +1484,15 @@
String startHour = st.substring(st.lastIndexOf("-") + 1);
String startTime = startYearAndDay + " " + startHour + ":00:00";
String et = parameters.get("endTime").toString();
+ String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- int endHourValue = Integer.valueOf(endHour);
+ String endTime=endYearAndDay + " " + endHour + ":00:00";
+ /* int endHourValue = Integer.valueOf(endHour);
int startHourValue = Integer.valueOf(startHour);
if (endHourValue <= startHourValue) {
endHourValue = startHourValue + 1;
}
- String endTime = startYearAndDay + " " + endHourValue + ":00:00";
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";*/
parameters.put("startTime", startTime);
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
@@ -1521,6 +1507,7 @@
params.put("sensorInfo", sensorList);
params.put("sensorsMap", sensorsMap);
String paramsJson = params.toJSONString();
+ //System.out.println(paramsJson);
model.addObject("carTrajectoryParams", paramsJson);
model.setViewName("cartrajectory");
return model;
--
Gitblit v1.8.0