[update] 方案管理-灯组设置排序

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java

@@ -15,12 +15,7 @@ import net.wanji.web.dto.DirListElement;
 import net.wanji.web.dto.LaneListElement;
 import net.wanji.web.dto.LedConfigListElement;
 import net.wanji.web.dto.SaveLaneInfoDTO;
-import net.wanji.web.mapper.scheme.CrossDirInfoMapper;
-import net.wanji.web.mapper.scheme.CrossLaneLightsMapper;
-import net.wanji.web.mapper.scheme.CrossLightsMapper;
-import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
-import net.wanji.web.mapper.scheme.LaneInfoMapper;
-import net.wanji.web.mapper.scheme.LaneSegmentMapper;
+import net.wanji.web.mapper.scheme.*;
 import net.wanji.web.po.scheme.CrossDirInfoPO;
 import net.wanji.web.po.scheme.CrossLaneLightsPO;
 import net.wanji.web.po.scheme.CrossLightsPO;
@@ -29,14 +24,7 @@ import net.wanji.web.service.scheme.CrossConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -372,6 +360,7 @@ public class CrossConfigServiceImpl implements CrossConfigService {
         }
         // 根据灯组序号排序
         ledConfigList.sort(Comparator.comparing(LedConfigListElement::getOrder));
+        Collections.sort(ledConfigList, Comparator.comparingInt(led -> Integer.valueOf(led.getCode())));
     }
 
     private void setLightAddress(LedConfigListElement ledConfigListElement, String s) {