自动调度全部上线更新

ljq
1 parent 3eb5c3a9
Showing 15 changed files with 319 additions and 122 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/kl/KlData.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/carMonitor.java
src/main/java/com/bsth/entity/zndd/StationPeopleLogger.java
src/main/java/com/bsth/repository/zndd/ZnddLoggerRepository.java
src/main/java/com/bsth/service/zndd/ZnddLoggerService.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/java/com/bsth/service/zndd/impl/ZnddLoggerServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_two_way_znddType.html
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/zndd/type/dkl.html
src/main/resources/static/real_control_v2/zndd/type/sftz_1.html
@@ -145,7 +145,7 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
  
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
  
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
@@ -193,7 +193,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -238,7 +238,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         /** 线调业务 */
@@ -260,7 +260,7 @@ public class XDApplication implements CommandLineRunner {
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
  
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
         sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
@@ -6,9 +6,10 @@ 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.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import java.util.*;
+
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * @author ym
@@ -30,7 +31,7 @@ public class KlData {
     @Value("${passengerFlow.url}")
     private String url;
  
-    @Scheduled(cron = "0/10 * * * * ?")
+   /* @Scheduled(cron = "0/10 * * * * ?")
     public void loadKl() {
         Map<String,Kl> map= new HashMap<>();
         List<Kl> list = klService.loadKl();
@@ -40,7 +41,7 @@ public class KlData {
             map.put(kl.getDeviceId(),kl);
         }
         KlData =map;
-    }
+    }*/
  
     public static Kl getKl(String deviceId){
         //return KlData.get( KlData.keySet().toArray()[0]);
@@ -8,16 +8,23 @@ import com.bsth.data.adjg.domain.LargeGap;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.rfid.RfidHttpLoader;
+import com.bsth.data.gpsdata_v2.rfid.entity.RfidInfo;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.data.schedule.edit_logs.service.SchEditInfoService;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.ZnddYuAn;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.zndd.ZnddLoggerService;
 import com.bsth.service.zndd.ZnddYuAnService;
+import com.bsth.util.DateUtils;
 import com.bsth.util.HttpClientUtils;
 import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
@@ -60,17 +67,24 @@ public class AutomaticSch {
     @Autowired
     ZnddYuAnService znddYuAnService;
  
+    @Autowired
+    ZnddLoggerService znddLoggerService;
+    @Autowired
+    SchEditInfoService schEditInfoService;
+
+
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+    private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
  
     private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
     private Map<String,Long> drivreMap =new HashMap<>(); //自动重发map
  
-    String urldkl = "http://10.10.200.202:5580/monitor/api/getMonitorInfoByDay?key=1&solt=1111&t=1&dayStr=2024-12-04"; //大间隔接口
+    String urldkl = "http://10.10.200.202:5580/monitor/api/getMonitorInfoByDay?key=1&solt=1111&t=1&dayStr="; //大间隔接口
  
     //http://10.10.200.201:8083/wxk-prod-api/service-api/lggj/schedule/drByInfo  维修接口
     String urldkls = "http://10.10.200.140:13089/bsth_passengerflow/klbus/currentInsideNum.do"; //满载接口
-    private Map<String,Long> SFMAP = new HashMap<>();
+    private Map<Long,Long> SFMAP = new HashMap<>();
  
     //满载
     public  void mz(){
@@ -90,7 +104,7 @@ public class AutomaticSch {
     //大间隔的情况
     public void dfTz(int k ){
         try{
-            StringBuilder sb = HttpClientUtils.get(urldkl /*+ sdfMonth.format(new Date())*/);
+            StringBuilder sb = HttpClientUtils.get(urldkl + sdfMonth.format(new Date()));
             if (sb == null)
                 return;
             JSONObject obj = JSON.parseObject(sb.toString());
@@ -103,20 +117,35 @@ public class AutomaticSch {
                  }else {
                      continue;
                  }
-                 if (k == 0 ){
-                     if(lg.getlGType() == 0){
-                         ts(ConvertDJK(lg,sch,"FCJG"));
-                         String chartStr = JSON.toJSONString(sch);
-                         logger.info("发车大间隔--"+chartStr);
+                 Long t0 = new Date().getTime()  - (1000 * 60 * 2);
+                 Long t1 = t0 - (1000 * 60 * 2);
+                 Long t2 = t0 + (1000 * 60 * 2);
+                 //判断当前间隔是否出现过并且在当前时间段内   大于2分钟  小于1分钟的时间之内
+                 //if ( lg.getTsTime() > t1 && lg.getTsTime() < t2 && SFMAP.get(lg.getId()) == null ) {
+                     if (k == 0) {
+                         if (lg.getlGType() == 0) {
+                             ts(ConvertDJK(lg, sch, "FCJG"));
+                             SFMAP.put(lg.getId(), lg.getTsTime());
+                             String chartStr = JSON.toJSONString(sch);
+                             logger.info("发车大间隔--" + chartStr);
+                         }
+                     } else {
+                         if (lg.getlGType() != 0) {
+                             ts(ConvertDJK(lg, sch, "DJG"));
+                             SFMAP.put(lg.getId(), lg.getTsTime());
+                             String chartStr = JSON.toJSONString(sch);
+                             logger.info("行车大间隔--" + chartStr);
+                         }
                      }
-                 }else {
-                     if(lg.getlGType() != 0){
-                         ts(ConvertDJK(lg,sch,"DJG"));
-                         String chartStr = JSON.toJSONString(sch);
-                         logger.info("行车大间隔--"+chartStr);
+                // }
+                 //大于10000条的时候开始清理map
+                 if (SFMAP.size() > 10000){
+                     for (Map.Entry<Long, Long> m : SFMAP.entrySet()){
+                         if(m.getValue() < DateUtils.getTimestamp()){
+                             SFMAP.remove(m.getKey());
+                         }
                      }
                  }
-
             }
  
         }catch (Exception e){
@@ -154,7 +183,21 @@ public class AutomaticSch {
                             //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 * 5) < time || (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))) {
+                                String sfsj = null;
+                                //rfid 判断
+                                List<RfidInfo> list = RfidHttpLoader.load();
+                                for (RfidInfo ri : list) {
+                                    //最新的rfid是出站状态
+                                    if (ri.getNbbm().equals(sr.getClZbh())){
+                                        sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp());
+                                    }
+                                    if (ri.getNbbm().equals(sr.getClZbh()) && ri.getInoutStation().getInout() == 0) {
+                                         sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp());
+                                    }
+
+                                }
+                                sr.setFcsjActual(sfsj);
                                 ts(addStationPeople(sr, "SFTZ_1", 0L));
                                 Gson gson = new Gson();
                                 String chartStr = gson.toJsonTree(sr).toString();
@@ -190,8 +233,7 @@ public class AutomaticSch {
                 for (ScheduleRealInfo t : oldSchDateList){
                     // 发车误点
                     if (t.getDfsj() != null && t.getFcsjActual() != null
-                            && (t.getBcType().equals("normal") || t.getBcType().equals("region"))
-                            && (StringUtils.isEmpty(t.getRemarks()) || t.getRemarks().equals("_智能调度-异常实发"))) {
+                            && (t.getBcType().equals("normal") || t.getBcType().equals("region"))) {
  
                         long sjc = t.getFcsjActualTime() - t.getDfsjT();
                         long time = System.currentTimeMillis();//当前时间
@@ -201,6 +243,16 @@ public class AutomaticSch {
                             if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
                                 continue;
                             } else {
+                                //备注不为null时，查询是否有调度操作记录
+                                List<SchEditInfo>  seiList = new ArrayList<>();
+                                if (!StringUtils.isEmpty(t.getRemarks())){
+                                    Map msp = new HashMap();
+                                    msp.put("schId_eq",t.getId());
+                                    seiList = (List<SchEditInfo>) schEditInfoService.list(msp);
+                                    //有操作记录的跳过
+                                    if (seiList.size() > 0)
+                                        continue;
+                                }
                                 //异常实发
                                 ts(addStationPeople(t, "YCSF", 0l));
                                 Gson gson = new Gson();
@@ -252,8 +304,7 @@ public class AutomaticSch {
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()) {
                 lineCode = ts.getKey();
-                if(isLines(lineCode)) {
-
+               /* if(isLines(lineCode)) {*/
                     oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
                     for (ScheduleRealInfo t : oldSchDateList) {
                         //指令重发
@@ -276,7 +327,7 @@ public class AutomaticSch {
                                 //下发时间未超过5分钟返回
                             }
                         }
-                    }
+                    /*}*/
                 }
             }
         }catch (Exception e){
@@ -298,8 +349,8 @@ public class AutomaticSch {
                 if(sch.getDfsjT() > t)
                     break;
  
-                /*if(sch.isLate()) //演示使用 不跳过
-                    continue;*/
+                if(sch.isLate()) //演示使用 不跳过
+                    continue;
  
                 if(sch.getStatus() == 0
                         && StringUtils.isEmpty(sch.getFcsjActual())){
@@ -333,29 +384,20 @@ public class AutomaticSch {
  
  
     public void ts(Map m) throws ParseException {
-        //记录存一下  --超过当前时间的是否推送？
-        String st = m.get("lineCode")+"_"+m.get("type")+"_"+m.get("rqStr");
-        Long sj = sdf.parse(m.get("rqStr").toString() +" "+ m.get("rq")).getTime();
-        Long dsj = new Date().getTime();
-        List<Long> list = new ArrayList();
-        //111_DJG_2024-06-24
-        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 ++ ;
-                }
-            }
-            outEntrance.Znddjk(m);//测试推送
-        }else {
-            list.add(sj);
-            ZnddThread.ZNDDTYPEMAP.put(st,list);//存记录
-            outEntrance.Znddjk(m);//推送
-        }
-
  
+        //储存日志
+        StationPeopleLogger splogger = new StationPeopleLogger();
+        splogger.setType(m.get("type").toString());
+        splogger.setLineName(m.get("lineName").toString());
+        splogger.setLineCode(m.get("lineCode").toString());
+        splogger.setRq(sdf.format(new Date()));
+        splogger.setRqStr(m.get("rqStr").toString());
+        splogger.setXlDir(m.get("xlDir").toString());
+        splogger.setFcsj(m.get("fcsj").toString());
+        splogger.setClZbh(m.get("clzbh").toString());
+        znddLoggerService.save(splogger);
+
+        outEntrance.Znddjk(m);//推送
     }
  
  
@@ -6,10 +6,12 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.DKLInfo;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.StationSignsLogger;
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.repository.zndd.ZnddStatusRepository;
 import com.bsth.service.DKLInfoService;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.util.SignUtils;
@@ -75,6 +77,12 @@ public class OutEntrance {
     @Autowired
     JdbcTemplate jdbcTemplate;
  
+    @Autowired
+    ZnddStatusRepository znddStatusRepository;
+
+    @Autowired
+    BasicData basicData;
+
      //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
@@ -114,6 +122,31 @@ public class OutEntrance {
                  }
                  rtn.put("message",s+"亲爱的乘客，我们的调度员已接收到通知，车辆预计还有"+dzList.get(0).get("sj")+"抵达，请稍等片刻");
              }else {
+                 //第一个班次
+                 //所有应发未到的班次
+                 Collection<ScheduleRealInfo> all = LateAdjustHandle.allLateSch();
+                 for (ScheduleRealInfo schc : all) {
+                     Long schId = (Long) dzList.get(0).get("schId");
+                     ScheduleRealInfo sch = null;
+                     if (schId != null)
+                        sch = dayOfSchedule.get(schId);
+
+                     ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+                     List<Map> dzLists = carMonitor.carMonitor(prev.getXlBm(), prev.getXlDir(), prev.getZdzCode());  //信息发布接口
+                     for (Map mst : dzLists) {
+                         //匹配到当前车辆
+                         if (basicData.nbbmCompanyPlateMap.get(prev.getClZbh()) != null && mst.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-", ""))) {
+                             if (sch.getXlBm().equals(schc.getXlBm())) {
+                                 rtn.put("message", "非常抱歉，车辆因路上交通拥堵，预计还需要" + m.get("sj").toString() + "抵达，请稍等片刻");
+                                 rtn.put("status", ResponseCode.SUCCESS);
+                                 return rtn;
+                             }
+                         }
+                     }
+                 }
+
+
+
                  //筛选方向
                  List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
                  if(rs.size()>0){
@@ -159,6 +192,23 @@ public class OutEntrance {
                 rtn.put("status", "验证失败");
                 return rtn;
             }
+            //大客流开关
+            List<znddStatus> znddStatusList = (List<znddStatus>) znddStatusRepository.findAll();
+            Boolean isType = false;
+            String excuteStatus = null;
+            for (znddStatus zs : znddStatusList) {
+                if (zs.getType().equals("dkl")) {
+                    isType = true;
+                    excuteStatus = zs.getExcuteStatus();
+                }
+            }
+
+            if (!isType){
+                logger.info("大客流接口未开启--------------");
+                rtn.put("status",ResponseCode.SUCCESS);
+                return rtn;
+            }
+
             String num=jsonObject.getString("num");
             int count=automaticSch.getPenum("DKL","0");
             if(Integer.parseInt(num)<count){
@@ -198,6 +248,7 @@ public class OutEntrance {
                 m.put("lineName",lineName);
                 m.put("num",num);
                 m.put("xlDir",dir);
+                m.put("excuteStatus",excuteStatus);
                 List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(lineCode,Integer.parseInt(dir));
                 List<ScheduleRealInfo> sl=new ArrayList<>();
                 for (ScheduleRealInfo scheduleRealInfo : srList) {//筛选出运营班次
@@ -273,33 +324,6 @@ public class OutEntrance {
     }
  
  
-  //智能调度接口-大客流
-    @RequestMapping(value="/dkl",method = RequestMethod.POST)
-    public Map ddkl(@RequestParam Map m) {
-        Map rtn = new HashMap<>();
-
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            //map转换实体类
-            StationPeopleLogger ssLogger = mapper.convertValue(m, StationPeopleLogger.class);
-            
-            ssLogger.setType("大客流");
-       
-            //保存记录
-            //znddLoggerService.save(ssLogger);
-            //线调页面推送
-            //sendUtils.sendzndd(ssLogger);
-
-            rtn.put("status",ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            rtn.put("status", ResponseCode.ERROR);
-            logger.error("大客流推送异常----",e);
-        }
-        return rtn;
-    }
-
-
-
  
     /**
      * 保存base64图片
@@ -81,6 +81,7 @@ public class carMonitor {
                     map.put("lat",responseEle.elementTextTrim("lat"));
                     map.put("nbbm",responseEle.elementTextTrim("insidecode"));
                     map.put("road",responseEle.elementTextTrim("road"));
+                    map.put("schId",responseEle.elementTextTrim("schId"));
                     list.add(map);
                 }
             }
@@ -7,7 +7,7 @@ import javax.persistence.*;
 import java.io.Serializable;
  
 @Entity
-@Table(name = "bsth_c_t_station_people_logger")  //智能调度记录查询表
+@Table(name = "bsth_c_t_station_people_logger")  //智能调度记录检测表
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class StationPeopleLogger implements Serializable {
     // ID
@@ -19,8 +19,10 @@ public class StationPeopleLogger implements Serializable {
     //线路名称
     private String lineName;
     //站点code
+    @Transient
     private String station;
     //站点名称
+    @Transient
     private String stationName;
     //日期
     private String rqStr;
@@ -31,8 +33,19 @@ public class StationPeopleLogger implements Serializable {
     //上下行
     private String xlDir;
     //人数 or 差距时间 or 站点差数  根据类型判断
-    private Long numType;
-    
+    private String  fcsj;
+
+    private String clZbh;
+
+
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
  
     public void setId(Long id) {
         this.id = id;
@@ -90,8 +103,12 @@ public class StationPeopleLogger implements Serializable {
         this.rq = rq;
     }
  
-    public Long getNumType() {
-        return numType;
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
     }
  
     public String getStation() {
@@ -110,8 +127,5 @@ public class StationPeopleLogger implements Serializable {
         this.stationName = stationName;
     }
  
-    public void setNumType(Long numType) {
-        this.numType = numType;
-    }
  
 }
+package com.bsth.repository.zndd;
+
+import com.bsth.entity.zndd.StationPeopleLogger;
+import com.bsth.repository.BaseRepository;
+
+public interface ZnddLoggerRepository extends BaseRepository<StationPeopleLogger, Integer> {
+}
+package com.bsth.service.zndd;
+
+import com.bsth.entity.zndd.StationPeopleLogger;
+import com.bsth.service.BaseService;
+
+public interface ZnddLoggerService extends BaseService<StationPeopleLogger, Integer> {
+}
@@ -135,7 +135,7 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
                 int ms = mis[i];
                 //未发车时 才可改变
                 if (info.getFcsjActual() == null || info.getFcsjActual().equals("")){
-                    String dfsj = sdfMonth.format(sdf.parse(info.getScheduleDateStr()+ " " + info.getDfsj()).getTime() + (ms * 60 * 1000)); //延后几分钟
+                    String dfsj = sdfMonth.format(sdf.parse(info.getScheduleDateStr()+ " " + info.getDfsj()).getTime() - (ms * 60 * 1000)); //延后几分钟
                     cl.setSchId(info.getId());
                     cl.setOld_dfsj(info.getDfsj());
                     cl.setNew_dfsj(dfsj);
+package com.bsth.service.zndd.impl;
+
+import com.bsth.entity.zndd.StationPeopleLogger;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.zndd.ZnddLoggerService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ZnddLoggerServiceImpl extends BaseServiceImpl<StationPeopleLogger, Integer> implements ZnddLoggerService {
+}
@@ -263,7 +263,7 @@
 </script>
  
 <script>
-    (function () {
+    var addTwoWayZnddType = (function () {
         var wrap = '#schedule-addsch-modal .toAndFroCont', sch, f1, f2, submitFun, stationRoutes;
  
         $(wrap).on('init', function (e, data) {
@@ -311,7 +311,7 @@
             $f('zdsj',f1).on('input', synchroFormData);
  
             //表单校验提交相关
-            var dataArray;
+
             var fs = $('.add-sch-form', wrap);
             fs.on('success.form.fv', function (e) {
                 e.preventDefault();
@@ -352,6 +352,7 @@
                     })();
                 }
             });
+
             //提交
             $('[type=submit]', wrap).on('click', function () {
                 $(this).addClass('disabled').attr('disabled', 'disabled');
@@ -360,6 +361,57 @@
                 fs.formValidation('validate');
             });
         });
+        var dataArray;
+
+        var submit = function () {
+            debugger
+            $(this).addClass('disabled').attr('disabled', 'disabled');
+            dataArray = [];
+            var fs = $('.add-sch-form', wrap);
+            fs.data('valid', false);
+            fs.formValidation('validate');
+
+
+            fs.on('success.form.fv', function (e) {
+                e.preventDefault();
+                dataArray.push($(this).serializeJSON());
+                $(this).data('valid', true);
+                if (allValidSuccess()) {
+                    //开始post
+                    var i = 0;
+                    var inArr = [];
+                    var upArr = [];
+                    (function () {
+                        var f = arguments.callee;
+                        if (i >= dataArray.length) {
+                            //前端数据更新
+                            var last = inArr.pop();
+                            gb_schedule_table.insertSchedule(last, upArr);
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: last});
+
+                            try {
+                                if(last.bcType=='in' || last.bcType=='out')
+                                    gb_data_basic.reload_stat_park_data();
+                            }catch (e){
+                                console.log(e);}
+                            UIkit.modal('#schedule-addsch-modal').hide();
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(last);
+                            return;
+                        }
+                        submitFun(dataArray[i], function (rs) {
+                            inArr.push(rs.t);
+                            upArr = upArr.concat(rs.ts);
+                            upArr.push(rs.t);
+                            i++;
+                            f();
+                        }, function () {
+                            $('[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
+                        });
+                    })();
+                }
+            });
+        }
  
         function $f(name, f) {
             return $('[name=' + name + ']', f);
@@ -422,5 +474,9 @@
                     return routes[i].stationCode;
             }
         }
+
+        return {
+            submit : submit
+        }
     })();
 </script>
 \ No newline at end of file
 var gb_dataZndd = (function (){
  
-    var max = 1;
+    var max = 3;
     var $pop =$('.multi_plat_msg_pop_zndd'); 
  
     var codes = {
@@ -18,15 +18,17 @@ var gb_dataZndd = (function (){
     var dataMap = new Map();
     var leftTime = 1000 * 10;//剩余的毫秒数
     var sop = function (data) {
-        
         //时间格式化
         data.types = codes[data.type];
  
-
-        if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
+      /*  if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){
             return
         }
+*/
  
+       if ((data.type == 'WD' || data.type == 'MZ' || data.type == 'FCJG' || data.type == 'DJG') && ycsf_sx(data.lineCode) == false){
+            return
+        }
  
  
         var stm = moment(new Date());
@@ -94,7 +96,7 @@ var gb_dataZndd = (function (){
     }
  
  
-    //1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
+    //芦潮港1路 新临专线，临港10路， 浦东107路， 浦东91路，1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
     function ycsf_sx(line){
         var t =['12101','200828','230308','220826','201012','10636','60033','88814','88818','180926','191221','210821','230311','230329','803111'];
  
@@ -105,16 +107,7 @@ var gb_dataZndd = (function (){
         return  false;
     }
  
-    //1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
-    function sf_tz(line){
-        var t =['80301'];
  
-        for (var lines in t){
-            if(line == t[lines])
-                return true;
-        }
-        return  false;
-    }
     //发车信息微调
     $pop.on('click', '.fcxxwts', function () {
         if (close)  close = false
@@ -161,9 +154,9 @@ var gb_dataZndd = (function (){
         alt_confirm(content, function () {
             gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                 id: that.data('id'),
-                remarks:'自动调度实发未发-车辆掉线',
-                fcsjActual:that.data('fcsj')
-                
+                remarks:that.data('fcsjactual') != null ? '实发未发-车辆掉线-rfid' : '实发未发-车辆掉线' ,
+                fcsjActual: that.data('fcsjactual') != null ? that.data('fcsjactual') : that.data('fcsj'),
+
             }, function (rs) {
                 if(rs.length != 0) {
                     gb_schedule_table.updateSchedule(rs.ts);
@@ -360,8 +353,8 @@ var gb_dataZndd = (function (){
  
             gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                 id: sch.sch.id,
-                remarks:'自动调度实发未发-车辆掉线',
-                fcsjActual: sch.sch.dfsj,
+                remarks:sch.sch.fcsjActual != null? '实发未发-车辆掉线-rfid' : '实发未发-车辆掉线' ,
+                fcsjActual: sch.sch.fcsjActual != null ? sch.sch.fcsjActual : sch.sch.dfsj,
             }, function (rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('实发未发操作成功！');
@@ -377,10 +370,14 @@ var gb_dataZndd = (function (){
                 }
             });*/
         } else if (type == "KLYJ"){
-            if(!$('#schedule-addsch-modal').hasClass('uk-open')){
-                open_modal("/real_control_v2/zndd/type/dkl.html", {
-                    data: data
-                }, {center: true, bgclose: false, modal: true});
+            if (data.excuteStatus == 0){
+                if(!$('#schedule-addsch-modal').hasClass('uk-open')){
+                    let ljtype = $('#ljtype').val();
+                    data.ljtype = ljtype;
+                    open_modal("/real_control_v2/zndd/type/dkl.html", {
+                        data: data
+                    }, {center: true, bgclose: false, modal: true});
+                }
             }
         }
     }
@@ -289,7 +289,7 @@
 <script  id="zndd_plat_msg_template_config" type="text/html">
     <div class="multi_plat_config"  data-linecode="{{lineCode}}" data-station="{{station}}" data-stationname="{{stationName}}" data-numtype="{{numType}}"
          data-xlname="{{lineName}}" data-type="{{type}}" data-xldir="{{xlDir}}" data-rqstr="{{rqStr}}" data-types ="{{types}}" data-regionstopid="{{lg != null?lg.regionStopid:''}}" data-lgtype ="{{lg != null?lg.lGType:''}}"
-         data-rq="{{rq}}" data-ids="{{ids}}" data-uuid="{{uuid}}">
+         data-rq="{{rq}}" data-ids="{{ids}}" data-uuid="{{uuid}}" data-fcsjactual="{{fcsjActual}}">
         <div id ={{uuid}}  class="timer"></div>
         <div class="msg-popup warning-color">
             <div class="msg-times" style="cursor: pointer;">×</div>
@@ -313,7 +313,7 @@
             <div class="centerSpace msg-title">
                 <div></div>
                 <div class="msg-date-infos" style="display:{{type == 'SFTZ_1'?'':'none'}}" >
-                    <button class="uk-button uk-button-primary sfTzbc" data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">补入发车时间</button>
+                    <button class="uk-button uk-button-primary sfTzbc" data-fcsj="{{fcsj}}"  data-fcsjactual="{{fcsjActual}}" data-clzbh="{{clzbh}}" data-id="{{id}}">补入发车时间</button>
                 </div>
             </div>
         </div>
@@ -2,7 +2,9 @@
     <div class="uk-modal-dialog" style="width: 1400px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>新增临加班次<i class="uk-icon-question-circle uk-icon-hover"></i></h2></div>
+            <h2 style="width: 40%;float: left;">新增临加班次<i class="uk-icon-question-circle uk-icon-hover"></i></h2>
+            <span style="color: red;font-weight: 700;"><div id ="xztimes"  class="timer">------</div></span>
+        </div>
         <div class="uk-grid uk-width-1-6" style="float: left">
             <div class="uk-width-5-5 sjzlist">
  
@@ -44,6 +46,10 @@
     </div>
  
     <script>
+
+
+        var timemm = 1000 * 30 ; //定时器  自动执行
+
         (function () {
             var modal = '#schedule-addsch-modal',
                 sch, stationRoutes, parks, information, carsArray, st_park_data,conf;
@@ -76,9 +82,8 @@
                             framework: 'uikit',
                             locale: 'zh_CN'
                         });
-                        $("#form-s-t").val("大客流情况");
+                        $("#form-s-t").val("站点遭遇大客流");
                         f.on('success.form.fv', function(e) {
-                            debugger
                             e.preventDefault();
                             $('[type=submit]', f).attr('disabled', 'disabled');
                             var data = $(this).serializeJSON();
@@ -97,6 +102,10 @@
                         });
                     });
                 }
+                //定时器启动开关判定条件0开  1关
+                if (sch.excuteStatus == 0 && sch.ljtype == "lin1"){
+                    var sntts = setInterval(function(){leftTimer();},1000); //开始倒计时
+                }
  
  
                 $("#destroySelect").on('change',function(){
@@ -175,7 +184,9 @@
                     document.getElementById("nbbms").innerHTML=s;
                 });
  
-            });
+
+
+
  
             //init-autoCom
             $(modal).on('init-autoCom', '.add-sch-form', function () {
@@ -403,7 +414,6 @@
                     });
                 }
  
-                //debugger
                 array.sort(function (a, b) {
                     if(a.code==information.carPark)
                         return -1;
@@ -466,6 +476,8 @@
                     open_modal(folder + '/yanshi.html', {
                     }, {center: true, bgclose: false, modal: true});*/
                 }, err);
+                //手动提交的时候清除一下，防止二次提交
+                clearInterval(sntts);
             }
  
             function enableYjtkForm() {
@@ -523,8 +535,34 @@
                 });
             });
  
+                //定时器
+                function leftTimer(){
+                        getTimerstring(timemm ? timemm -= 1000 : 0);
+                    if (!timemm){
+                        addTwoWayZnddType.submit();
+                        clearInterval(sntts);
+                       $("#xztimes").html("已自动执行");
+                    }
+                }
+                //倒计时时间
+                function getTimerstring(leftTime){
+                    var days = checkTime(parseInt(leftTime / 1000 / 60 / 60 / 24 , 10)); //计算剩余的天数
+                    var hours = checkTime(parseInt(leftTime / 1000 / 60 / 60 % 24 , 10)); //计算剩余的小时
+                    var minutes = checkTime(parseInt(leftTime / 1000 / 60 % 60, 10));//计算剩余的分钟
+                    var seconds = checkTime(parseInt(leftTime / 1000 % 60, 10));//计算剩余的秒数
+                    $("#xztimes").html(seconds+"秒后将自动执行");
+                }
+
+            });
+            function checkTime(i){ //将0-9的数字前面加上0，例1变为01
  
+                if(i<10)
+                {
+                    i = "0" + i;
+                }
+                return i;
  
+            }
  
         })();
     </script>
@@ -251,7 +251,7 @@
             <div class="uk-form-row">
                 <label class="uk-form-label">实发时间</label>
                 <div class="uk-form-controls">
-                    <input type="time"  value="{{sch.sch.fcsj}}" name="fcsjActual">
+                    <input type="time"  value="{{sch.sch.fcsjActual != null ? sch.sch.fcsjActual : sch.sch.dfsj}}" name="fcsjActual">
                 </div>
             </div>
         </div>