From 9dcde5b27b70a4b0c0885347af5405eb2d1ef089 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 12 十二月 2025 17:00:54 +0800
Subject: [PATCH] 修改前端状态显示变更，保持前端实时更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
index 59670ef..aac3b58 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/GlassInfoImportController.java
@@ -12,9 +12,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -135,12 +133,19 @@
List<EngineeringSequence> list = engineeringSequenceService.list();
List<Map<String, Object>> result = list.stream()
.map(seq -> {
- Map<String, Object> map = new HashMap<>();
+ Map<String, Object> map = new LinkedHashMap<>();
map.put("engineeringId", seq.getEngineeringId());
map.put("date", seq.getDate());
map.put("sequence", seq.getSequence());
return map;
})
+ .sorted(Comparator.comparing(
+ (Map<String, Object> map) -> (Date) map.get("date"),
+ Comparator.nullsLast(Comparator.reverseOrder())
+ ).thenComparing(
+ map -> (Integer) map.get("sequence"),
+ Comparator.nullsLast(Comparator.reverseOrder())
+ ))
.collect(Collectors.toList());
return ResponseEntity.ok(result);
} catch (Exception e) {
--
Gitblit v1.8.0