update

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -814,4 +814,20 @@ public class DateUtils extends PropertyEditorSupport {
         return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
     }
 
+    /**
+     * 日期加 8小时
+     * @param date
+     * @param hours
+     * @return
+     */
+    public static Date addHours(Date date, int hours) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR, hours);
+        return calendar.getTime();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(addHours(new Date(), 8));;
+    }
 }

jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/service/impl/LeanEventWarnInfoServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.leanEventWarn.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.common.enums.EDeviceInformationType;
 import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.gatherData.entity.FpgStatiscsModelMongodb;
@@ -470,16 +471,10 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
         // 使用Criteria添加多个时间范围条件
         for (int i = 0; i < timeRanges.size(); i++) {
             Date startTime = timeRanges.get(i)[0];
-            // 加8小时
-            Calendar calendar1 = Calendar.getInstance();
-            calendar1.setTime(startTime);
-            calendar1.add(Calendar.HOUR, 8);
-            Date specifiedTimePlus8HoursStartTime = calendar1.getTime();
             Date endTime = timeRanges.get(i)[1];
-            Calendar calendar2 = Calendar.getInstance();
-            calendar2.setTime(endTime);
-            calendar2.add(Calendar.HOUR, 8);
-            Date specifiedTimePlus8HoursStartEndTime = calendar2.getTime();
+            // 加8小时
+            Date specifiedTimePlus8HoursStartTime = DateUtils.addHours(startTime, 8);
+            Date specifiedTimePlus8HoursStartEndTime = DateUtils.addHours(endTime, 8);
             query.addCriteria(Criteria.where("createTime").gte(specifiedTimePlus8HoursStartTime).lt(specifiedTimePlus8HoursStartEndTime));
         }
         // 执行查询