智能调度执行记录

ljq
1 parent 82b25198
Showing 13 changed files with 544 additions and 135 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/zndd/LoggerZnddController.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/ZnddThread.java
src/main/java/com/bsth/entity/zndd/LoggerZndd.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/zndd/LoggerZnddService.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/pages/forms/zndd/logger_zndd.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
@@ -884,4 +884,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return res;
 	}
+
+	/**
+	 * 智能调度大间隔临加班次
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "thissch/{ids}", method = RequestMethod.POST)
+	public ScheduleRealInfo thissch(@RequestParam Integer ids){
+		return scheduleRealInfoService.thissch(ids);
+	}
 }
+package com.bsth.controller.zndd;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.zndd.LoggerZndd;
+import com.bsth.entity.zndd.ZnddYuAn;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("logZndd")
+public class LoggerZnddController  extends BaseController<LoggerZndd, Integer> {
+}
@@ -10,7 +10,6 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
-import com.bsth.entity.StationRoute;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.StationRouteRepository;
@@ -54,7 +53,9 @@ public class AutomaticSch {
     carMonitor carMonitor;
     @Autowired
     BasicData basicData;
-    
+
+    Queue<Map>  queue = new LinkedList<>();
+
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
     SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -62,24 +63,24 @@ public class AutomaticSch {
     private Map<String,Long> drivreMap =new HashMap<>(); //自动重发map
     // 当日60指令缓存
     private   ConcurrentMap<Integer, D60> d60Map = new ConcurrentHashMap<>();//d60map
-    
+
     String urldkl = "http://10.10.200.202:5580/monitor/api/getMonitorInfoByDay?key=1&solt=1111&t=1&dayStr=2024-07-23"; //大间隔接口
     //http://10.10.200.201:8083/wxk-prod-api/service-api/lggj/schedule/drByInfo  维修接口
     private Map<String,Long> SFMAP = new HashMap<>();
-    
+
     //满载
     public  void mz(){
         try {
             ScheduleRealInfo sr = dayOfSchedule.executeCurr("S0R-054");
-            ts(addStationPeople(sr, "MZ", 0L));//第二种 设备未离线 出站时间内未出站 
+            ts(addStationPeople(sr, "MZ", 0L));//第二种 设备未离线 出站时间内未出站
         }
         catch (Exception e){
             logger.error("满载------------------",e);
         }
     }
-    
+
     //大间隔的情况
     public void dfTz(){
         try{
@@ -88,33 +89,60 @@ public class AutomaticSch {
                 return;
             JSONObject obj = JSON.parseObject(sb.toString());
             List<LargeGap> lgs = JSON.parseArray(obj.getString("largeGap"), LargeGap.class);
-            Long its = 0l;
+            ScheduleRealInfo sch;
             //数据转换 并推送
             for (LargeGap lg : lgs){
                  if(dayOfSchedule.executeCurr(lg.getNbbm()) != null){
-                     its= dayOfSchedule.executeCurr(lg.getNbbm()).getId();
+                     sch= dayOfSchedule.executeCurr(lg.getNbbm());
                  }else {
                      continue;
                  }
-                ts(ConvertDJK(lg,its.toString()));
+
+                ts(ConvertDJK(lg,sch));
             }
-            
+
         }catch (Exception e){
             logger.error("大间隔推送失败------------------",e);
         }
     }
-    
+    //发现大客流  -> 大客流情况 ->处置大客流
+    public void Dkl(){
+        //推送
+
+        try{
+            Map m = queue.poll();
+            if (m != null) {
+                if (Integer.valueOf(m.get("num").toString()) > 15) {
+                    //超过10的时候 判断为大客流
+
+                    ts(ConvertDKL(m));
+
+                }
+            }
+
+            ScheduleRealInfo sr = dayOfSchedule.findByNbbm("W8A-009").get(0);
+            ts(addStationPeople(sr, "DKL", 0L));//大客流
+
+
+        }catch (Exception e){
+            logger.error("大客流推送失败------------------",e);
+        }
+
+    }
+
+
+
     //撤销班次  检测人员或者车辆故障  --//换人换车或烂班 //路牌对调
     public void cxJC(){
     }
-    
+
     //撤销撤销班次  检测人员或者车辆故障  --//换人换车或烂班 //路牌对调
     public void cxJCX(){
     }
-    
+
     //实发未发检测 -- 车辆GPS掉线的情况下，车辆该出站了
     /**
      * 1。已过待发时间还没发车的
@@ -132,80 +160,62 @@ public class AutomaticSch {
                     //1.离线 2.实发时间为空 3.已过待发时间还没发车的
                     long time = System.currentTimeMillis();//实际时间+2分钟
                     //超过待发时间  实发时间还是null的
-                    if (sr.getFcsjT()+ (1000 * 60 * 3) <  time && sr.getFcsjT()+ (1000 * 60 * 7) >  time) {
+                    if (sr.getFcsjT() + (1000 * 60 * 3) < time && sr.getFcsjT() + (1000 * 60 * 7) > time) {
-                        //起点站实际到达时间为null的情况下
-                  /*      if (StringUtils.isEmpty(sr.getQdzArrDatesj())) {
-                            ScheduleRealInfo prev = dayOfSchedule.prev(sr);
-                            //上一个班次没有实际终点到达时间
-                            if (prev != null && StringUtils.isEmpty(prev.getZdsjActual())) {
-                                continue;
-                            }
-                        }*/
                         //第一种 设备离线的情况下改出站
                         Integer staus = 0; //状态
