轨迹排序处理(标准)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java

@@ -29,6 +29,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -184,7 +186,6 @@ public class SkTrailController extends ApiController implements ExcelControllerI
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.select("objectValue","objectType","objectName");
-        queryWrapper.orderByAsc("date");
         if (sktrailParam.getLikeField() != null && !sktrailParam.getLikeField().equals("")) {
             queryWrapper.eq("objectType", sktrailParam.getLikeField());
         }
@@ -205,6 +206,24 @@ public class SkTrailController extends ApiController implements ExcelControllerI
 
         IPage page1 = skTrailService.page(page, queryWrapper);
         List<SkTrail> records = page1.getRecords();
+        SimpleDateFormat sf = new SimpleDateFormat();
+        records.sort(new Comparator<SkTrail>() {
+            @Override
+            public int compare(SkTrail o1, SkTrail o2) {
+                try {
+                    long date1 = sf.parse(o1.getDate()).getTime();
+                    long date2 = sf.parse(o2.getDate()).getTime();
+                    if(date1 > date2){
+                        return -1;
+                    }else{
+                        return 1;
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                return 0;
+            }
+        });
         List<SkTrailVO> list = new ArrayList<>();
 
         for (SkTrail skTrail : records) {