[update] 运行模式优化

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

@@ -97,7 +97,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
     @Override
     public JsonViewObject stepControl(StepControlVO stepControlVO) {
         String resultMessage = "步进控制成功";
-        Integer control = 7;
+        Integer control = 5;
         if (stepControlVO.getCommand() == 0) {
             control = 1;
             resultMessage = "步进控制恢复成功";

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

@@ -655,7 +655,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
                     BeanListUtils.populateList(edgeOptList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
                 if (operationMode == 4) { // 特勤控制
-                    List<TCrossControlHist> specialServiceList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 7).collect(Collectors.toList());
+                    List<TCrossControlHist> specialServiceList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 8).collect(Collectors.toList());
                     BeanListUtils.populateList(specialServiceList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
             } else {

signal-control-service/src/main/resources/mapper/ControlHistMapper.xml

@@ -41,14 +41,16 @@
 
     <select id="selectRecentOne" resultType="net.wanji.web.entity.TCrossControlHist">
         select
-        <include refid="Base_Column_List"/>
-        from t_cross_control_hist
+        t2.cross_id, t2.type, t2.start_time, t2.gmt_create, t2.gmt_modified, t2.operation_user
+        from t_cross_control_hist t2
+        inner join (SELECT max(start_time) start_time, cross_id FROM t_cross_control_hist group by cross_id)
+        t1 on t1.cross_id = t2.cross_id and t1.start_time = t2.start_time
         <where>
             <if test="crossId != null and crossId !=''">
-                cross_id = #{crossId}
+                t2.cross_id = #{crossId}
             </if>
-            and start_time = (select max(start_time) from t_cross_control_hist)
         </where>
+        group by t2.cross_id
     </select>
 
     <select id="selectRecentList" resultMap="tCrossControlHist">