1

ljq
1 parent dc701f72
Showing 20 changed files with 658 additions and 182 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/zndd/ZnddStatusController.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/data/zndd/ZnddTwoThread.java
src/main/java/com/bsth/data/zndd/voice/VoiceUtil.java
src/main/java/com/bsth/entity/zndd/znddStatus.java
src/main/java/com/bsth/repository/zndd/ZnddStatusRepository.java
src/main/java/com/bsth/service/zndd/ZnddStatusService.java
src/main/java/com/bsth/service/zndd/impl/ZnddStatusServiceImpl.java
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
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/main.html
src/main/resources/static/real_control_v2/zndd/type/dkl.html
src/main/resources/static/real_control_v2/zndd/zndd_status.html
 package com.bsth;
 import com.bsth.data.SystemParamCache;
-import com.bsth.service.SystemParamService;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -23,7 +22,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(30);
 	@Autowired
 	private SystemParamCache systemParamCache;
@@ -23,6 +23,7 @@ import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
 import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.data.zndd.ZnddThread;
+import com.bsth.data.zndd.ZnddTwoThread;
 import com.bsth.util.DateUtils;
 import com.bsth.util.Tools;
 import org.slf4j.Logger;
@@ -85,6 +86,9 @@ public class XDApplication implements CommandLineRunner {
     FixedEnableVerionsThread fixedEnableVerionsThread;*/
     @Autowired
     ZnddThread znddThread;
+
+    @Autowired
+    ZnddTwoThread ZnddtwoThread;
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
@@ -145,8 +149,9 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
-
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
+        //智能调度
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
@@ -190,10 +195,14 @@ public class XDApplication implements CommandLineRunner {
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+
+
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
+        //智能调度
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 120, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -237,8 +246,11 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+
+        //智能调度
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 60, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         /** 线调业务 */
@@ -284,7 +296,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
@@ -7,6 +7,7 @@ import com.bsth.service.zndd.ZnddStatusService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
@@ -34,4 +35,21 @@ public class ZnddStatusController extends BaseController&lt;znddStatus, Integer&gt; {
         return result;
     }
+
+    /**
+     *新增类型
+     * */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public Map<String, Object> update(@RequestParam Integer id, @RequestParam Integer openStatus) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            znddStatusService.update(id,openStatus);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+        }
+        return result;
+    }
+
 }
 package com.bsth.data.zndd;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.bsth.data.BasicData;
@@ -26,7 +27,6 @@ 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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,15 +89,48 @@ public class AutomaticSch {
     //满载
     public  void mz(){
         try {
+            StringBuilder sb = HttpClientUtils.get(urldkls);
+            List<Object> list = JSONArray.parseArray(String.valueOf(sb));
+            for (Object b :list){
+                Map m = (Map) b;
+                Integer num = Integer.parseInt(m.get("inside_num").toString());
+
+                int count= getPenum("MZ","0");
+                if(num < count){//大间隔阈值  检测到超过15个人的时候推送
+                    return;
+                }
+                ScheduleRealInfo sr = dayOfSchedule.executeCurr(m.get("nbbm").toString()); //查询当前车辆执行班次
+                GpsEntity gps = gpsRealData.get(m.get("sbbh").toString());
+                Map msp = new HashMap();
+                msp.put("lineCode",m.get("xlbm"));
+                msp.put("lineName",m.get("XLMC"));
+                msp.put("stationName",gps.getStationName());
+                msp.put("rqStr",sdfMonth.format(new Date()));
+                msp.put("rq",sdfHHmm.format(new Date()));
+                msp.put("type","MZ");
+                msp.put("xlDir",gps.getUpDown());
+                msp.put("fcsj","");
+                msp.put("clzbh",gps.getNbbm());
+                msp.put("numType",num);
+                if (sr != null )
+                    msp.put("xlDir",sr.getXlDir());
+
+                if (gps != null )
+                    msp.put("station",gps.getStation().getCode());
+
+                ts(msp);
+                LogerWait("满载",sr);
+            }
-            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W9G-041","normal");
+            //测试使用
+           /* List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W9G-041","normal");
             ts(addStationPeople(sr.get(5), "MZ", 0L));//第二种 设备未离线 出站时间内未出站
             String chartStr = JSON.toJSONString(sr.get(5));
-            logger.info("满载--"+chartStr);
+            logger.info("满载--"+chartStr);*/
         }
         catch (Exception e){
-            logger.error("满载------------------",e);
+            logger.error("满载检测接口出错------------------",e);
         }
     }
@@ -126,15 +159,13 @@ public class AutomaticSch {
                          if (lg.getlGType() == 0) {
                              ts(ConvertDJK(lg, sch, "FCJG"));
                              SFMAP.put(lg.getId(), lg.getTsTime());
-                             String chartStr = JSON.toJSONString(sch);
-                             logger.info("发车大间隔--" + chartStr);
+                             LogerWait("发车大间隔",sch);
                          }
                      } else {
                          if (lg.getlGType() != 0) {
                              ts(ConvertDJK(lg, sch, "DJG"));
                              SFMAP.put(lg.getId(), lg.getTsTime());
-                             String chartStr = JSON.toJSONString(sch);
-                             logger.info("行车大间隔--" + chartStr);
+                             LogerWait("行车大间隔",sch);
                          }
                      }
                  }
