1 大屏端 用户点位 关联 气瓶数据展示 调整。

zh-baseversion-common/pom.xml

@@ -176,6 +176,12 @@
             <artifactId>easypoi-annotation</artifactId>
             <version>4.2.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java

@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.date.DateUtil;
 import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.core.page.PageDomain;
 import com.zehong.common.core.page.TableDataInfo;
@@ -207,6 +208,8 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
 
         List<Map<String,Object>> backToMessage = new ArrayList<>();
 
+
+
         StringBuilder sb = new StringBuilder();
         Map<String,Object> map = new HashMap<>();
         if (lpgAirChargeFiles.size() > 0) {
@@ -256,6 +259,9 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
 
         }
 
+//        backToMessage.sort(Comparator.comparing((Map<String, Object> mapitem) -> (Date) mapitem.get("time")).reversed());
+        backToMessage.sort((a,b) ->DateUtil.parse(a.get("time").toString()).getTime() - DateUtil.parse(b.get("time").toString()).getTime() >= 0 ? -1 : 1);
+
         lpgGasBottleFilesBackToVo.setBackToMessage(backToMessage);
         return lpgGasBottleFilesBackToVo;
     }