-                        if (StringUtils.isEmpty(sr.getFcsjActual()) 
-                                && (sr.getBcType().equals("normal")   || sr.getBcType().equals("region"))
+                        if (StringUtils.isEmpty(sr.getFcsjActual())
+                                && (sr.getBcType().equals("normal") || sr.getBcType().equals("region"))
                                 && (StringUtils.isEmpty(sr.getRemarks()) || sr.getRemarks().equals("_智能调度-异常实发"))) {
-                            GpsEntity gps =  gpsRealData.getByNbbm(sr.getClZbh());
-                            //当前设备离线的情况  
+                            GpsEntity gps = gpsRealData.getByNbbm(sr.getClZbh());
+                            //当前设备离线的情况
                             //1。一直没收到gps
                             //2.gps长时间离线的情况下
                             //3.人为调整过的都跳过
-                            if (gps == null || gps.getTimestamp() + (1000 * 60 * 3) < time ||  (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))){
+                            if (gps == null || gps.getTimestamp() + (1000 * 60 * 3) < time || (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))) {
                                 ts(addStationPeople(sr, "SFTZ_1", 0L));
                                 Gson gson = new Gson();
                                 String chartStr = gson.toJsonTree(sr).toString();
-                                logger.info("实发调整--"+chartStr);
+                                logger.info("实发调整--" + chartStr);
                             }
                         }
                     }
                 }
-                                   
+
             }
         }catch (Exception e){
             logger.error("自动调度，实发未发推送失败---",e);
         }
         logger.warn("实发未发扫描结束");
     }
