[add] 实时监控-路口恢复原始方案

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/CrossPhaseMapper.java

 package net.wanji.opt.dao.mapper;
 
 import net.wanji.opt.po.base.CrossPhasePO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,5 +18,5 @@ public interface CrossPhaseMapper {
      * 查询相位基础信息列表
      * @return
      */
-    List<CrossPhasePO> listCrossPhase();
+    List<CrossPhasePO> listCrossPhase(@Param("crossId") String crossId, @Param("schemeId") String schemeId);
 }

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/CrossSchemeMapper.java

 package net.wanji.opt.dao.mapper;
 
 import net.wanji.opt.po.base.CrossSchemePO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,6 +19,6 @@ public interface CrossSchemeMapper {
      * @param crossId
      * @return
      */
-    List<CrossSchemePO> listCrossSchemeInfo(String crossId);
+    List<CrossSchemePO> listCrossSchemeInfo(@Param("crossId") String crossId, @Param("schemeNo")String schemeNo);
 
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossPhaseServiceImpl.java

@@ -40,7 +40,7 @@ public class CrossPhaseServiceImpl implements CrossPhaseService {
     public List<CrossPhaseDTO> listCrossPhase() {
 
         // 获取相位信息
-        List<CrossPhasePO> crossPhasePOList = crossPhaseMapper.listCrossPhase();
+        List<CrossPhasePO> crossPhasePOList = crossPhaseMapper.listCrossPhase("", "");
         return BeanListUtils.populateList(crossPhasePOList, new ArrayList<>(), CrossPhaseDTO.class);
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossSchemeServiceImpl.java

@@ -34,7 +34,7 @@ public class CrossSchemeServiceImpl implements CrossSchemeService {
     @Override
     public List<CrossSchemeDTO> listCrossSchemeInfo(String crossId) {
 
-        List<CrossSchemePO> schemePOList = crossSchemeMapper.listCrossSchemeInfo(crossId);
+        List<CrossSchemePO> schemePOList = crossSchemeMapper.listCrossSchemeInfo(crossId, "");
         return BeanListUtils.populateList(schemePOList, new ArrayList<>(), CrossSchemeDTO.class);
     }
 

signal-optimize-service/src/main/resources/mapper/CrossSchemeMapper.xml

@@ -15,19 +15,22 @@
     <!-- 查询方案基础信息列表 -->
     <select id="listCrossSchemeInfo" parameterType="String" resultMap="BaseResultMap">
         select
-          id
-          ,scheme_no
-          ,name
-          ,cross_id
-          ,cycle
-          ,coord_phase
-          ,offset
+        id,
+        scheme_no,
+        name,
+        cross_id,
+        cycle,
+        coord_phase,
+        offset
         from
         t_base_cross_scheme
         where 1=1
         <if test="crossId != null and crossId != ''">
             and cross_id = #{crossId}
         </if>
+        <if test="schemeNo != null and schemeNo != ''">
+            and scheme_no = #{schemeNo}
+        </if>
     </select>