[update] 方案管理-相位排序

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

@@ -506,6 +506,7 @@ public class PlanSendServiceImpl implements PlanSendService {
             phase.setPhaseNo(phasePO.getPhaseNo());
             phase.setPhaseName(phasePO.getName());
             phase.setSort(phasePO.getSort().toString());
+            phase.setGroupNo(phasePO.getGroupNo());
             phase.setControlMode(phasePO.getControlMode().toString());
             phase.setMinGreenTime(phasePO.getMinGreenTime().toString());
             phase.setMaxGreenTime(phasePO.getMaxGreenTime().toString());
@@ -518,7 +519,10 @@ public class PlanSendServiceImpl implements PlanSendService {
 
             phaseList.add(phase);
         }
-        return phaseList;
+//        Collections.sort(phaseList, (p1, p2) -> p1.getGroupNo() - p2.getGroupNo() &&  (p3, p4) -> Integer.valueOf(p3.getSort()) - Integer.valueOf(p3.getSort()));
+        List<SchemeSendVO.Pattern.Ring.Phase> sort = phaseList.stream().sorted(Comparator.comparingInt(SchemeSendVO.Pattern.Ring.Phase::getGroupNo).thenComparing(SchemeSendVO.Pattern.Ring.Phase::getSort)).collect(Collectors.toList());
+
+        return sort;
     }
 
     private List<ScheduleSendVO.Schedule> buildSchedules(String crossId, ScheduleIdDTO scheduleIdDTO) {

wj-databus/src/main/java/net/wanji/databus/vo/SchemeSendVO.java

@@ -89,6 +89,8 @@ public class SchemeSendVO {
                  */
                 @ApiModelProperty(value = "相位序号", notes = "")
                 private String sort;
+                @ApiModelProperty(name = "组号",notes = "")
+                private Integer groupNo;
                 /**
                  * 控制模式：1定周期；2绿灯；3黄灯；4红灯；5关灯；6绿闪；7黄闪；8红闪
                  */