1

ljq
1 parent 5200d8b2
Showing 4 changed files with 76 additions and 103 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/ZnddThread.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
@@ -22,7 +22,6 @@ import com.bsth.data.schedule.thread.CalcOilThread;
 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.StationAllThread;
 import com.bsth.data.zndd.ZnddThread;
 import com.bsth.util.DateUtils;
 import com.bsth.util.Tools;
@@ -87,8 +86,6 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     ZnddThread znddThread;
     @Autowired
-    StationAllThread stationAllThread;
-    @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
     @Autowired
 package com.bsth.data.zndd;
 import com.bsth.common.ResponseCode;
-import com.bsth.controller.station_signs.carMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.adjg.domain.LargeGap;
-import com.bsth.entity.logger.StationSignsLogger;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.zndd.StationPeopleLogger;
-import com.bsth.service.logger.StationSignsLoggerService;
-import com.bsth.service.zndd.ZnddLoggerService;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -34,85 +28,79 @@ import java.util.*;
 public class OutEntrance {
     @Autowired
-    StationSignsLoggerService stationSignsLoggerService;
-
-    @Autowired
     SendUtils sendUtils;
     @Autowired
     DayOfSchedule dayOfSchedule;
-    @Autowired
-    ZnddLoggerService znddLoggerService;
-    @Autowired
-    carMonitorThread carMonitorThread;
-
-    @Value("${dc.imgurl}")
+  /*  @Value("${dc.imgurl}")
     private  String imgurl; //存储图片地址
     @Value("${dc.profile}")
-    private  String profile; //存储图片地址
-    
+    private  String profile; //存储图片地址*/
+
     static String url= "http://58.34.52.130:9777/xxfb/carMonitor?";  //信息发布地址
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    
-    
-    
-    /*
-        调度屏小程序接口。
-     */
-    @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
-    public Map OutCarOutCar(@RequestParam Map m,@RequestBody Map<String, String> map) {
-        Map rtn = new HashMap<>();
-        try {
-    
-            ObjectMapper mapper = new ObjectMapper();
-            m.put("image", uploadBase64Img(map.get("img").toString()));
-            //map转换实体类
-            StationSignsLogger ssLogger = mapper.convertValue(m, StationSignsLogger.class);
-            //stationSignsLoggerService.save(ssLogger);
-            
-            //线调页面推送
-            sendUtils.stationcf(m);
-            
-            //查询班次情况自动回复
-            //当前日期
-            //String rq = DateUtils.dqDate();
-            List<Map> dzList = carMonitorThread.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
-            if (dzList.size() > 0){
-                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");
-            }
-            
-            
-            
-            rtn.put("status",ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            rtn.put("status", ResponseCode.ERROR);
-            logger.info(e.getMessage());
-        }
-        
-       return rtn;
-    }
+
+    /****
+     调度屏小程序接口。
+
+     @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
+     public Map OutCarOutCar(@RequestParam Map m,@RequestBody Map<String, String> map) {
+
+
+     Map rtn = new HashMap<>();
+     try {
+
+     ObjectMapper mapper = new ObjectMapper();
+     m.put("image", uploadBase64Img(map.get("img").toString()));
+     //map转换实体类
+     StationSignsLogger ssLogger = mapper.convertValue(m, StationSignsLogger.class);
+     //stationSignsLoggerService.save(ssLogger);
+
+     //线调页面推送
+     sendUtils.stationcf(m);
+
+     //查询班次情况自动回复
+     //当前日期
+     //String rq = DateUtils.dqDate();
+     List<Map> dzList = carMonitorThread.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
+     if (dzList.size() > 0){
+     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");
+     }
+
+
+
+     rtn.put("status",ResponseCode.SUCCESS);
+     } catch (Exception e) {
+     rtn.put("status", ResponseCode.ERROR);
+     logger.info(e.getMessage());
+     }
+
+     return rtn;
+     }
+
+     */
     /*
     智能调度接口--通用测试接口
      */
@@ -136,7 +124,7 @@ public class OutEntrance {
     /*
   智能调度接口-大客流
-   */
+  
     @RequestMapping(value="/dkl",method = RequestMethod.POST)
     public Map ddkl(@RequestParam Map m) {
         Map rtn = new HashMap<>();
@@ -160,7 +148,7 @@ public class OutEntrance {
         }
         return rtn;
     }
-
+ */
@@ -170,7 +158,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");
@@ -226,8 +214,8 @@ public class OutEntrance {
             }
         }
         return null;
-    }
-    
-    
-    
+    }*/
+
+
+
 }
 package com.bsth.data.zndd;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.adjg.UserCarCountHandler;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.data.adjg.domain.LargeGap;
-import com.bsth.entity.calc.CalcIntervalDetail;
-import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.zndd.znddStatus;
 import com.bsth.repository.StationRouteRepository;
-import com.bsth.repository.zndd.StationPeopleLoggerRepository;
 import com.bsth.repository.zndd.ZnddStatusRepository;
-import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +24,8 @@ import java.util.*;
 public class ZnddThread extends Thread{
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Autowired
-    StationPeopleLoggerRepository stationPeopleLoggerRepository;
+    /*@Autowired
+    StationPeopleLoggerRepository stationPeopleLoggerRepository;*/
     @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
@@ -44,8 +34,8 @@ public class ZnddThread extends Thread{
     GpsRealData gpsRealData;
     @Autowired
     StationRouteRepository stationRouteRepository;
-    @Autowired
-    private UserCarCountHandler userCarCountHandler;
+/*    @Autowired
+    private UserCarCountHandler userCarCountHandler;*/
     @Autowired
     OutEntrance outEntrance;
     @Autowired
@@ -93,7 +83,7 @@ public class ZnddThread extends Thread{
     }
     //满载
-    public void MZ(){
+   /* public void MZ(){
         try {
             StringBuilder sb = HttpClientUtils.get(url);
             List<Object> list = JSONArray.parseArray(String.valueOf(sb));
@@ -124,7 +114,7 @@ public class ZnddThread extends Thread{
         }catch (Exception e){
             logger.error("满载检测接口出错-----------",e);
         }
-    }
+    }*/
     public void ts(Map m) throws ParseException {
         //记录存一下  --超过当前时间的是否推送？
         String st = m.get("lineCode")+"_"+m.get("type")+"_"+m.get("rqStr");
@@ -185,7 +175,7 @@ public class ZnddThread extends Thread{
 */
     //发车间隔
-    public void FCJG(){
+   /* public void FCJG(){
         try {
             //无数据情况下 查看发车间隔配置数据是否正常bsth_c_calc_interval
             List<CalcIntervalDetail> fcjgList = userCarCountHandler.calcLast();
@@ -207,7 +197,7 @@ public class ZnddThread extends Thread{
         }catch (Exception e){
             logger.error("发车间隔检测出现出错-----------",e);
         }
-    }
+    }*/
     //转换
@@ -7,8 +7,6 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.zndd.StationPeople;
-import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.websocket.dto.WsScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;