方案管理-方案配置，相位信息表增加组号字段

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossPhasePO.java

@@ -32,6 +32,9 @@ public class CrossPhasePO {
     /** 环号 */
     @ApiModelProperty(name = "环号",notes = "")
     private Integer ringNo ;
+    /** 组号 */
+    @ApiModelProperty(name = "组号",notes = "")
+    private Integer groupNo ;
     /** 控制模式：1定周期；2绿灯；3黄灯；4红灯；5关灯；6绿闪；7黄闪；8红闪 */
     @ApiModelProperty(name = "控制模式：1定周期；2绿灯；3黄灯；4红灯；5关灯；6绿闪；7黄闪；8红闪",notes = "")
     private Integer controlMode ;

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

@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author Kent HAN
@@ -75,10 +76,9 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
 
         Integer lightId = lightIdDTO.getLightId();
         List<CrossLaneLightsPO> crossLaneLightsPOList = crossLaneLightsMapper.selectLanesByLightId(crossId, lightId);
-        List<String> laneIds = new ArrayList<>();
-        for (CrossLaneLightsPO crossLaneLightsPO : crossLaneLightsPOList) {
-            laneIds.add(crossLaneLightsPO.getLaneId());
-        }
+        List<String> laneIds = crossLaneLightsPOList.stream()
+                .map(CrossLaneLightsPO::getLaneId)
+                .collect(Collectors.toList());
         laneIdsVO.setLaneIds(laneIds);
 
         return laneIdsVO;

signal-control-service/src/main/resources/mapper/scheme/CrossPhaseMapper.xml

@@ -11,6 +11,7 @@
         <result property="crossId" column="cross_id"/>
         <result property="planId" column="plan_id"/>
         <result property="ringNo" column="ring_no"/>
+        <result property="groupNo" column="group_no"/>
         <result property="controlMode" column="control_mode"/>
         <result property="phaseTime" column="phase_time"/>
         <result property="greenTime" column="green_time"/>
@@ -25,8 +26,8 @@
     </resultMap>
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_phase(phase_no,name,sort,cross_id,plan_id,ring_no,control_mode,phase_time,green_time,green_flash_time,ped_flash_time,yellow_time,red_time,min_green_time,max_green_time)
-        values (#{phaseNo},#{name},#{sort},#{crossId},#{planId},#{ringNo},#{controlMode},#{phaseTime},#{greenTime},#{greenFlashTime},#{pedFlashTime},#{yellowTime},#{redTime},#{minGreenTime},#{maxGreenTime})
+        insert into t_base_cross_phase(phase_no,name,sort,cross_id,plan_id,ring_no,group_no,control_mode,phase_time,green_time,green_flash_time,ped_flash_time,yellow_time,red_time,min_green_time,max_green_time)
+        values (#{phaseNo},#{name},#{sort},#{crossId},#{planId},#{ringNo},#{groupNo},#{controlMode},#{phaseTime},#{greenTime},#{greenFlashTime},#{pedFlashTime},#{yellowTime},#{redTime},#{minGreenTime},#{maxGreenTime})
     </insert>
 
     <delete id="deleteByCrossId">