车辆出场异常修复、线调退出异常

ljq
1 parent 4362cc23
Showing 8 changed files with 85 additions and 13 deletions
src/main/java/com/bsth/controller/zndd/LoggerZnddController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/StationInsideProcess.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/zndd/LoggerZnddService.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/zndd/type/dkl.html
@@ -44,4 +44,10 @@ public class LoggerZnddController  extends BaseController&lt;LoggerZndd, Integer&gt; {
     public ScheduleRealInfo thissch(@PathVariable("id") Integer id){
         return loggerZnddService.thissch(id);
     }
+
+    @RequestMapping(value = "LineUserAll", method = RequestMethod.GET)
+    public String LineUserAll(@RequestParam Integer userId) {
+
+        return loggerZnddService.LineUserAll(userId);
+    }
 }
@@ -5,6 +5,8 @@ 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.gpsdata_v2.utils.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import java.util.List;
@@ -16,6 +18,9 @@ import java.util.List;
 @Component
 public class StationInsideProcess {
  
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     public void process(GpsEntity gps) {
         //是否在场内
         String parkCode = GeoUtils.gpsInCarpark(gps);
@@ -25,7 +30,8 @@ public class StationInsideProcess {
             gps.setStopNo(parkCode);
             gps.setCarparkNo(parkCode);
         }
-
+        //重新计算车辆执行班次
+        dayOfSchedule.reCalcExecPlan(gps.getNbbm());
         //是否在站内
         List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
@@ -471,8 +471,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头
         excelPoiOperator.createStringCell(wb, lpHeadRow, (short) 0, "路牌", new Color(0x96b9d7));
  
-        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
-        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = null;
+        StationRoute station2 = null;
  
         // TODO
         Map<String, Object> param = new HashMap<>();
@@ -596,8 +596,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         excelPoiOperator.createStringCell(wb, lpHeadRow, (short) 2, "出场", new Color(0x96b9d7));
  
  
-        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
-        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = null;
+        StationRoute station2 = null;
  
         // TODO
         Map<String, Object> param = new HashMap<>();
@@ -3,6 +3,7 @@ package com.bsth.service.zndd;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.service.BaseService;
+import org.springframework.web.bind.annotation.RequestParam;
  
 import java.util.List;
 import java.util.Map;
@@ -18,4 +19,6 @@ public interface LoggerZnddService extends BaseService&lt;LoggerZndd, Integer&gt; {
  
  
     ScheduleRealInfo thissch(Integer ids);
+
+     String LineUserAll(@RequestParam Integer userId);
 }
@@ -4,19 +4,21 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.RealControAuthority;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.zndd.LoggerZnddRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.sys.RealControAuthorityService;
 import com.bsth.service.zndd.LoggerZnddService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
  
 import java.text.SimpleDateFormat;
 import java.time.LocalTime;
@@ -35,7 +37,8 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
  
-
+    @Autowired
+    RealControAuthorityService realControAuthorityService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     private static SimpleDateFormat sdfMonth = new SimpleDateFormat("HH:mm");
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -179,4 +182,24 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     }
  
  
+
+    public String LineUserAll(@RequestParam Integer userId){
+        String xlNames ="";
+        RealControAuthority rcay = realControAuthorityService.findByUserId(userId);
+        String lineCodeStr = rcay.getLineCodeStr();
+        String[] lineArray = lineCodeStr.split(",");
+        for(String line : lineArray){
+            List<ScheduleRealInfo>  schList = dayOfSchedule.findByLineCode(line);
+            for(ScheduleRealInfo sc : schList){
+                if (sc.getStatus() == 0){
+                    xlNames += sc.getXlName()+",";
+                    break;
+                }
+            }
+        }
+        return xlNames;
+
+    }
+
+
 }
@@ -36,17 +36,26 @@ var gb_northToolbar = (function () {
             //exit
             $('.north .north-toolbar .exit-system').on('click', function () {
                 //调度员退出时提示未全部完成班次的线路
-                debugger
                 //默认只取一个角色
-              /*  if(currentUser.currentUser[0].codeName == "BSTH_A"){
+                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"  || user.roles[0].codeName == "BSTH_A"){
                     //提示未完成线路 搜索该用户下所有的线路 判断是否完成
+                    $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) {
+                        notify_err(rs+"班次还有未完成");
+                        layer.confirm('班次还有未完成，是否要退出线调?', {
+                            btn: ['确定','取消'] //按钮
+                        }, function(){
+                            gb_sch_websocket.sock().close(3000, '退出线调');
+                            window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
+                        }, function(){
+                        });
  
+                    })
+                }else {
+                    //关闭websocket 连接
+                    gb_sch_websocket.sock().close(1000, '退出线调');
+                    window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
                 }
-*/
  
-                //关闭websocket 连接
-                gb_sch_websocket.sock().close(1000, '退出线调');
-                window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
             });
  
             //过滤菜单
@@ -88,6 +88,11 @@ var gb_dataZndd = (function (){
         if (closetwo)  closetwo = false
     });
  
+    var modal_opts = {
+        center: false,
+        bgclose: false
+    }
+
  
     //1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
     function ycsf_sx(line){
@@ -110,6 +115,23 @@ var gb_dataZndd = (function (){
         }
         return  false;
     }
+    //发车信息微调
+    $pop.on('click', '.fcxxwts', function () {
+        if (close)  close = false
+        var that = $(this);
+        debugger
+        var folder = '/real_control_v2/fragments/line_schedule/context_menu';
+        let id = that.data('id')
+
+        $.post('/logZndd/thissch/'+id, function(res) {
+            open_modal(folder + '/fcxxwt.html?r=' + Math.random(), {
+                sch: res
+            }, modal_opts);
+
+        });
+
+    });
+
  
  
     //撤销实发
@@ -430,6 +430,9 @@
                 gb_common.$post('/realSchedule', data, function (rs) {
                     notify_succ('新增临加班次成功');
                     cb && cb(rs);
+                    var folder = '/real_control_v2/zndd/yanshi';
+                    open_modal(folder + '/yanshi.html', {
+                    }, {center: true, bgclose: false, modal: true});
                 }, err);
             }