@@ -200,16 +231,14 @@ public class AutomaticSch {
                                 }
                                 sr.setFcsjActual(sfsj);
                                 ts(addStationPeople(sr, "SFTZ_1", 0L));
-                                Gson gson = new Gson();
-                                String chartStr = gson.toJsonTree(sr).toString();
-                                logger.info("实发调整--" + chartStr);
+                                LogerWait("实发调整",sr);
                             }
                         }
                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("自动调度，实发未发推送失败---",e);
         }
         logger.warn("实发未发扫描结束");
@@ -219,6 +248,7 @@ public class AutomaticSch {
     public void sfCX(){
         //查询所有班次
         //remark 人工干预过的的不检测
+        logger.warn("实发撤销检测扫描开始");
         try {
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
@@ -251,23 +281,28 @@ public class AutomaticSch {
                                     msp.put("schId_eq",t.getId());
                                     seiList = (List<SchEditInfo>) schEditInfoService.list(msp);
                                     //有操作记录的跳过
-                                    if (seiList.size() > 0)
+                                    Boolean isCZ = false;
+                                    for(SchEditInfo e : seiList){
+                                        if (e.getType().equals("FCXXWT") || e.getType().equals("DFTZ") || e.getType().equals("SFTZ")){
+                                            isCZ = true;
+                                        }
+                                    }
+                                    if (isCZ)
                                         continue;
                                 }
                                 //异常实发
                                 ts(addStationPeople(t, "YCSF", 0l));
-                                Gson gson = new Gson();
-                                String chartStr = gson.toJsonTree(t).toString();
-                                logger.info("实发撤销--" + chartStr);
+                                LogerWait("实发撤销",t);
                             }
                         }
                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("实发撤销推送接口出错-----------",e);
         }
+        logger.warn("实发撤销检测扫描结束");
     }
     public Boolean isLines(String line) {
@@ -331,7 +366,7 @@ public class AutomaticSch {
                     /*}*/
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("自动调度，指令重发---",e);
         }
         logger.warn("指令重发扫描结束");
@@ -368,8 +403,7 @@ public class AutomaticSch {
                                 if (basicData.nbbmCompanyPlateMap.get(prev.getClZbh()) != null && m.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-",""))){
                                     sch.setRemark(m.get("sj").toString());
                                     ts(addStationPeople(sch, "WD", 0L));
-                                    String chartStr = JSON.toJSONString(sch);
-                                    logger.info("误点--"+chartStr);
+                                    LogerWait("误点",sch);
                                 }
                             }
                         }
@@ -383,6 +417,69 @@ public class AutomaticSch {
     }
