更改最新温度和湿度、温度列表，湿度列表的返回字段。

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/utils/DateUtil.java

@@ -23,6 +23,46 @@ import java.util.List;
 //@Slf4j
 public class DateUtil {
 
+    //读取之前hours小时的时间
+    public String getBeforeHoursDatetime(String newTime,int hours) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date newDate = sdf.parse(newTime);
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(newDate);
+        cal.add(Calendar.HOUR_OF_DAY, -hours+1);
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+        String dateText = sdf2.format(cal.getTime());
+        int hour = cal.get(Calendar.HOUR_OF_DAY);
+        String hourText = String.valueOf(hour);
+        if(hour<10){
+            hourText = "0"+String.valueOf(hour);
+        }
+        return dateText + " "+hourText + ":00:00";
+    }
+
+    //读取之后hours小时的时间
+    public String getAfterHoursDatetime(String newTime,int hours) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date newDate = sdf.parse(newTime);
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(newDate);
+        cal.add(Calendar.HOUR_OF_DAY, +hours);
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+        String dateText = sdf2.format(cal.getTime());
+        int hour = cal.get(Calendar.HOUR_OF_DAY);
+        String hourText = String.valueOf(hour);
+        if(hour<10){
+            hourText = "0"+String.valueOf(hour);
+        }
+        return dateText + " "+hourText + ":00:00";
+    }
+
+    public int setCalendarNewTime(String newTime) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(sdf.parse(newTime));
+        return cal.get(Calendar.HOUR_OF_DAY);
+    }
     //
     public String handleAskTime(String askTime) {
         String newAskTime = askTime.substring(0, 4) + "-" + askTime.substring(4, 6) + "-" + askTime.substring(6, 8) + " " + askTime.substring(8, 10) + ":" + askTime.substring(10, 12) + ":" + askTime.substring(12, 14);
@@ -318,4 +358,10 @@ public class DateUtil {
         calendar.set(calendar.get(Calendar.YEAR),calendar.get(Calendar.MONTH),calendar.get(Calendar.DAY_OF_MONTH)-1,0,0,0);
         return calendar.getTime().getTime();
     }
+
+    public String formatTime1(Date datetime) {
+        SimpleDateFormat format = new SimpleDateFormat("MM-dd:HH");
+        String newDatetimeText = format.format(datetime);
+        return newDatetimeText;
+    }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvTempServiceImpl.java

@@ -221,8 +221,8 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         JSONObject resultJo = new JSONObject();
         resultJo.put("lastTemp",lastTempBd.toString());
         resultJo.put("lastHumi",lastHumiBd.toString());
-        resultJo.put("historyTemp",EnvTempList);
-        resultJo.put("historyHumi",EnvHumiList);
+        resultJo.put("tempList",EnvTempList);
+        resultJo.put("humiList",EnvHumiList);
         return new Result(ResultCode.SUCCESS,resultJo);
     }