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 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 816d5eb..547446e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -97,8 +97,8 @@
     @Resource
     DeviceVersionService deviceVersionService;
 
-    @Resource
-    HistorySpecialService historySpecialService;
+  /*  @Resource
+    HistorySpecialService historySpecialService;*/
 
     /**
      * The screen service.
@@ -1484,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();

--
Gitblit v1.8.0