+    public void LogerWait(String type,ScheduleRealInfo sch){
+        String chartStr = "id-"+sch.getId() +",xlName-"+sch.getXlName() + ",fcsj-"+sch.getFcsj() + ",FcsjActual-"+ sch.getFcsjActual()+",clzbh-" + sch.getClZbh();
+        logger.info(type+"--" + chartStr);
+    }
+
+    /**
+     *每辆车倒数第二个班次执行之前3分钟提示
+     */
+    public void TowdescSch(){
+        logger.warn("末二班车执行方法开始");
+        try {
+            //获取所有线路
+            Map<String, String> lineMap = BasicData.lineCode2NameMap;
+            //findByNbbm车辆索引获取的班次
+            Map<String, List<ScheduleRealInfo>> groupedByCity = new HashMap<>();
+            if(System.currentTimeMillis() < DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)){
+                logger.info("未到8点----"+(DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)));
+                return;
+            }
+
+            for (Map.Entry<String, String> t : lineMap.entrySet()) {
+                List<ScheduleRealInfo> srList = dayOfSchedule.findByLineCode(t.getKey());
+                Map<String, List<ScheduleRealInfo>> mapType = new HashMap();
+                //所有车辆
+                for (ScheduleRealInfo s : srList) {
+                    if (mapType.get(s.getClZbh()) != null)
+                        continue;
+
+                    List<ScheduleRealInfo> schadd = new ArrayList<>();
+                    //每辆车下的班次
+                    for (ScheduleRealInfo sch : srList) {
+                        if (s.getClZbh().equals(sch.getClZbh())) {
+                            schadd.add(sch);
+                        }
+                    }
+                    mapType.put(s.getClZbh(), schadd);
+                }
+                //判断倒数第二个班次是否快要发车
+                for (String key : mapType.keySet()) {
+                    List<ScheduleRealInfo> carList = mapType.get(key);
+                    Collections.sort(carList, new ScheduleComparator.FCSJ());
+                    //倒数第二个班次保证数量超过两条
+                    ScheduleRealInfo scht = carList.size() >= 2 ? carList.get(carList.size() - 2) : null;
+                    if (scht == null)
+                        continue;
+
+                    if (scht.getDfsjT() > DateUtils.getTimestamp() + (1000 * 60 * 60 * 20) &&
+                            scht.getDfsjT() - System.currentTimeMillis() < (1000* 60 * 4) &&
+                            scht.getDfsjT() - System.currentTimeMillis() >= (1000* 60 *3)) {
+                        //推送一下
+                        ts(addStationPeople(scht,"DESCTWO",0l));
+
+                        LogerWait("末二班车推送",scht);
+                    }
+                }
+            }
+
+        }catch (Exception e){
+            logger.error("（倒数第二班车）末二班车执行方法出错"+ e);
+        }
+    }
+
+
     public void ts(Map m) throws ParseException {
@@ -425,16 +522,6 @@ public class AutomaticSch {
         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;
-    }
     //转换
@@ -107,7 +107,7 @@ public class OutEntrance {
              }
-             //查询班次情况自动回复
+             //查询班次情况自动回复 --拥堵
              //当前日期
              List<Map> dzList = carMonitor.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
              if (dzList.size() > 0){
@@ -123,23 +123,25 @@ 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;
+                     if(schc.getXlBm().equals(m.get("lineCode"))) {
+                         Long schId = schc.getId();
+                         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", "非常抱歉，车辆因路上交通拥堵，预计还需要" + mst.get("sj").toString() + "抵达，请稍等片刻");
+                                     rtn.put("status", ResponseCode.SUCCESS);
+                                     return rtn;
+                                 }
                              }
                          }
                      }
