Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into pudong

王通
2 parents a72fee72 c0a9b893
Showing 4 changed files with 101 additions and 35 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
 package com.bsth.controller.realcontrol;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,35 +52,35 @@ public class AdminUtilsController {
     /**
      * 出现重复班次的车辆
+     *
      * @param
-
-     @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-     public void schRepeat(@RequestParam String nbbm){
-     logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-     List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-     logger.info("检测前，车辆班次数量：" + list.size());
-
-     Map<Long, ScheduleRealInfo> map = new HashMap<>();
-     for(ScheduleRealInfo sch : list){
-     if(map.containsKey(sch.getId())){
-     logger.info("检测到重复ID： " + sch.getId());
-     }
-     map.put(sch.getId(), sch);
-     }
-
-     logger.info("检测后，车辆班次数量：" + list.size());
-     if(map.values().size() > 0){
-     dayOfSchedule.replaceByNbbm(nbbm, map.values());
-     }
-     }*/
+     * @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+     * public void schRepeat(@RequestParam String nbbm){
+     * logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+     * List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+     * logger.info("检测前，车辆班次数量：" + list.size());
+     * <p>
+     * Map<Long, ScheduleRealInfo> map = new HashMap<>();
+     * for(ScheduleRealInfo sch : list){
+     * if(map.containsKey(sch.getId())){
+     * logger.info("检测到重复ID： " + sch.getId());
+     * }
+     * map.put(sch.getId(), sch);
+     * }
+     * <p>
+     * logger.info("检测后，车辆班次数量：" + list.size());
+     * if(map.values().size() > 0){
+     * dayOfSchedule.replaceByNbbm(nbbm, map.values());
+     * }
+     * }
+     */
 /*    @RequestMapping(value = "/directivePushQueue")
     public void directivePushQueue(){
         DirectivePushQueue.start();
     }*/
-
     @RequestMapping(value = "/directiveQueueSize")
-    public void directiveQueueSize(){
+    public void directiveQueueSize() {
         DirectivePushQueue.size();
     }
@@ -87,55 +90,55 @@ public class AdminUtilsController {
     }*/
     @RequestMapping(value = "/webSocketQueueSize")
-    public void webSocketQueueSize(){
+    public void webSocketQueueSize() {
         WebSocketPushQueue.size();
     }
     @RequestMapping(value = "/setHttpFlag")
-    public void setHttpFlag(@RequestParam int flag){
-        if(flag != 0 && flag != -1)
+    public void setHttpFlag(@RequestParam int flag) {
+        if (flag != 0 && flag != -1)
             return;
         GpsDataLoaderThread.setFlag(flag);
     }
     @RequestMapping(value = "/updateCacheBuff")
-    public void updateCacheBuff(){
+    public void updateCacheBuff() {
         geoCacheData.loadData();
     }
     @RequestMapping(value = "/reCalcLpSch")
-    public void reCalcLpSch(){
+    public void reCalcLpSch() {
         dayOfSchedule._test_reCalcLpSch();
     }
     @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName) {
         return dayOfSchedule.getLpScheduleMap().get(lpName);
     }
     @RequestMapping(value = "/findSchByNbbm")
-    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm) {
         return dayOfSchedule.findByNbbm(nbbm);
     }
     @RequestMapping(value = "/removeExecPlan")
-    public int removeExecPlan(@RequestParam String nbbm){
+    public int removeExecPlan(@RequestParam String nbbm) {
         dayOfSchedule.removeExecPlan(nbbm);
         return 1;
     }
     @RequestMapping(value = "/sch_re_calc_id_maps")
-    public int reCalcIdMaps(){
+    public int reCalcIdMaps() {
         return dayOfSchedule.reCalcIdMaps();
     }
     @RequestMapping(value = "/sch_size_string")
-    public String schSizeString(){
+    public String schSizeString() {
         return dayOfSchedule.sizeString();
     }
     @RequestMapping(value = "/containerSize")
-    public Map<String, Integer> containerSize(){
+    public Map<String, Integer> containerSize() {
         Map<String, Integer> rs = new HashMap<>();
         rs.put("60_size", dayOfDirectives.all60().size());
         rs.put("80_size", pilotReport.findAll().size());
@@ -148,7 +151,7 @@ public class AdminUtilsController {
     }
     @RequestMapping(value = "/websocketRadioText")
-    public int radioText(String t, String lineCode){
+    public int radioText(String t, String lineCode) {
         sendUtils.sendRadioText(t, lineCode);
         return 0;
     }
@@ -157,8 +160,47 @@ public class AdminUtilsController {
     DirectivesPstThread directivesPstThread;
     @RequestMapping(value = "/_sd_60_pst")
-    public void sd_60_pst(){
+    public void sd_60_pst() {
         logger.info("手动入库指令....");
         directivesPstThread.run();
     }
+
+    /**
+     * 删除班次，删除内存中未清理掉的非当天的班次
+     * @createDate 2019.05.13
+     * @author zhangxianzhou
+     * @param id 线路id
+     * @return 被删除的班次信息
+     */
+    @RequestMapping("/deleteSchduleBC")
+    public Map deleteSchduleBC(Long id) {
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        ScheduleRealInfo sch = null;
+        try {
+            sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
+            Date date=new Date();
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            String dateStr=sdf.format(date);
+            if (sch.getScheduleDateStr().equals(dateStr)){
+                rs.put("msg", "不能删除当日排班");
+                return rs;
+            }
+            //内存中删除
+            dayOfSchedule.deleteBC(sch);
+            rs.put("delete", sch);
+            rs.put("status", ResponseCode.SUCCESS);
+
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
+            sch.setDeleted(false);
+        }
+
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -86,6 +86,10 @@ public class InStationProcess {
         boolean flow = true;
         //要经过2个中途站才能进
         int count = GpsCacheData.lastInTrailsSize(gps);
+        if (null != sch)
+            logger.info("班次id: -" + sch.getId() + " count:" + count+" sch.getZdzCode(): "+sch.getZdzCode()+" sch.getZdzCode(): "+sch.getZdzCode()+" gps.getCarparkNo() :"+gps.getCarparkNo());
+        else
+        logger.info("sch is null....");
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
         if (null != sch && isNormalSch(sch) && gps.getInstation() == 1 && routes.size() > 4
                 && count < 2) {
@@ -77,6 +77,10 @@ public class OutStationProcess {
     	logger.info("出站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        if (null != sch)
+            logger.info("班次id: " + sch.getId() + " sch.getQdzCode():" + sch.getQdzCode() + " prev.getStopNo():" + prev.getStopNo() + " prev.getStopNo():" + prev.getStopNo() + " sch.getQdzCode():" + sch.getQdzCode() +" prev.getCarparkNo() :"+prev.getCarparkNo()+" diff :"+((int) (sch.getDfsjT() - gps.getTimestamp()))+" dayOfSchedule.isFirstOut(sch) && diff"+(dayOfSchedule.isFirstOut(sch))+" sch.getFcsjActual():"+sch.getFcsjActual()+" StringUtils.isNotEmpty(sch.getFcsjActual())&& !outManyFit(gps, sch) :"+(StringUtils.isNotEmpty(sch.getFcsjActual())&& !outManyFit(gps, sch))+ ")");
+        else
+            logger.info("sch is null....");
         //起点发车
         if (null != sch &&
                 ((sch.getQdzCode().equals(prev.getStopNo())
@@ -1162,4 +1162,20 @@ public class DayOfSchedule {
     public Collection<ScheduleRealInfo> findByGsbm(String gsbm){
         return gsBmScheduleMap.get(gsbm);
     }
+    /**
+     * 删除班次，删除内存中未清理掉的非当天的班次
+     * @createDate 2019.05.13
+     * @author zhangxianzhou
+     * @param sch
+     */
+    public void deleteBC(ScheduleRealInfo sch) {
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
+        id2SchedulMap.remove(sch.getId());
+        lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
+        //如果正在执行该班次
+        if (carExecutePlanMap.get(sch.getClZbh()) == sch) {
+            //重新计算车辆当前执行班次
+            reCalcExecPlan(sch.getClZbh());
+        }
+    }
 }
 \ No newline at end of file