|
@@ -25,10 +25,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.GregorianCalendar;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -154,8 +151,14 @@ public class TAlarmRecordController {
|
|
|
tAlarmRecord.eq(TAlarmRecord::getIsEliminate, 0);
|
|
|
tAlarmRecord.gt(TAlarmRecord::getOccurrenceTime, dateStart);
|
|
|
tAlarmRecord.le(TAlarmRecord::getOccurrenceTime, dateEnd);
|
|
|
+ tAlarmRecord.orderByAsc(TAlarmRecord::getOccurrenceTime);
|
|
|
List<TAlarmRecord> list = tAlarmRecordService.list(tAlarmRecord);
|
|
|
if (list.size() > 0) {
|
|
|
+ Map<Long, TAlarmRecord> latestRecordsMap = new HashMap<>();
|
|
|
+ for (TAlarmRecord alarmRecord : list) {
|
|
|
+ latestRecordsMap.put(alarmRecord.getEquipmentId(), alarmRecord);
|
|
|
+ }
|
|
|
+ list = new ArrayList<>(latestRecordsMap.values());
|
|
|
return R.ok(list);
|
|
|
}
|
|
|
return R.ok();
|