@@ -147,7 +149,7 @@ public class OutEntrance {
-                 //筛选方向
+                 //筛选方向 -- 正常班次未到发车时间
                  List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
                  if(rs.size()>0){
                      //排序
@@ -62,12 +62,6 @@ public class ZnddThread extends Thread{
             //automaticSch.dfTz();//大间隔
             for (znddStatus zs : znddStatusList) {
                  if (zs.getOpenStatus() != null && zs.getOpenStatus().equals("0")) {
-                    //预案5个
-                    if (zs.getType().equals("fcjg")) {
-                        automaticSch.dfTz(0);
-                        logger.info("发车间隔执行完毕");
-                    }
-
                     if (zs.getType().equals("sftz")) {
                         automaticSch.sftz();//实发未发
                         logger.info("实发执行完毕");
@@ -76,26 +70,13 @@ public class ZnddThread extends Thread{
                         automaticSch.sfCX();// 异常实发 - 实发撤销
                         logger.info("异常实发执行完毕");
                     }
-                    if (zs.getType().equals("zlcf")){
-                        automaticSch.drivresponse();
-                        logger.info("设备重发执行完毕");
-                    }
-                    if (zs.getType().equals("wd")){
-                        automaticSch.wd();
-                        logger.info("误点执行完毕");
-                    }
-                    if (zs.getType().equals("djg")){
-                        automaticSch.dfTz(1);
-                        logger.info("行车大间隔执行完毕");
-                    }
-                    if (zs.getType().equals("mz")){
-                        automaticSch.mz();
-                        logger.info("满载执行完毕");
-                    }
-
+                     if (zs.getType().equals("zlcf")){
+                         automaticSch.drivresponse();
+                         logger.info("设备重发执行完毕");
+                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.info("智能调度线程——————",e);
         }
+package com.bsth.data.zndd;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.zndd.ZnddStatusRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调度预案 发车间隔、误点、大间隔、满载、大客流
+ */
+@Component
+public class ZnddTwoThread extends Thread{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    /*@Autowired
+    StationPeopleLoggerRepository stationPeopleLoggerRepository;*/
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    @Autowired
+    LineConfigData lineConfs;
+    @Autowired
+    GpsRealData gpsRealData;
+    @Autowired
+    StationRouteRepository stationRouteRepository;
+    @Autowired
+    OutEntrance outEntrance;
+    @Autowired
+    AutomaticSch automaticSch;
+
+    @Autowired
+    ZnddStatusRepository znddStatusRepository;
+
+    static Map<String,List> ZNDDTYPEMAP = new HashMap<>(); //已经推送过的检测
+
+
+
+
+    private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+    private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    @Override
+    public void run() {
+        try {
+            List<znddStatus> znddStatusList = (List<znddStatus>) znddStatusRepository.findAll();
+
+           for (znddStatus zs : znddStatusList) {
+                if (zs.getOpenStatus() != null && zs.getOpenStatus().equals("0")) {
+                    //预案5个
+                    if (zs.getType().equals("fcjg")) {
+                        automaticSch.dfTz(0);
+                        logger.info("发车间隔执行完毕");
+                    }
+                    if (zs.getType().equals("wd")) {
+                        automaticSch.wd();
+                        logger.info("误点执行完毕");
+                    }
+                    if (zs.getType().equals("djg")) {
+                        automaticSch.dfTz(1);
+                        logger.info("行车大间隔执行完毕");
+                    }
+                    if (zs.getType().equals("mz")) {
+                        automaticSch.mz();
+                        logger.info("满载执行完毕");
+                    }
+                    if (zs.getType().equals("desctwo")) {
+                        automaticSch.TowdescSch();
+                        logger.info("末二班车");
+                    }
+                }
+            }
+
+
+        } catch (Exception e) {
+            logger.info("智能调度线程——————", e);
+        }
+    }
+    //满载
+   /* public void MZ(){
+        try {
+            StringBuilder sb = HttpClientUtils.get(url);
+            List<Object> list = JSONArray.parseArray(String.valueOf(sb));
+            for (Object b :list){
+                Map m = (Map) b;
+               Integer num = Integer.parseInt(m.get("inside_num").toString());
+               if (num >= 15){ //大间隔阈值  检测到超过15个人的时候推送
+                   ScheduleRealInfo sr = dayOfSchedule.executeCurr(m.get("nbbm").toString()); //查询当前车辆执行班次
+                   GpsEntity gps = gpsRealData.get(m.get("sbbh").toString());
+                   Map msp = new HashMap();
+                   msp.put("lineCode",m.get("xlbm"));
+                   msp.put("lineName",m.get("xlmc"));
+                   msp.put("stationName",gps.getStationName());
+                   msp.put("rqStr",sdfMonth.format(new Date()));
+                   msp.put("rq",sdfHHmm.format(new Date()));
+                   msp.put("type","MZ");
+                   msp.put("numType",num);
+                   if (sr != null )
+                       msp.put("xlDir",sr.getXlDir());
+                   
+                   if (gps != null )
+                       msp.put("station",gps.getStation().getCode());
+                   
+                   ts(msp);
+               }
+            }
+            
+        }catch (Exception e){
+            logger.error("满载检测接口出错-----------",e);
+        }
+    }*/
+    public void ts(Map m) throws ParseException {
+        outEntrance.Znddjk(m);//测试推送
+    }
+ /*   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();
+        List<Long> list = new ArrayList();
+        //111_DJG_2024-06-24
+        if (ZNDDTYPEMAP.get(st) != null ) {
+            list = ZNDDTYPEMAP.get(st);
+            int i = 0;
+            for (Long s : list){
+                if (Math.abs(s - sj) > (60 * 60 * 1000)){
+                    i ++ ;
+                }
+            }
+            if (i == list.size()){
+                list.add(sj);
+                ZNDDTYPEMAP.put(st,list);//存记录
+                outEntrance.Znddjk(m);//推送
+            }
+            return;
+        }else {
+            list.add(sj);
+            ZNDDTYPEMAP.put(st,list);//存记录
+            outEntrance.Znddjk(m);//推送
+        }
+       
+    }
+
+*/
+
+   /* //发车间隔
+    public void FCJG(){
+        try {
+            //无数据情况下 查看发车间隔配置数据是否正常bsth_c_calc_interval
+            List<CalcIntervalDetail> fcjgList = userCarCountHandler.calcLast();
+            if (fcjgList!= null && !fcjgList.isEmpty()){
+                for (CalcIntervalDetail cd : fcjgList){
+                    Map sp = new HashMap();
+                    sp.put("lineCode",cd.getLineCode());
+                    sp.put("lineName",cd.getLineName());
+                    sp.put("rqStr",cd.getDate());
+                    sp.put("rq",cd.getSjfc2());
+                    sp.put("type","FCJG");
+                    sp.put("xlDir",cd.getXlDir());
+                    sp.put("numType",cd.getSubTime());
+                    sp.put("fcsj",cd.getSjfc2());
+                    sp.put("stationName",cd.getStation());
+                    ts(sp);
+                }
+            }
+        }catch (Exception e){
+            logger.error("发车间隔检测出现出错-----------",e);
+        }
+    }
+*/
+
+    //转换
+    public Map addStationPeople(ScheduleRealInfo info,String type,Long sst,String sj) throws ParseException{
+        Map sp = new HashMap();
+        sp.put("lineCode",info.getXlBm());
+        sp.put("lineName",info.getXlName() );
+        sp.put("rqStr",info.getScheduleDateStr());
+        sp.put("rq",new java.sql.Date(sdf.parse((info.getScheduleDateStr()+" " + sj)).getTime())); //检测到时间
+        sp.put("type",type);
+        sp.put("xlDir",info.getXlDir());
+        sp.put("numType",sst);
+        return sp;
+    }
+
+
+
+    //排序
+    public static class GpsComp implements Comparator<GpsEntity> {
+        @Override
+        public int compare(GpsEntity o1, GpsEntity o2) {
+            return Integer.parseInt(o1.getRemark()) - Integer.parseInt(o2.getRemark());
+        }
+    }
+
+}
+
-package com.bsth.data.zndd.voice;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.sun.media.sound.WaveFileReader;
-import com.sun.media.sound.WaveFileWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.vosk.LibVosk;
-import org.vosk.LogLevel;
-import org.vosk.Model;
-import org.vosk.Recognizer;
-
-import javax.sound.sampled.*;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-public class VoiceUtil {
-   /* @Value("${leenleda.vosk.model}")
-    private String VOSKMODELPATH;*/
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-    public String getWord(String filePath) throws IOException, UnsupportedAudioFileException {
-        Assert.isTrue(StringUtils.hasLength("D:\\pcm\\vosk-model-small-cn-0.22"), "无效的VOS模块！");
-        byte[] bytes = Files.readAllBytes(Paths.get(filePath));
-        // 转换为16KHZ
-        reSamplingAndSave(bytes, filePath);
-        File f = new File(filePath);
-        RandomAccessFile rdf = null;
-        rdf = new RandomAccessFile(f, "r");
-        log.info("声音尺寸:{}", toInt(read(rdf, 4, 4)));
-        log.info("音频格式:{}", toShort(read(rdf, 20, 2)));
-        short track = toShort(read(rdf, 22, 2));
-        log.info("1 单声道 2 双声道: {}", track);
-        log.info("采样率、音频采样级别 16000 = 16KHz: {}", toInt(read(rdf, 24, 4)));
-        log.info("每秒波形的数据量：{}", toShort(read(rdf, 22, 2)));
-        log.info("采样帧的大小：{}", toShort(read(rdf, 32, 2)));
-        log.info("采样位数：{}", toShort(read(rdf, 34, 2)));
-        rdf.close();
-        LibVosk.setLogLevel(LogLevel.WARNINGS);
-        try (
-             Model model = new Model("D:\\pcm\\vosk-model-small-cn-0.22");
-             InputStream ais = AudioSystem.getAudioInputStream(new BufferedInputStream(new FileInputStream(filePath)));
-             // 采样率为音频采样率的声道倍数
-             Recognizer recognizer = new Recognizer(model, 16000 * track)) {
-            
-            recognizer.setWords(true);
-            
-            String result = recognizer.getFinalResult();
-            log.info("识别结果：{}", result);
-            if (StringUtils.hasLength(result)) {
-                JSONObject jsonObject = JSON.parseObject(result);
-                return jsonObject.getString("text").replace(" ", "");
-            }
-            return "";
-        }
-        
-        
-        
-    }
-
-    public static int toInt(byte[] b) {
-        return (((b[3] & 0xff) << 24) + ((b[2] & 0xff) << 16) + ((b[1] & 0xff) << 8) + ((b[0] & 0xff) << 0));
-    }
-
-    public static short toShort(byte[] b) {
-        return (short) ((b[1] << 8) + (b[0] << 0));
-    }
-
-    public static byte[] read(RandomAccessFile rdf, int pos, int length) throws IOException {
-        rdf.seek(pos);
-        byte result[] = new byte[length];
-        for (int i = 0; i < length; i++) {
-            result[i] = rdf.readByte();
-        }
-        return result;
-    }
-
-    public static void reSamplingAndSave(byte[] data, String path) throws IOException, UnsupportedAudioFileException {
-        WaveFileReader reader = new WaveFileReader();
-        AudioInputStream audioIn = reader.getAudioInputStream(new ByteArrayInputStream(data));
-        AudioFormat srcFormat = audioIn.getFormat();
-        int targetSampleRate = 16000;
-        AudioFormat dstFormat = new AudioFormat(srcFormat.getEncoding(),
-                targetSampleRate,
-                srcFormat.getSampleSizeInBits(),
-                srcFormat.getChannels(),
-                srcFormat.getFrameSize(),
-                srcFormat.getFrameRate(),
-                srcFormat.isBigEndian());
-        AudioInputStream convertedIn = AudioSystem.getAudioInputStream(dstFormat, audioIn);
-        File file = new File(path);
-        WaveFileWriter writer = new WaveFileWriter();
-        writer.write(convertedIn, AudioFileFormat.Type.WAVE, file);
-    }
-}
 \ No newline at end of file
+//package com.bsth.data.zndd.voice;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.sun.media.sound.WaveFileReader;
+//import com.sun.media.sound.WaveFileWriter;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.util.Assert;
+//import org.springframework.util.StringUtils;
+//import org.vosk.LibVosk;
+//import org.vosk.LogLevel;
+//import org.vosk.Model;
+//import org.vosk.Recognizer;
+//
+//import javax.sound.sampled.*;
+//import java.io.*;
+//import java.nio.file.Files;
+//import java.nio.file.Paths;
+//
+//public class VoiceUtil {
+//   /* @Value("${leenleda.vosk.model}")
+//    private String VOSKMODELPATH;*/
+//
+//    Logger log = LoggerFactory.getLogger(this.getClass());
+//    public String getWord(String filePath) throws IOException, UnsupportedAudioFileException {
+//        Assert.isTrue(StringUtils.hasLength("D:\\pcm\\vosk-model-small-cn-0.22"), "无效的VOS模块！");
+//        byte[] bytes = Files.readAllBytes(Paths.get(filePath));
+//        // 转换为16KHZ
+//        reSamplingAndSave(bytes, filePath);
+//        File f = new File(filePath);
+//        RandomAccessFile rdf = null;
+//        rdf = new RandomAccessFile(f, "r");
+//        log.info("声音尺寸:{}", toInt(read(rdf, 4, 4)));
+//        log.info("音频格式:{}", toShort(read(rdf, 20, 2)));
+//        short track = toShort(read(rdf, 22, 2));
+//        log.info("1 单声道 2 双声道: {}", track);
+//        log.info("采样率、音频采样级别 16000 = 16KHz: {}", toInt(read(rdf, 24, 4)));
+//        log.info("每秒波形的数据量：{}", toShort(read(rdf, 22, 2)));
+//        log.info("采样帧的大小：{}", toShort(read(rdf, 32, 2)));
+//        log.info("采样位数：{}", toShort(read(rdf, 34, 2)));
+//        rdf.close();
+//        LibVosk.setLogLevel(LogLevel.WARNINGS);
+//        try (
+//             Model model = new Model("D:\\pcm\\vosk-model-small-cn-0.22");
+//             InputStream ais = AudioSystem.getAudioInputStream(new BufferedInputStream(new FileInputStream(filePath)));
+//             // 采样率为音频采样率的声道倍数
+//             Recognizer recognizer = new Recognizer(model, 16000 * track)) {
+//
+//            recognizer.setWords(true);
+//
+//            String result = recognizer.getFinalResult();
+//            log.info("识别结果：{}", result);
+//            if (StringUtils.hasLength(result)) {
+//                JSONObject jsonObject = JSON.parseObject(result);
+//                return jsonObject.getString("text").replace(" ", "");
+//            }
+//            return "";
+//        }
+//
+//
+//
+//    }
+//
+//    public static int toInt(byte[] b) {
+//        return (((b[3] & 0xff) << 24) + ((b[2] & 0xff) << 16) + ((b[1] & 0xff) << 8) + ((b[0] & 0xff) << 0));
+//    }
+//
+//    public static short toShort(byte[] b) {
+//        return (short) ((b[1] << 8) + (b[0] << 0));
+//    }
+//
+//    public static byte[] read(RandomAccessFile rdf, int pos, int length) throws IOException {
+//        rdf.seek(pos);
+//        byte result[] = new byte[length];
+//        for (int i = 0; i < length; i++) {
+//            result[i] = rdf.readByte();
+//        }
+//        return result;
+//    }
+//
+//    public static void reSamplingAndSave(byte[] data, String path) throws IOException, UnsupportedAudioFileException {
+//        WaveFileReader reader = new WaveFileReader();
+//        AudioInputStream audioIn = reader.getAudioInputStream(new ByteArrayInputStream(data));
+//        AudioFormat srcFormat = audioIn.getFormat();
+//        int targetSampleRate = 16000;
+//        AudioFormat dstFormat = new AudioFormat(srcFormat.getEncoding(),
+//                targetSampleRate,
+//                srcFormat.getSampleSizeInBits(),
+//                srcFormat.getChannels(),
+//                srcFormat.getFrameSize(),
+//                srcFormat.getFrameRate(),
+//                srcFormat.isBigEndian());
+//        AudioInputStream convertedIn = AudioSystem.getAudioInputStream(dstFormat, audioIn);
+//        File file = new File(path);
+//        WaveFileWriter writer = new WaveFileWriter();
+//        writer.write(convertedIn, AudioFileFormat.Type.WAVE, file);
+//    }*/
+//}
 \ No newline at end of file
@@ -34,6 +34,15 @@ public class znddStatus {
         this.excuteStatus = excuteStatus;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getType() {
         return type;
     }
@@ -2,10 +2,20 @@ package com.bsth.repository.zndd;
 import com.bsth.entity.zndd.znddStatus;
 import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 @Repository
 public interface ZnddStatusRepository extends BaseRepository<znddStatus, Integer> {
+
+
+    @Transactional
+    @Modifying
+    @Query(value="UPDATE zndd_status SET " +
+            "open_status = ?2 WHERE id = ?1", nativeQuery=true)
+    void update(Integer id, Integer openStatus);
 }
@@ -7,4 +7,7 @@ public interface ZnddStatusService extends BaseService&lt;znddStatus, Integer&gt; {
     void add(znddStatus zs);
+
+
+    void update(Integer id,Integer openStatus);
 }
@@ -17,4 +17,8 @@ public class ZnddStatusServiceImpl extends BaseServiceImpl&lt;znddStatus, Integer&gt; 
     public void add(znddStatus zs){
         znddStatusRepository.save(zs);
     }
+
+    public void update(Integer id,Integer openStatus){
+        znddStatusRepository.update(id,openStatus);
+    }
 }
@@ -82,6 +82,7 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> 信号标记</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> 客流信息</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="zndd_status"> 智能调度开关</label></li>
             </ul>
         </div>
         <div>
@@ -583,3 +583,9 @@ span.sm-grey{
     margin-left: -14px;
     margin-bottom: -30px;
 }
+
+.zndd_su{
+    font-size: 16px;
+}
+
+
@@ -207,6 +207,11 @@
         "id": 4.5,
         "text": "客流信息",
         "event": "kl_config"
+      },
+      {
+        "id": 4.6,
+        "text": "智能调度开关",
+        "event": "zndd_status"
       }
     ]
@@ -147,6 +147,11 @@ var gb_northToolbar = (function () {
         kl_config: function () {
             open_modal('/real_control_v2/fragments/north/nav/kl_config.html', {}, modal_opts);
         },
+
+        zndd_status: function () {
+            open_modal('/real_control_v2/zndd/zndd_status.html', {}, modal_opts);
+        },
+
         // bcgxsj_config: function () {
         //     open_modal('/real_control_v2/fragments/north/nav/line_config/bcgxsj_config.html', {}, modal_opts);
         // },
 var gb_dataZndd = (function (){
     var max = 3;
+    var max_s = 5;
     var $pop =$('.multi_plat_msg_pop_zndd'); 
     var codes = {
@@ -11,6 +12,7 @@ var gb_dataZndd = (function (){
         'DKL': '大客流',
         'YCSF':'异常实发',
         'SFTZ_1': '实发未发，信号异常',
+        'DESCTWO':'末二班车即将发车'
     };
@@ -41,9 +43,15 @@ var gb_dataZndd = (function (){
             return;
         }
+        if (data.type == 'DESCTWO'){
+            configurecell();
+            return;
+        }
+
+
         configure();
-        //配置 随到随发   配置div方案
+        //定时方案
         function configure(){
             var htmlStr = template('zndd_plat_msg_template_config', data);
@@ -65,6 +73,17 @@ var gb_dataZndd = (function (){
             //gb_tts.audition(msg, 1.2); //语音播报
         }
+        //无定时器方案
+        function configurecell(){
+            var htmlStr = template('zndd_plat_msg_template_config_s', data);
+            var items = $pop.find('.multi_plat_config_s'),
+                len = items.length;
+
+            if (len >= max_s)
+                $pop.find('.multi_plat_config_s:lt(' + (len - max_s) + ')').remove();
+
+            $pop.append(htmlStr);
+        }
         function configureDkl(){
             var htmlStr = template('zndd_plat_msg_template_dkl', data);
@@ -318,7 +318,22 @@
             </div>
         </div>
     </div>
+</script>
+<script  id="zndd_plat_msg_template_config_s" type="text/html">
+    <div class="multi_plat_config_s">
+        <div class="msg-popup warning-color">
+            <div class="msg-times" style="cursor: pointer;">×</div>
+            <div class="centerSpace msg-title">
+                <div>自动调度消息-待确认</div>
+                <div class="msg-date-info">{{datarq}}</div>
+            </div>
+            <div class="popup-msg-content">
+                <i class="fa fa-info-circle" aria-hidden="true"></i>
+                <span>{{lineName}} {{xlDir ==0 ?'上行':'下行'}}  {{clzbh}}   {{fcsj}} 出现 {{types}}</span>
+            </div>
+        </div>
+    </div>
 </script>
 <script id="sjZ-divs-temp" type="text/html">
@@ -406,7 +421,7 @@
             </div>
             <div class="popup-msg-contents" >
                 <button class="uk-button uk-button-primary images"   data-image="{{image}}" value="{{dir}}">查看图片</button>
-                <button class="uk-button uk-button-primary ljbc"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">临加班次</button>
+                <button class="uk-button uk-button-primary ljbc"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">选择方案</button>
             </div>
         </div>
     </div>
@@ -574,7 +574,7 @@
     <div class="uk-grid">
         <div class="uk-width-4-2">
             <div class="uk-form-row">
-                <h3>大客流情况</h3>
+                <h3 style="font-weight: 700;">大客流情况</h3>
             </div>
         </div>
     </div>
@@ -609,7 +609,7 @@
         <div class="uk-grid">
             <div class="uk-width-4-2">
                 <div class="uk-form-row">
-                    <h3>站点图片</h3>
+                    <h3 style="font-weight: 700;">站点图片</h3>
                 </div>
             </div>
         </div>
@@ -630,7 +630,7 @@
         <div class="uk-grid">
             <div class="uk-width-4-2">
                 <div class="uk-form-row">
-                    <label class="uk-form-labels" ><h3>空闲车辆/人员/班次结束时间</h3></label>
+                    <label class="uk-form-labels" ><h3 style="font-weight: 700;">空闲车辆/人员/班次结束时间</h3></label>
                     <div id="nbbms">
                     </div>
                 </div>
+<div class="uk-modal ct-form-modal" id="tts-config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>智能调度开关</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会调整所有线路配置,请谨慎调整</small>
+        </p>
+
+        <div class="zndd_su ct-fixed-table">
+
+                <table class="ct-fixed-table uk-table uk-table-hover">
+                    <thead>
+                    <tr>
+                        <th style="width: 8%;">序号</th>
+                        <th style="width: 10%;">名称</th>
+                        <th style="width: 10%;">状态</th>
+                        <th style="width: 8%;">开关</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+        </div>
+
+    </div>
+
+    <script>
+        (function() {
+
+          list();
+        })();
+
+        function list(){
+            $(".zndd_su tbody").html("");
+            $.get('/znnd_status/all', null, function(data){
+                var tbodyHtml = template('zndd_list_all',{list:data});
+                $(".zndd_su tbody").html(tbodyHtml);
+            })
+        }
+
+
+        function opencloseStatus(el,status){
+            debugger
+            var id = parseInt($(el).val());
+            var json  ={
+                id : id,
+                openStatus : status
+            }
+            $.post('/znnd_status/update', json, function(data){
+                if (data.status == "SUCCESS"){
+                    notify_succ('调整成功！');
+                    list();
+                }
+
+            })
+
+        }
+
+    </script>
+
+    <script type="text/html" id="zndd_list_all">
+        {{each list as obj i}}
+        <tr>
+            <td>{{i +1 }}</td>
+            <td>{{obj.name}}</td>
+            <td>
+                {{if obj.openStatus  == 0}}
+                <div class="uk-badge uk-badge-danger"> 开</div>
+                {{else}}
+                <div class="uk-badge uk-badge-danger"> 关</div>
+                {{/if}}
+            </td>
+
+            <td>
+                {{if obj.openStatus == 0}}
+                <button class="btn btn-sm  btn-outline filter-submit margin-bottom" value="{{obj.id}}" onclick="opencloseStatus(this,1)">
+                    <i class="fa fa-search" ></i> 关闭</button>
+                {{else}}
+                <button class="btn btn-sm  btn-outline filter-submit margin-bottom" value="{{obj.id}}" onclick="opencloseStatus(this,0)">
+                    <i class="fa fa-search"></i> 开启</button>
+                {{/if}}
+            </td>
+        </tr>
+        {{/each}}
+
+    </script>
+</div>
+