Merge branch 'lggj' of http://192.168.168.245:8888/panzhaov5/bsth_control into lggj

徐烜
2 parents d5ae91b6 343bdebb
Showing 6 changed files with 169 additions and 46 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.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/carMonitor.java
src/main/java/com/bsth/security/SsoConfig.java
@@ -345,8 +345,7 @@ public class AdminUtilsController {
             gatewayHttpLoader.afterPropertiesSet();
             gatewayHttpUtils.afterPropertiesSet();
             rfidHttpLoader.afterPropertiesSet();
-            ssoConfig.setSystemCode(SystemParamCache.getSsoSystemCode());
-            ssoConfig.setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+            ssoConfig.afterPropertiesSet();
  
             return "success";
         } catch (Exception e) {
@@ -365,8 +364,7 @@ public class AdminUtilsController {
             gatewayHttpLoader.afterPropertiesSet();
             gatewayHttpUtils.afterPropertiesSet();
             rfidHttpLoader.afterPropertiesSet();
-            ssoConfig.setSystemCode(SystemParamCache.getSsoSystemCode());
-            ssoConfig.setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+            ssoConfig.afterPropertiesSet();
  
             return "success";
         } catch (Exception e) {
@@ -5,31 +5,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.adjg.domain.LargeGap;
 import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.directive.GatewayHttpUtils;
-import com.bsth.data.directive.MsgIdGenerator;
 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.entity.StationRoute;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.directive.D60;
-import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.StationRouteRepository;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.HttpClientUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
-import javax.xml.crypto.Data;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -57,13 +48,15 @@ public class AutomaticSch {
     StationRouteRepository stationRouteRepository;
     @Autowired
     OutEntrance outEntrance;
+    @Autowired
+    carMonitor carMonitor;
+    @Autowired
+    BasicData basicData;
  
-    private static DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HHmmss");
-    private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
-    private static DateTimeFormatter fmtyyyyMMddHHmmss = DateTimeFormat.forPattern("yyyy-MM-ddHHmmss");
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
     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
     // 当日60指令缓存
     private   ConcurrentMap<Integer, D60> d60Map = new ConcurrentHashMap<>();//d60map
@@ -132,13 +125,12 @@ public class AutomaticSch {
             //获取所有线路
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
             for (Map.Entry<String, String> t : lineMap.entrySet()){
-                List<GpsEntity>  gpslist = gpsRealData.getByLine(t.getKey());
                 List<ScheduleRealInfo> srList = dayOfSchedule.findByLineCode(t.getKey());
                 for (ScheduleRealInfo sr : srList){
                     //1.离线 2.实发时间为空 3.已过待发时间还没发车的
                     long time = System.currentTimeMillis();//实际时间+2分钟
                     //超过待发时间  实发时间还是null的
-                    if (sr.getFcsjT() + (1000*3) < time) {
+                    if (sr.getFcsjT() + (1000*3) > time) {
  
                         //起点站实际到达时间为null的情况下
                         if (StringUtils.isEmpty(sr.getQdzArrDatesj())) {
@@ -150,7 +142,7 @@ public class AutomaticSch {
                         }
                         //第一种 设备离线的情况下改出站
                         Integer staus = 0; //状态
-                        if (StringUtils.isEmpty(sr.getFcsjActual()) && sr.getBcType().equals("normal") && sr.getRemarks() == null) {
+                        if (StringUtils.isEmpty(sr.getFcsjActual()) && sr.getBcType().equals("normal") && StringUtils.isEmpty(sr.getRemarks())) {
  
                             GpsEntity gps =  gpsRealData.getByNbbm(sr.getClZbh());
                             //当前设备离线的情况  
@@ -189,7 +181,7 @@ public class AutomaticSch {
                 Collections.sort(oldSchDateList, new ScheduleComparator.FCSJ());
                 for (ScheduleRealInfo t : oldSchDateList){
                     // 发车误点 
-                    if (t.getFcsj() != null && t.getFcsjActual() != null  && t.getBcType().equals("normal") && t.getRemarks() == null){
+                    if (t.getFcsj() != null && t.getFcsjActual() != null  && t.getBcType().equals("normal") && StringUtils.isEmpty(t.getRemarks())){
                         Long sst = ((t.getFcsjActualTime() - t.getFcsjT()) / 1000 / 60);
                         Long fcsj = t.getFcsjT() / 1000 ;
                         Long sfsj = t.getFcsjActualTime() / 1000;
@@ -284,23 +276,50 @@ public class AutomaticSch {
                     }
                 }
             }
-            
-            
-            
-            
         }catch (Exception e){
             logger.error("自动调度，指令重发---",e);
         }
         logger.warn("指令重发扫描结束");
     }
-    
     //误点检测 调度有的-LateAdjustHandle
-    public Map wd(ScheduleRealInfo sch){
+    public Map wd(){
         //推送
         try{
-            return addStationPeople(sch, "WD", 0L);
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            Collections.sort(all, cpm);
+            long t = System.currentTimeMillis();
+            int size = all.size();
+            ScheduleRealInfo sch;
+            for(int i = 0; i < size; i ++){
+                sch = all.get(i);
+                if(sch.getDfsjT() > t)
+                    break;
+
+                /*if(sch.isLate())
+                    continue;*/
+
+                if(sch.getStatus() == 0
+                        && StringUtils.isEmpty(sch.getFcsjActual())){
+
+                    //检查应发未到 当前班次无起点到达时间
+                    if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
+                        ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+                        //上一个班次也没有实际终点到达时间
+                        if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+                            //进入误点调整程序
+                            LateAdjustHandle.putLate(sch);
+                            List<Map> dzList = carMonitor.carMonitor(prev.getXlBm(), prev.getXlDir(), prev.getZdzCode());  //信息发布接口
+                            for (Map m : dzList){
+                                if (m.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-",""))){
+                                    return addStationPeople(sch, "WD", 0L);
+                                }
+                            }
+                        }
+                    };
+                }
+            }
         }catch (Exception e){
-            logger.error("自动调度，推送失败---",e);
+            logger.error("误点检测推送接口出错---",e);
         }
         return null;
     }
@@ -324,12 +343,6 @@ public class AutomaticSch {
                 }
             }
             outEntrance.Znddjk(m);//测试推送
-            if (i == list.size()){
-                list.add(sj);
-                ZnddThread.ZNDDTYPEMAP.put(st,list);//存记录
-                outEntrance.Znddjk(m);//推送
-            }
-            return;
         }else {
             list.add(sj);
             ZnddThread.ZNDDTYPEMAP.put(st,list);//存记录
 package com.bsth.data.zndd;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.data.adjg.domain.LargeGap;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.BASE64Decoder;
-
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
  
 /**
@@ -170,10 +163,10 @@ public class OutEntrance {
  
  
         base=base.replaceAll("data:image/png;base64,","");
-        BASE64Decoder decoder =  new BASE64Decoder();
+        Base64.Decoder decoder =  Base64.getDecoder();
         byte[] imageByte = null;
         try{
-            imageByte = decoder.decodeBuffer(base);
+            imageByte = decoder.decode(base);
             for (int i = 0; i < imageByte.length; ++i) {
                 if (imageByte[i] < 0) {// 调整异常数据
                     imageByte[i] += 256;
@@ -80,6 +80,10 @@ public class ZnddThread extends Thread{
                         automaticSch.drivresponse();
                         logger.info("设备重发执行完毕");
                     }
+                    if (zs.getType().equals("wd")){
+                        automaticSch.wd();
+                        logger.info("误点执行完毕");
+                    }
                 }
             }
         }catch (Exception e){
+package com.bsth.data.zndd;
+
+import org.apache.commons.io.IOUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.*;
+
+@Component
+public class carMonitor {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static String url;
+    
+
+    public List<Map> carMonitor(String lineCode,String directions,String station) {
+
+        List<Map> list = new ArrayList<>(); //返回的接口数据
+        url = "http://58.34.52.130:9777/xxfb/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions+"&t=";
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+            HttpURLConnection con = (HttpURLConnection)new URL(url).openConnection();
+            con.setDoInput(true);
+            con.setDoOutput(true);
+            con.setRequestMethod("GET");
+            con.setConnectTimeout(15000);
+            con.setReadTimeout(15000);
+            con.setRequestProperty("keep-alive", "true");
+            con.setRequestProperty("accept", "application/json");
+            con.setRequestProperty("content-type", "application/json;charset=UTF-8");
+
+            //System.out.println(con.getResponseCode());
+            //if (con.getResponseCode() == 200) {
+            in = con.getInputStream();
+            ByteArrayOutputStream bout = new ByteArrayOutputStream();
+            IOUtils.copy(in, bout);
+            //System.out.println(new String(bout.toByteArray()));
+            if (bout.toByteArray().length == 0){
+                return list;
+            }
+            Document doc = null;
+            doc = DocumentHelper.parseText(new String(bout.toByteArray(), Charset.forName("UTF-8")));
+            
+            // 获取根节点
+            Element rootElt = doc.getRootElement();
+            //获取到根节点的名称
+            //System.out.println("根节点：" + rootElt.getName());
+
+            Iterator iter = rootElt.elementIterator("cars");
+            while (iter.hasNext()) {
+                //获取到第二级节点元所有元素
+                Element sessionEle = (Element) iter.next();
+                //System.out.println("-第一级节点名称:  " + sessionEle.getName());
+                //获取到第二级节点指定的子节点
+                Iterator iterResponse = sessionEle.elementIterator("car");
+                while (iterResponse.hasNext()){
+                    Map map = new HashMap();
+                    //获取到所有第三级子节点所有元素
+                    Element responseEle = (Element) iterResponse.next();
+                    //System.out.println("--第二级节点名称:  "+ responseEle.getName());
+                    //获取到第三级节点指定的子节点
+                    map.put("terminal",responseEle.elementTextTrim("terminal"));
+                    map.put("stopdis",responseEle.elementTextTrim("stopdis"));
+                    map.put("distance",responseEle.elementTextTrim("distance"));
+                    map.put("time",responseEle.elementTextTrim("time"));
+                    map.put("sj",Gpstime(responseEle.elementTextTrim("time")));
+                    map.put("loc",responseEle.elementTextTrim("loc"));
+                    map.put("gpstime",responseEle.elementTextTrim("gpstime"));
+                    map.put("direction",responseEle.elementTextTrim("direction")); 
+                    list.add(map);
+                }
+            }
+            //System.out.println(maps.size());
+            } catch (Exception e) {
+              logger.error("信息发布接口报错了----", e);
+        }
+        
+        return list;
+    }
+
+    public String Gpstime(String duration){
+        Integer seconds = Integer.parseInt(duration);
+        Integer hours = seconds / 3600;
+        Integer minutes = (seconds % 3600) / 60;
+        Integer remainingSeconds = seconds % 60;
+        
+        if (hours!= 0){
+            return hours+"时"+ minutes+"分"+remainingSeconds+"秒";
+        }else  if (minutes != 0){
+            return minutes+"分"+remainingSeconds+"秒";
+        }else {
+            return remainingSeconds+"秒";
+        }
+    }
+    
+}
 package com.bsth.security;
  
 import com.bsth.common.Constants;
+import com.bsth.data.SystemParamCache;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
  
@@ -9,7 +11,7 @@ import org.springframework.stereotype.Component;
  * @author Hill
  */
 @Component
-public class SsoConfig {
+public class SsoConfig implements InitializingBean {
  
     /**
      * 是否开启sso登录
@@ -87,4 +89,10 @@ public class SsoConfig {
     public void setSsoAuthUrl(String ssoAuthUrl) {
         this.ssoAuthUrl = ssoAuthUrl;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        setSystemCode(SystemParamCache.getSsoSystemCode());
+        setSsoAuthUrl(SystemParamCache.getUrlHttpSsoAuth());
+    }
 }