-   
+
     //实发撤销检测 -- 出现快一慢三的情况  && 指令重发
     public void sfCX(){
         //查询所有班次
         //remark 人工干预过的的不检测
         try {
-            stationRouteRepository.findAll();
-
-            Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
-//            Map<String, String> stationCode2Name = new HashMap<>();
-//            StationRoute sroute;
-//            while (iterator.hasNext()) {
-//                sroute = iterator.next();
-//                stationCode2Name.put(sroute.getLineCode() + "_" + sroute.getDirections() + "_" + sroute.getStationCode(), sroute.getStationMark());
-//            }
-//            
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
             List<ScheduleRealInfo>  oldSchDateList;
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()){
                 lineCode =ts.getKey();
                 oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
-      
+
                 Map m = new HashMap();
                 //排序
                 Collections.sort(oldSchDateList, new ScheduleComparator.FCSJ());
                 for (ScheduleRealInfo t : oldSchDateList){
-                    // 发车误点 
-                    if (t.getDfsj() != null && t.getFcsjActual() != null  
+                    // 发车误点
+                    if (t.getDfsj() != null && t.getFcsjActual() != null
                             && (t.getBcType().equals("normal") || t.getBcType().equals("region"))
                             && (StringUtils.isEmpty(t.getRemarks()) || t.getRemarks().equals("_智能调度-异常实发"))) {
                         long sjc = t.getFcsjActualTime() - t.getDfsjT();
                         long time = System.currentTimeMillis();//当前时间
-                        
-                        if (t.getDfsjT() >  time) {
+
+                        if (t.getDfsjT() > time) {
                             //快1慢3
                             if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
                                 continue;
@@ -217,36 +227,31 @@ public class AutomaticSch {
                                 logger.info("实发撤销--" + chartStr);
                             }
                         }
-                        
-                      /*  //待发时间要大于当前时间
-                        //车辆还在站内
-                        String mark = null;
-                        if (gps != null){
-                             mark = stationCode2Name.get(gps.getLineId()+"_"+gps.getUpDown()+"_"+gps.getStopNo());
-                        }
-                        if (t.getFcsjT() >  time && ((gps!= null && gps.getInstation() == 2) 
-                                || gps == null ||
-                                (gps!= null && mark!=null && mark.equals("B") && gps.getInstation() == 1) || 
-                                (gps!= null && mark!=null  && mark.equals("E") && gps.getInstation() == 1))) {
-                          
-                        }*/
                     }
+
                 }
             }
         }catch (Exception e){
             logger.error("实发撤销推送接口出错-----------",e);
         }
     }
-    
+
+    public Boolean isLines(String line) {
+        //新临专线，新芦专线，临港5路，浦东7路，浦东91路
+        if (line.equals("10636") || line.equals("200828") || line.equals("211208") || line.equals("230226") || line.equals("201012"))
+            return Boolean.valueOf(true);
+        return Boolean.valueOf(false);
+    }
+
     //发车信息微调检测  -- 车辆掉线后实发检测，重新计算时间发车时间
     public  void updatesf(){
-        
+
     }
-    
+
     //临加班次 -- 检测到大客流  //走落地屏客流接口
     public void ljbc(){
-        
-        
+
+
     }
     /**
@@ -265,30 +270,29 @@ public class AutomaticSch {
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()) {
                 lineCode = ts.getKey();
-             /*   if (!lineCode.equals("12101"))
-                    return;*/
-                
-                oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
-                for (ScheduleRealInfo t : oldSchDateList){
-                    //指令重发
-                    //1.班次已经执行过的
-                    //2.驾驶员未确认的
-                    //3.
-                    Long t1 = 1000L * 60 * 5;
-                    Long sj = new Date().getTime();
-                    if(t.getStatus()  == 2 && t.getDirectiveState() != 200 && t.getBcType().equals("normal")){
-                        //还未下发的
-                        if (drivreMap.get(t.getClZbh()) == null){
-                            //下发或者处置
-                            drivreMap.put(t.getClZbh(),new Date().getTime());
-                            directiveService.send60DispatchZndd(t.getId(), "智能调度");
-                   
-                        //下发实际超过5分钟的
-                        } else if (drivreMap.get(t.getClZbh()) + t1 <= sj){
-                            directiveService.send60DispatchZndd(t.getId(), "智能调度");
-                            //更新下发时间
-                            drivreMap.put(t.getClZbh(),new Date().getTime());
-                        //下发时间未超过5分钟返回
+                if(isLines(lineCode)) {
+
+                    oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
+                    for (ScheduleRealInfo t : oldSchDateList) {
+                        //指令重发
+                        //1.班次已经执行过的
+                        //2.驾驶员未确认的
+                        Long t1 = 1000L * 60 * 5;
+                        Long sj = new Date().getTime();
+                        if (t.getStatus() == 2 && t.getDirectiveState() != 200 && t.getBcType().equals("normal")) {
+                            //还未下发的
+                            if (drivreMap.get(t.getClZbh()) == null) {
+                                //下发或者处置
+                                drivreMap.put(t.getClZbh(), new Date().getTime());
+                                directiveService.send60DispatchZndd(t.getId(), "智能调度");
+
+                                //下发实际超过5分钟的
+                            } else if (drivreMap.get(t.getClZbh()) + t1 <= sj) {
+                                directiveService.send60DispatchZndd(t.getId(), "智能调度");
+                                //更新下发时间
+                                drivreMap.put(t.getClZbh(), new Date().getTime());
+                                //下发时间未超过5分钟返回
+                            }
                         }
                     }
                 }
@@ -312,7 +316,7 @@ public class AutomaticSch {
                 if(sch.getDfsjT() > t)
                     break;
-                /*if(sch.isLate())
+                /*if(sch.isLate()) //演示使用 不跳过
                     continue;*/
                 if(sch.getStatus() == 0
@@ -344,9 +348,9 @@ public class AutomaticSch {
         }
         return null;
     }
-    
-    
-    
+
+
+
     public void ts(Map m) throws ParseException {
         //记录存一下  --超过当前时间的是否推送？
         String st = m.get("lineCode")+"_"+m.get("type")+"_"+m.get("rqStr");
@@ -357,7 +361,7 @@ public class AutomaticSch {
         if (ZnddThread.ZNDDTYPEMAP.get(st) != null ) {
             list = ZnddThread.ZNDDTYPEMAP.get(st);
             int i = 0;
-            
+
             for (Long s : list){ //推送过的同样情况1小时内  &&//超过当前时间的不推送&& sj < dsj
                 if (Math.abs(s - sj) > (60 * 60 * 1000)){
                     i ++ ;
@@ -370,13 +374,14 @@ public class AutomaticSch {
             outEntrance.Znddjk(m);//推送
         }
+
     }
     //大间隔数据转换
-    public Map ConvertDJK(LargeGap lg,String ids){
+    public Map ConvertDJK(LargeGap lg,ScheduleRealInfo sch){
         Map sp = new HashMap();
         sp.put("uuid",UUID());
         sp.put("lineCode",lg.getLineCode());
@@ -390,12 +395,24 @@ public class AutomaticSch {
         sp.put("stationName",lg.getStationName());
         sp.put("clzbh",lg.getNbbm());
         sp.put("fcsj",lg.getBcfcsj());
-        sp.put("ids",ids);
+        sp.put("ids",sch.getId());
         sp.put("lg",lg);
+        sp.put("sch",sch);
         return sp;
+    }
+    //大间隔数据转换
+    public Map ConvertDKL(Map m){
+        Map sp = new HashMap();
+        sp.put("uuid",UUID());
+        sp.put("lineCode",m.get("lineCode"));
+        sp.put("lineName",m.get("lineName"));
+        sp.put("rqStr",sdf.format(new Date()));
+        sp.put("rq",sdfHHmm.format(new Date())); //检测到时间
+        return sp;
     }
+
     //转换
     public Map addStationPeople(ScheduleRealInfo info,String type,Long sst) throws ParseException{
         Map sp = new HashMap();
 package com.bsth.data.zndd;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.zndd.StationPeopleLogger;
+import com.bsth.entity.zndd.StationSignsLogger;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 /**
@@ -26,7 +33,7 @@ public class OutEntrance {
     DayOfSchedule dayOfSchedule;
-  /*  @Value("${dc.imgurl}")
+    @Value("${dc.imgurl}")
     private  String imgurl; //存储图片地址
     @Value("${dc.profile}")
@@ -34,12 +41,12 @@ public class OutEntrance {
     static String url= "http://58.34.52.130:9777/xxfb/carMonitor?";  //信息发布地址
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    carMonitor carMonitor;
-    /****
-     调度屏小程序接口。
-
+     //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody Map<String, String> map) {
@@ -59,41 +66,39 @@ public class OutEntrance {
      //查询班次情况自动回复
      //当前日期
      //String rq = DateUtils.dqDate();
-     List<Map> dzList = carMonitorThread.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
+     List<Map> dzList = carMonitor.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
      if (dzList.size() > 0){
-     rtn.put("message","车辆还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
+         rtn.put("message","车辆还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
      }else {
-     //筛选方向
-     List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode());
-     //排序
-     Collections.sort(rs,new ScheduleComparator.FCSJ());
-     SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
-     String sjtext = "";
-     LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
-     for (ScheduleRealInfo sr:rs) {
-     LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
-     //判断上下行 
-     if(t1.isAfter(t2)){
-     sjtext = sr.getFcsj();
-     }
-     }
-
-     rtn.put("message","航津路与杨高北路交叉口拥堵，请耐心等待");
-     rtn.put("message_els","The intersection of Hangjin Road and Yanggao North Road is congested, please be patient and wait");
+             //筛选方向
+             List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode());
+             //排序
+             Collections.sort(rs,new ScheduleComparator.FCSJ());
+             SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
+             String sjtext = "";
+             LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
+             for (ScheduleRealInfo sr:rs) {
+             LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
+             //判断上下行
+             if(t1.isAfter(t2)){
+                sjtext = sr.getFcsj();
+             }
+         }
+
+         rtn.put("message","航津路与杨高北路交叉口拥堵，请耐心等待");
+         rtn.put("message_els","The intersection of Hangjin Road and Yanggao North Road is congested, please be patient and wait");
      }
-
-
-     rtn.put("status",ResponseCode.SUCCESS);
+        rtn.put("status",ResponseCode.SUCCESS);
      } catch (Exception e) {
-     rtn.put("status", ResponseCode.ERROR);
-     logger.info(e.getMessage());
+         rtn.put("status", ResponseCode.ERROR);
+         logger.info(e.getMessage());
      }
-     return rtn;
+        return rtn;
      }
-     */
+
     /*
     智能调度接口--通用测试接口
      */
@@ -115,9 +120,8 @@ public class OutEntrance {
         return rtn;
     }
-    /*
-  智能调度接口-大客流
-  
+
+  //智能调度接口-大客流
     @RequestMapping(value="/dkl",method = RequestMethod.POST)
     public Map ddkl(@RequestParam Map m) {
         Map rtn = new HashMap<>();
@@ -130,7 +134,7 @@ public class OutEntrance {
             ssLogger.setType("大客流");
             //保存记录
-            znddLoggerService.save(ssLogger);
+            //znddLoggerService.save(ssLogger);
             //线调页面推送
             //sendUtils.sendzndd(ssLogger);
@@ -141,7 +145,7 @@ public class OutEntrance {
         }
         return rtn;
     }
- */
+
@@ -151,7 +155,7 @@ public class OutEntrance {
      * @param  上传地址（示例：D:\\1.png）
      * @return
      */
-    /*public  String uploadBase64Img(String base) {
+    public  String uploadBase64Img(String base) {
         //获取年月日
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -207,7 +211,7 @@ public class OutEntrance {
             }
         }
         return null;
-    }*/
+    }
@@ -84,6 +84,16 @@ public class ZnddThread extends Thread{
                         automaticSch.wd();
                         logger.info("误点执行完毕");
                     }
+                    if (zs.getType().equals("djg")){
+                        automaticSch.dfTz();
+                        logger.info("大间隔执行完毕");
+                    }
+
+                    if (zs.getType().equals("dkl")){
+                        automaticSch.Dkl();
+                        logger.info("大客流执行完毕");
+                    }
+
                 }
             }
         }catch (Exception e){
@@ -22,6 +22,15 @@ public class LoggerZndd implements Serializable {
     // 创建人
     private Integer createBy;
+    private String lineCode;
+
+    private String LineName;
+
+    private String rq;
+
+    private String timeStr;
+
+    private String dir;
     // 创建日期
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -58,4 +67,44 @@ public class LoggerZndd implements Serializable {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return LineName;
+    }
+
+    public void setLineName(String lineName) {
+        LineName = lineName;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getTimeStr() {
+        return timeStr;
+    }
+
+    public void setTimeStr(String timeStr) {
+        this.timeStr = timeStr;
+    }
+
+    public String getDir() {
+        return dir;
+    }
+
+    public void setDir(String dir) {
+        this.dir = dir;
+    }
 }
@@ -1635,7 +1635,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("ts", ts);
-            LoggerZndd lz = new LoggerZndd();
+            LoggerZndd lz = addZndd(sch);
             String text = sch.getXlName()+"_"+sch.getFcsj()+"的班次进行了实发调整";
             lz.setText(text);
             lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
@@ -1652,6 +1652,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return rs;
     }
+
+    public LoggerZndd addZndd(ScheduleRealInfo sch){
+        LoggerZndd lz = new LoggerZndd();
+        lz.setLineCode(sch.getXlBm());
+        lz.setLineName(sch.getXlName());
+        lz.setRq(sch.getScheduleDateStr());
+        lz.setTimeStr(sch.getFcsj());
+        lz.setDir(sch.getXlDir());
+        return lz;
+    }
+
     @Override
     public Map<String, Object> revokeDestroy(Long id) {
         Map<String, Object> rs = new HashMap<>();
@@ -1736,7 +1747,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.save(sch);
-                LoggerZndd lz = new LoggerZndd();
+                LoggerZndd lz = addZndd(sch);
                 String text = sch.getXlName()+"_"+sch.getFcsj()+"的班次进行了实发撤销调整";
                 lz.setText(text);
                 lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
+package com.bsth.service.zndd;
+
+import com.bsth.entity.zndd.LoggerZndd;
+import com.bsth.service.BaseService;
+
+public interface LoggerZnddService extends BaseService<LoggerZndd, Integer> {
+}
+package com.bsth.service.zndd.impl;
+
+import com.bsth.entity.zndd.LoggerZndd;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.zndd.LoggerZnddService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoggerZnddServiceImpl extends BaseServiceImpl<LoggerZndd, Integer> implements LoggerZnddService {
+}
+<style type="text/css">
+  .table-bordered {
+    border: 1px solid; }
+  .table-bordered > thead > tr > th,
+  .table-bordered > thead > tr > td,
+  .table-bordered > tbody > tr > th,
+  .table-bordered > tbody > tr > td,
+  .table-bordered > tfoot > tr > th,
+  .table-bordered > tfoot > tr > td {
+    border: 1px solid; }
+  .table-bordered > thead > tr > th,
+  .table-bordered > thead > tr > td {
+    border-bottom-width: 2px; }
+
+  .table > tbody + tbody {
+    border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+  <div class="page-title">
+    <h1>智能调度执行记录</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="portlet light porttlet-fit bordered">
+      <div class="portlet-title">
+        <form class="form-inline" action="">
+          <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
+            <span class="item-label" style="width: 80px;">公司: </span>
+            <select class="form-control" name="company" id="gsdmDaily" style="width: 180px;"></select>
+          </div>
+          <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
+            <span class="item-label" style="width: 80px;">分公司: </span>
+            <select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 180px;"></select>
+          </div>
+          <div style="margin-top: 2px"></div>
+          <div style="display: inline-block;margin-left: 33px;">
+            <span class="item-label" style="width: 80px;">线路: </span>
+            <select class="form-control" name="line" id="line" style="width: 180px;">
+              <option value="">请选择线路...</option>
+            </select>
+          </div>
+          <div style="display: inline-block;margin-left: 24px;">
+            <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+            <input class="form-control" type="text" id="date" style="width: 180px;"/>
+          </div>
+          <div class="form-group">
+            <input class="btn btn-default" type="button" id="query" value="筛选"/>
+            <input class="btn btn-default" type="button" id="export" value="导出"/>
+          </div>
+          <img src="/profile/avatar/2024/04/07/blob_20240407160316A002.png">
+        </form>
+      </div>
+      <div class="portlet-body">
+        <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+          <table class="table table-bordered table-hover table-checkable" id="forms">
+            <thead>
+            <tr>
+              <th colspan="7">智能调度执行记录</th>
+            </tr>
+
+            <tr>
+              <td>线路名称</td>
+              <td>时间</td>
+              <td>方向</td>
+              <td>发车时间</td>
+              <td>内容</td>
+              <td>处理时间</td>
+            </tr>
+            </thead>
+            <tbody id="tbody">
+
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  $(function(){
+
+    // 关闭左侧栏
+    if (!$('body').hasClass('page-sidebar-closed'))
+      $('.menu-toggler.sidebar-toggler').click();
+
+    $("#date").datetimepicker({
+      format : 'YYYY-MM-DD',
+      locale : 'zh-cn'
+    });
+    var fage=false;
+    var xlList;
+    var obj = [];
+
+
+    $.get('/report/lineList',function(result){
+      xlList=result;
+      $.get('/user/companyData', function(result){
+        obj = result;
+        var options = '';
+        for(var i = 0; i < obj.length; i++){
+          options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+        }
+
+        if(obj.length ==0){
+          $("#gsdmDiv_daily").css('display','none');
+        }else if(obj.length ==1){
+          $("#gsdmDiv_daily").css('display','none');
+          if(obj[0].children.length == 1  || obj[0].children.length ==0)
+            $('#fgsdmDiv_daily').css('display','none');
+        }
+        $('#gsdmDaily').html(options);
+        updateCompany();
+      });
+    })
+    $("#gsdmDaily").on("change",updateCompany);
+    function updateCompany(){
+      var company = $('#gsdmDaily').val();
+      var options = '';
+      for(var i = 0; i < obj.length; i++){
+        if(obj[i].companyCode == company){
+          var children = obj[i].children;
+          for(var j = 0; j < children.length; j++){
+            options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+          }
+        }
+      }
+      $('#fgsdmDaily').html(options);
+    }
+
+    var tempData = {};
+    $.get('/report/lineList',function(xlList){
+      var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+      $.get('/user/companyData', function(result){
+        for(var i = 0; i < result.length; i++){
+          var companyCode = result[i].companyCode;
+          var children = result[i].children;
+          for(var j = 0; j < children.length; j++){
+            var code = children[j].code;
+            for(var k=0;k < xlList.length;k++ ){
+              if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+                data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+                tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+              }
+            }
+          }
+        }
+        initPinYinSelect2('#line',data,'');
+
+      });
+    });
+
+    $("#line").on("change", function(){
+      if($("#line").val() == " "){
+        $("#gsdmDaily").attr("disabled", false);
+        $("#fgsdmDaily").attr("disabled", false);
+      } else {
+        var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
+        $("#gsdmDaily").val(temp[0]);
+        updateCompany();
+        $("#fgsdmDaily").val(temp[1]);
+        $("#gsdmDaily").attr("disabled", true);
+        $("#fgsdmDaily").attr("disabled", true);
+      }
+    });
+
+
+    var line;
+    var date;
+    var gsdmDaily;
+    var fgsdmDaily;
+    var lineName=$("#select2-line-container").html();
+    $("#query").on("click",function(){
+      if($("#date").val() == null || $("#date").val().trim().length == 0){
+        layer.msg("请选择时间");
+        return;
+      }
+      line = $("#line").val();
+      date = $("#date").val();
+      gsdmDaily=$("#gsdmDaily").val();
+      fgsdmDaily = $("#fgsdmDaily").val();
+      lineName=$("#select2-line-container").html();
+      var i = layer.load(2);
+      $get('/logZndd/all',{rq_eq:date,lineCode_eq:line,type:'query'},function(result){
+        $("#form_line").text(lineName);
+        $("#form_date").text(date);
+        // 把数据填充到模版中
+        var tbodyHtml = template('dailyInfo',{list:result});
+        // 把渲染好的模版html文本追加到表格中
+        $('#tbody').html(tbodyHtml);
+        layer.close(i);
+
+        line = $("#line").val();
+        startDate = $("#startDate").val();
+        endDate = $("#endDate").val();
+        $("#sDate").text(startDate);
+        $("#eDate").text(endDate);
+
+        var total_zgl = 0,total_ks = 0;
+        var total_yh = 0,total_bc = 0;
+
+        $.each(result, function(i, obj) {
+          total_zgl +=Number(obj.zlc*10000);
+          total_ks +=Number(obj.jzl1*10000);
+          total_yh += Number(obj.yh*10000);
+          total_bc += Number(obj.bc);
+
+        });
+        $("#total_zgl").text((total_zgl/10000).toFixed(3));
+        $("#total_ks").text((total_ks/10000).toFixed(3));
+        $("#total_yh").text((total_yh/10000).toFixed(2));
+        $("#total_bc").text(total_bc.toFixed(0));
+
+        var temp = {};
+        var today_account = 0;
+
+        temp["line"] = $("#line").text();
+        $.each(result, function(i, obj) {
+          if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+            today_account++;
+          }
+          obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+        });
+      })
+    });
+
+    $("#export").on("click",function(){
+      if($("#date").val() == null || $("#date").val().trim().length == 0){
+        layer.msg("请选择时间");
+        return;
+      }
+      line = $("#line").val();
+      date = $("#date").val();
+      gsdmDaily=$("#gsdmDaily").val();
+      fgsdmDaily = $("#fgsdmDaily").val();
+      lineName=$("#select2-line-container").html();
+      var i = layer.load(2);
+      $post('/znddLogger/list',{gsdmDaily:gsdmDaily,fgsdmDaily:fgsdmDaily,line:line,date:date,type:'export',lineName:lineName},function(result){
+        window.open("/downloadFile/download?fileName="
+                +moment(date).format("YYYYMMDD")+"-"+lineName+"-班次日报表");
+        layer.close(i);
+      });
+    });
+  });
+</script>
+<script type="text/html" id="dailyInfo">
+  {{each list as obj i}}
+  <tr>
+    <td>{{obj.lineName}}</td>
+    <td>{{obj.rq}}</td>
+    <td>
+      {{if obj.dir == '0'}}
+      上行
+      {{else if obj.dir == '1'}}
+      下行
+      {{/if}}
+    </td>
+
+    <td>{{obj.timeStr}}</td>
+    <td>{{obj.text}}</td>
+    <td>{{obj.createDate}}</td>
+  </tr>
+  {{/each}}
+  {{if list.length == 0}}
+  <tr>
+    <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+  </tr>
+  {{/if}}
+</script>
 \ No newline at end of file
@@ -56,6 +56,8 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message"> 调度消息分析</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_changetochange"> 换人换车情况统计表</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_repairReport"> 维修上报记录</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_loggerr_zndd"> 智能调度日志</label></li>
+
             </ul>
         </div>
@@ -248,7 +248,11 @@ var gb_northToolbar = (function () {
         },
         report_register: function () {
             open_modal('/real_control_v2/fragments/north/nav/report_register/manage.html', {}, modal_opts);
-        }
+        },
+
+        form_loggerr_zndd: function () {
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/zndd/logger_zndd.html', '智能调度执行记录');
+        },
     };
     return {
@@ -39,7 +39,7 @@
             <a href="javascript:;" style="color: #07D;margin-right: 7px;">预计 {{expectStopTime}} 分钟到达终点</a>
             {{/if}}
             <a href="javascript:;" style="float: left;" onclick="javascript:window.open('http://58.34.52.130:4490/transport_server/dvr_monitor2.html?userid=4&zbh={{nbbm}}');">DVR</a>
-            <a href="W9:1@139.196.29.203@?method=call&1111:{{dvrcode}}" style="margin-left: 50px;" >拨打电话</a>
+            <a href="W9:{{dvrcode}}@139.196.29.203?method=call" style="margin-left: 50px;" >拨打电话</a>
             <a href="javascript:;" style="float: right;" onclick="javascript:gb_map_play_back.initParams({deviceId: '{{deviceId}}', nbbm: '{{nbbm}}'});">轨迹回放</a>
         </div>
     </script>