修改代码

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -47,6 +47,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.text.Collator;
 import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -207,6 +208,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             e.setValue(String.format("%.2f",f));
 
         });
+
+        Collator instance = Collator.getInstance(Locale.CHINA);
+        Collections.sort(influxDBList,(e1,e2)->{
+            return instance.compare(e1.getSystemType(),e2.getSystemType());
+        });
         List<IndexDto> collect = influxDBList.stream()
                 .skip((long) (current - 1) * size)
                 .limit(size)

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/pom.xml

@@ -54,6 +54,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>exec</classifier>
+                </configuration>
             </plugin>
         </plugins>
     </build>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/pom.xml

@@ -48,6 +48,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>exec</classifier>
+                </configuration>
             </plugin>
         </plugins>
     </build>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -201,6 +201,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             e.setValue(String.format("%.2f",f));
 
         });
+        Collections.sort(influxDBList,(e1,e2)->{
+            return instance.compare(e1.getSystemType(),e2.getSystemType());
+        });
         List<IndexDto> collect = influxDBList.stream()
                 .skip((long) (current - 1) * size)
                 .limit(size)