Merge remote-tracking branch 'origin/dev' into dev-hkl

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import javafx.scene.effect.Light;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -29,7 +28,6 @@ import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseInf
 import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseService;
 import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementRecordsMasterService;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.*;
-import org.jeecg.modules.deviceAsset.entity.RailManagement;
 import org.jeecg.modules.subwayNetwork.entity.LightRail;
 import org.jeecg.modules.subwayNetwork.entity.LineAlias;
 import org.jeecg.modules.subwayNetwork.entity.SubwaySection;
@@ -44,11 +42,8 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.transaction.Transactional;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -193,11 +188,7 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
         //初始化最终返回的集合
         List<MovementCourseInfoOneVO> resultList = new ArrayList<>();
         if (listResult != null && listResult.size() > 0) {
-            //获取去重后的项目名称的集合
-            Set<String> trackCodeList1 = listResult.stream().map(MovementCourseInfo::getTrackCode).collect(Collectors.toSet());
-            List<String> trackCodeList = trackCodeList1.stream().collect(Collectors.toList());
-            //针对轨号进行倒序排序
-            Collections.reverse(trackCodeList);
+            List<String> trackCodeList = listResult.stream().map(MovementCourseInfo::getTrackCode).distinct().collect(Collectors.toList());
             for (String code : trackCodeList) {
                 //初始化最终返回的对象
                 MovementCourseInfoOneVO resultModel = new MovementCourseInfoOneVO();

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/MovementCourseInfoOneVO.java

@@ -3,8 +3,10 @@ package org.jeecg.modules.checkData.equipmentCheckData.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -26,5 +28,4 @@ public class MovementCourseInfoOneVO {
     @ApiModelProperty("轨号对应的详情集合")
     private List<MovementCourseInfoVO> infoList;
 
-
 }