fix：“修改机器的报警查询逻辑，查询48小时之内是否有报警“

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -39,13 +39,15 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -179,7 +181,6 @@ public class TEquipmentController {
                 } else {
                     String equipmentIds = adminEquipment.getEquipmentIds();
                     String[] strings = equipmentIds.split(",");
-//                    List<String> equipmentIdList = JSON.parseArray(equipmentIds, String.class);
                     query.in(TEquipment::getId, strings);
                 }
             }
@@ -191,7 +192,7 @@ public class TEquipmentController {
             LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
             adminQuery.eq(TAdmin::getUsername, adminName);
             List<TAdmin> list = tAdminService.list(adminQuery);
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 query.eq(TEquipment::getAdminId, list.get(0).getId());
             }
         }
@@ -254,29 +255,34 @@ public class TEquipmentController {
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            Calendar calendar = new GregorianCalendar();
-            Calendar calendar_end = new GregorianCalendar();
-            calendar.setTime(date);
-            calendar_end.setTime(date);
-
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-
-            calendar_end.set(Calendar.HOUR_OF_DAY, 23);
-            calendar_end.set(Calendar.MINUTE, 59);
-            calendar_end.set(Calendar.SECOND, 59);
-            calendar_end.set(Calendar.MILLISECOND, 999);
-            Date date_start = calendar.getTime();
-            Date date_end = calendar_end.getTime();
+            LocalDateTime dateTime = LocalDateTime.parse(todayDate + "T00:00:00");
+            // 获取前一天的0点时间
+            LocalDateTime startDateTime = dateTime.minusDays(1).with(LocalTime.MIN);
+            // 获取当天的24点时间
+            LocalDateTime endDateTime = dateTime.with(LocalTime.MAX);
+//            Calendar calendar = new GregorianCalendar();
+//            Calendar calendarEnd = new GregorianCalendar();
+//            calendar.setTime(date);
+//            calendarEnd.setTime(date);
+//
+//            calendar.set(Calendar.HOUR_OF_DAY, 0);
+//            calendar.set(Calendar.MINUTE, 0);
+//            calendar.set(Calendar.SECOND, 0);
+//            calendar.set(Calendar.MILLISECOND, 0);
+//
+//            calendarEnd.set(Calendar.HOUR_OF_DAY, 23);
+//            calendarEnd.set(Calendar.MINUTE, 59);
+//            calendarEnd.set(Calendar.SECOND, 59);
+//            calendarEnd.set(Calendar.MILLISECOND, 999);
+//            Date date_start = calendar.getTime();
+//            Date date_end = calendarEnd.getTime();
             LambdaQueryWrapper<TAlarmRecord> query1 = Wrappers.lambdaQuery();
             query1.eq(TAlarmRecord::getEquipmentId, equipmentDTO.getId());
             query1.eq(TAlarmRecord::getIsEliminate, 0);
-//            query1.gt(TAlarmRecord::getOccurrenceTime, date_start);
-//            query1.le(TAlarmRecord::getOccurrenceTime, date_end);
-            query1.gt(TAlarmRecord::getCreateDate, date_start);
-            query1.le(TAlarmRecord::getCreateDate, date_end);
+            query1.gt(TAlarmRecord::getOccurrenceTime, startDateTime);
+            query1.le(TAlarmRecord::getOccurrenceTime, endDateTime);
+//            query1.gt(TAlarmRecord::getCreateDate, date_start);
+//            query1.le(TAlarmRecord::getCreateDate, date_end);
             query1.orderByDesc(TAlarmRecord::getLevel).orderByDesc(TAlarmRecord::getOccurrenceTime);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             if (alarmRecordList.size() > 0) {