一件报警与智能调度推送优化

ljq
1 parent 077bf7cd
Showing 6 changed files with 48 additions and 250 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.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/entity/realcontrol/ScheduleRealInfo.java
@@ -135,8 +135,6 @@ public class PilotReport {
             }
             if (d80.getSchId() != null){
                 sch = dayOfSchedule.get(d80.getSchId());
-                Long nextschid = dayOfSchedule.nextByLp(sch).getId();
-                d80.setNextschId(nextschid);
             }
             String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
             url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm +"&requestCode=" +d80.getData().getRequestCode()
@@ -154,6 +152,10 @@ public class PilotReport {
             }else {
                 logger.info("报警请求失败="+ jsonObject.get("msg"));
             }
+            if (d80.getSchId() != null && dayOfSchedule.nextByLp(sch) != null){
+                Long nextschid = dayOfSchedule.nextByLp(sch).getId();
+                d80.setNextschId(nextschid);
+            }
         }catch (Exception e){
             logger.info("报警请求异常",e);
         }
@@ -27,6 +27,7 @@ import com.bsth.service.zndd.ZnddLoggerService;
 import com.bsth.service.zndd.ZnddYuAnService;
 import com.bsth.util.DateUtils;
 import com.bsth.util.HttpClientUtils;
+import com.bsth.websocket.handler.SendUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +73,8 @@ public class AutomaticSch {
     @Autowired
     SchEditInfoService schEditInfoService;
  
-
+    @Autowired
+    SendUtils sendUtils;
     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");
@@ -498,7 +500,7 @@ public class AutomaticSch {
         splogger.setClZbh(m.get("clzbh").toString());
         znddLoggerService.save(splogger);
  
-        outEntrance.Znddjk(m);//推送
+        sendUtils.sendzndd(m);//推送
     }
  
  
@@ -16,14 +16,12 @@ import com.bsth.service.DKLInfoService;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.util.SignUtils;
 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.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
  
 import java.io.*;
@@ -33,7 +31,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -312,19 +309,34 @@ public class OutEntrance {
         Map rtn = new HashMap<>();
  
         try {
-            ObjectMapper mapper = new ObjectMapper();
-            //线调页面推送
-            sendUtils.sendzndd(m);
-
+            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType(m.get("nbbm").toString(),"normal");
+            automaticSch.ts(automaticSch.addStationPeople(sr.get(Integer.parseInt(m.get("num").toString())), m.get("type").toString(), 0L));//测试接口
             rtn.put("status",ResponseCode.SUCCESS);
         } catch (Exception e) {
-            rtn.put("status",ResponseCode.ERROR);
+            rtn.put("err",ResponseCode.ERROR);
             logger.info("智能调度推送----",e);
         }
  
         return rtn;
     }
  
+/*
+    //大客流消息测试接口
+    @RequestMapping(value="/znMeeage",method = RequestMethod.GET)
+    public Map znddMessagejk(@RequestParam Map m){
+        Map rtn = new HashMap<>();
+        try {
+            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType(m.get("nbbm").toString(),"normal");
+            ZnddMessage.saveSch(sr.get(Integer.parseInt(m.get("num").toString())));
+            rtn.put("status",ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            rtn.put("err",ResponseCode.ERROR);
+            logger.info("大客流消息推送----",e);
+        }
+        return rtn;
+    }
+*/
+
  
  
     /**
@@ -440,6 +452,7 @@ public class OutEntrance {
         return traffic.get("trafficStatus").toString();
     }
  
+/*
     @Scheduled(cron = "0 0 0 * * ?")
     public void clearImg(){
         try {
@@ -451,6 +464,7 @@ public class OutEntrance {
             e.printStackTrace();
         }
     }
+*/
  
     public static void delete(File folder) throws Exception{
         if(folder.isDirectory()) {
@@ -2,9 +2,7 @@ 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;
@@ -13,9 +11,10 @@ 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.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
  
 /**
  * 调度预案 发车间隔、误点、大间隔、满载、大客流
@@ -35,8 +34,6 @@ public class ZnddThread extends Thread{
     @Autowired
     StationRouteRepository stationRouteRepository;
     @Autowired
-    OutEntrance outEntrance;
-    @Autowired
     AutomaticSch automaticSch;
  
     @Autowired
@@ -83,120 +80,9 @@ public class ZnddThread extends Thread{
  
  
     }
-    //满载
-   /* 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());
-        }
-    }
  
 }
  
@@ -2,9 +2,7 @@ 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;
@@ -13,9 +11,7 @@ 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;
@@ -38,8 +34,6 @@ public class ZnddTwoThread extends Thread{
     @Autowired
     StationRouteRepository stationRouteRepository;
     @Autowired
-    OutEntrance outEntrance;
-    @Autowired
     AutomaticSch automaticSch;
  
     @Autowired
@@ -120,120 +114,5 @@ public class ZnddTwoThread extends Thread{
     }
  
  
-    //满载
-   /* 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());
-        }
-    }
-
 }
  
@@ -273,6 +273,21 @@ public class ScheduleRealInfo implements Cloneable{
 	@Transient
 	private int regionSwitchState;
  
+	/**
+	 *大客流进度 0下发驾驶员，1下发车辆，2，班次就位
+	 */
+	@Transient
+	private int messageDKL;
+
+	public int getMessageDKL() {
+		return messageDKL;
+	}
+
+	public void setMessageDKL(int messageDKL) {
+		this.messageDKL = messageDKL;
+	}
+
+
 	public Integer getLpChange() {
 		return lpChange;
 	}