update...

潘钊
1 parent 8dff7fa1
Showing 6 changed files with 41 additions and 3 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
@@ -121,4 +121,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> setAutoExec(@RequestParam Map<String, String> map){
 		return lineConfigService.setAutoExec(map);
 	}
+
+	@RequestMapping(value = "/setReadReverse")
+	public Map<String, Object> setReadReverse(@RequestParam int status,@RequestParam String lineCode){
+		return lineConfigService.setReadReverse(status, lineCode);
+	}
 }
@@ -131,6 +131,7 @@ public class LineConfigData implements CommandLineRunner {
         if (null == line)
             throw new NullPointerException("异常的lineCode");
+        conf.setReadReverse(true);
         conf.setLine(line);
         //开始运营时间
         conf.setStartOpt("02:00");
@@ -81,7 +81,7 @@ public class InStationProcess {
         //要经过2个中途站才能进
         int count = GpsCacheData.lastInTrailsSize(gps);
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        if (null != sch && isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4
+        if (null != sch && isNormalSch(sch) && gps.getInstation() == 1 && routes.size() > 4
                 && count < 2) {
             logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
             flow = false;
@@ -99,6 +99,10 @@ public class InStationProcess {
         GpsCacheData.in(gps, isEnd);
     }
+    private boolean isNormalSch(ScheduleRealInfo sch) {
+        return sch.getBcType().equals("normal");
+    }
+
     private boolean isNotInOut(ScheduleRealInfo sch) {
         return !sch.getBcType().equals("in") && !sch.getBcType().equals("out");
     }
 package com.bsth.data.gpsdata_v2.handlers;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,15 +20,21 @@ import java.util.List;
 @Component
 public class ReverseRouteProcess {
-    private static final int REVER_THRESHOLD = 3;
+    private static final int REVER_THRESHOLD = 4;
     private static final long TIME_THRESHOLD = 1000 * 60 * 120;
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    LineConfigData lineConfigData;
+
     public void process(GpsEntity gps){
-        if(reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
+
+        LineConfig config = lineConfigData.get(gps.getLineId());
+        if(null != config && config.isReadReverse() &&
+                reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -28,4 +28,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> findByIdx(String idx);
     Map<String,Object> setAutoExec(Map<String, String> map);
+
+    Map<String,Object> setReadReverse(int status, String lineCode);
 }
@@ -245,4 +245,22 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> setReadReverse(int status, String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setReadReverse(status==1?true:false);
+
+            lineConfigData.set(conf);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }