获取方案信息逻辑修改

signal-utc-service/src/main/java/net/wanji/utc/entity/cache/PhaseCache.java

@@ -2,20 +2,19 @@ package net.wanji.utc.entity.cache;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author Kent HAN
  * @date 2022/11/18 9:12
  */
 @Data
 public class PhaseCache {
-      private Integer ringNo; // 环号
-      private Integer phaseNo; // 相位号
-      private String phaseName; // "北向进口通行"
-      private Integer phaseSequence; // 相位序
-      private Integer phaseLength; // 相位时间
-      private Integer schemeId; // 方案ID
       private Integer phaseId; // 相位ID
-      private List<Integer> laneNoList; // 车道号列表
+      private Integer phaseNo; // 相位号
+      private String desc; // "北向进口通行"
+      private Integer yellow; // 黄灯时间
+      private Integer allred; // 红灯时间
+      private Integer greenFlash; // 绿闪时间
+      private Integer redFlash; // 红闪时间
+      private Integer minGreen; // 最小绿灯时间
+      private Integer maxGreen; // 最大绿灯时间
 }

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossPhaseMapper.java

@@ -10,9 +10,11 @@ import java.util.List;
  * @date 2022/11/18 10:44
  */
 public interface CrossPhaseMapper {
-    void deleteOne(@Param("crossId") String crossId, @Param("phaseNo") String phaseNo);
+    void deleteBatch(@Param("crossId") String crossId, @Param("schemeId") String schemeId);
 
     void insertOne(CrossPhasePO crossPhasePO);
 
     List<CrossPhasePO> selectByCrossIdAndPlanId(@Param("crossId") String crossId, @Param("planId") String planId);
+
+    List<Integer> selectIdsByPhaseNo(@Param("phaseNo") Integer phaseNo);
 }

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossSchemeMapper.java

@@ -16,6 +16,6 @@ public interface CrossSchemeMapper {
 
     void deleteOne(@Param("crossId") String crossId, @Param("patternNo") String patternNo);
 
-    CrossSchemePO selectByCrossIdAndSchemeNo(@Param("crossId")String crossId,
-                                             @Param("schemeNo")Integer schemeNo);
+    CrossSchemePO selectByCrossIdAndSchemeNo(@Param("crossId") String crossId,
+                                             @Param("schemeNo") Integer schemeNo);
 }

signal-utc-service/src/main/resources/mapper/CrossPhaseMapper.xml

@@ -27,9 +27,9 @@
         values (#{phaseNo},#{name},#{sort},#{crossId},#{planId},#{ringNo},#{controlMode},#{phaseTime},#{greenTime},#{greenFlashTime},#{pedFlashTime},#{yellowTime},#{redTime},#{minGreenTime},#{maxGreenTime})
     </insert>
 
-    <delete id="deleteOne">
+    <delete id="deleteBatch">
         delete from t_cross_phase
-        where cross_id = #{crossId} and phase_no = #{phaseNo}
+        where cross_id = #{crossId} and plan_id = #{schemeId}
     </delete>
 
     <sql id="baseColumn">
@@ -43,4 +43,9 @@
         from  t_cross_phase where cross_id = #{crossId} and planId = #{planId}
     </select>
 
+    <select id="selectIdsByPhaseNo" resultType="java.lang.Integer">
+        select id from t_cross_phase
+        where phase_no = #{phaseNo}
+    </select>
+
 </mapper>