update...

潘钊
1 parent 642c9016
Showing 13 changed files with 206 additions and 45 deletions
src/main/java/com/bsth/controller/UpstreamEntrance.java
src/main/java/com/bsth/data/abnormal/MainAbnormalClient.java
src/main/java/com/bsth/data/abnormal/handler/AttendanceHandler.java
src/main/java/com/bsth/data/attendance/AttendaceDataBuffer.java
src/main/java/com/bsth/data/attendance/RealAttendaceHandler.java
src/main/java/com/bsth/data/in_out/RealInoutHandler.java
src/main/java/com/bsth/data/msg_queue/SignalAndAttConsumeQueue.java
src/main/java/com/bsth/data/schedule/real/ScheduleDataBuffer.java
src/main/java/com/bsth/service/schedule/ScheduleService.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/js/_websocket.js
src/main/resources/static/pages/b_p_manager/b_p_main.html
 package com.bsth.controller;
 import com.alibaba.fastjson.JSON;
-import com.bsth.data.attendance.AttendaceDataBuffer;
 import com.bsth.data.attendance.dto.RemoteAttendaceDTO;
 import com.bsth.data.in_out.buffer.ElectricDataBuffer;
 import com.bsth.data.in_out.entity.Electric;
@@ -31,7 +30,7 @@ public class UpstreamEntrance {
      */
     @RequestMapping(value = "attendace", method = RequestMethod.POST)
     public void attendace(@RequestBody RemoteAttendaceDTO attendace){
-        AttendaceDataBuffer.put(attendace);
+        SignalAndAttConsumeQueue.put(attendace);
     }
     /**
@@ -3,6 +3,7 @@ package com.bsth.data.abnormal;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
 import com.bsth.data.abnormal.handler.AttendanceHandler;
 import com.bsth.data.abnormal.handler.InOutHandler;
+import com.bsth.data.attendance.entity.JsyAttendance;
 import com.bsth.data.schedule.dto.ScheduleInOut;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
@@ -96,4 +97,12 @@ public class MainAbnormalClient {
     public AbnormalEntity rfidOut(ScheduleInOut sio) {
         return inOutHandler.rfidOut(sio);
     }
+
+    /**
+     * 签到
+     * @param att
+     */
+    public AbnormalEntity qiandao(ScheduleInOut sio, JsyAttendance att) {
+        return attendanceHandler.qiandao(sio, att);
+    }
 }
 package com.bsth.data.abnormal.handler;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.attendance.entity.JsyAttendance;
 import com.bsth.data.schedule.dto.ScheduleInOut;
 import com.bsth.data.schedule.real.ScheduleDataBuffer;
 import com.bsth.security.util.SecurityUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.stereotype.Component;
 import java.util.concurrent.ConcurrentHashMap;
@@ -21,6 +24,8 @@ public class AttendanceHandler {
      */
     private static ConcurrentMap<Long, AbnormalEntity> schIdMap;
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
     static {
         schIdMap = new ConcurrentHashMap<>();
     }
@@ -83,4 +88,26 @@ public class AttendanceHandler {
         schIdMap.remove(ae.getSchId());
         return ae;
     }
+
+    /**
+     * 一体机签到
+     * @param att
+     * @return
+     */
+    public AbnormalEntity qiandao(ScheduleInOut sio, JsyAttendance att) {
+        AbnormalEntity ae = schIdMap.get(sio.getId());
+        if(null == ae)
+            return null;
+
+        Long t = att.getAttTime().getTime();
+
+
+        ae.setHandlerTime(t);
+        ae.setHandlerUser("system");
+        ae.setHandlerDes(fmtHHmm.print(t) + " 一体机签到");
+
+        sio.reCalcAnStatus();
+        schIdMap.remove(ae.getSchId());
+        return ae;
+    }
 }
 package com.bsth.data.attendance;
-import com.bsth.data.attendance.dto.RemoteAttendaceDTO;
-import com.bsth.data.attendance.entity.JsyAttendance;
-import com.bsth.data.msg_queue.SignalAndAttConsumeQueue;
-
-import java.util.LinkedList;
-
 /**
  * 查询一体机实时考勤数据缓存
  * Created by panzhao on 2017/9/4.
- */
+
 public class AttendaceDataBuffer {
@@ -27,3 +21,4 @@ public class AttendaceDataBuffer {
         SignalAndAttConsumeQueue.put(att);
     }
 }
+ */
 \ No newline at end of file
+package com.bsth.data.attendance;
+
+import com.bsth.data.abnormal.MainAbnormalClient;
+import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.attendance.entity.JsyAttendance;
+import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleDataBuffer;
+import com.bsth.websocket.handler.SendUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 实时签到退数据管理
+ * Created by panzhao on 2018/3/27.
+ */
+@Component
+public class RealAttendaceHandler {
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    MainAbnormalClient mainAbnormalClient;
+
+    /**
+     * 签到
+     */
+    public void attendace(JsyAttendance att){
+        //驾驶员的出场计划
+        ScheduleInOut sio = ScheduleDataBuffer.getCurrExecOut(att.getCompany(), att.getUserId(), att.getAt());
+
+        //报到时间不覆盖
+        if (sio.getAttSjTime() != null)
+            return;
+
+        sio.setAttSjTime(att.getAt());
+        //处理掉相关异常
+        AbnormalEntity ae = mainAbnormalClient.qiandao(sio, att);
+
+        //通知页面
+        sendUtils.scheduleAttendace(sio, ae);
+    }
+}
@@ -4,6 +4,7 @@ import com.bsth.data.abnormal.MainAbnormalClient;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
 import com.bsth.data.in_out.carpark.RealBerthManager;
 import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleComparator;
 import com.bsth.data.schedule.real.ScheduleDataBuffer;
 import com.bsth.entity.ac.CarInOutEntity;
 import com.bsth.websocket.handler.SendUtils;
@@ -14,7 +15,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.List;
 /**
  * 实时进出场数据处理程序
@@ -49,21 +53,22 @@ public class RealInoutHandler {
     /**
      * 进出场
+     *
      * @param cio
      */
     public void inOut(CarInOutEntity cio) {
         rfidSignalMaps.put(cio.getNbbm(), cio);
-        if(0 == cio.getCarType()){//公交车
+        if (0 == cio.getCarType()) {//公交车
             //获取对应的计划排班
             ScheduleInOut sch = ScheduleDataBuffer.get(cio);
             //rfid进出场时附加排班信息
-            if(sch != null && cio.getSignalType()==0)
+            if (sch != null && cio.getSignalType() == 0)
                 addPlanFiled(cio, sch);
             //入库 -只存实进和实出
-            if(cio.getType() == 2 || cio.getType() == 4)
+            if (cio.getType() == 2 || cio.getType() == 4)
                 psts.add(cio);
             if (cio.getType() == 2 || cio.getType() == 1)//待进 和 实进
@@ -78,13 +83,14 @@ public class RealInoutHandler {
     /**
      * 处理异常监管的班次信息
+     *
      * @param sio
      * @param cio
      */
-    public void attachRfidTime(ScheduleInOut sio, CarInOutEntity cio){
-        if(sio.getBcType().equals("out")){//出场班次
-            if(sio.getOutTimeRfid() == null ||
-                    (null != sio.getOutTimeRfid() && outSignalMatch(sio, cio))){
+    public void attachRfidTime(ScheduleInOut sio, CarInOutEntity cio) {
+        if (sio.getBcType().equals("out")) {//出场班次
+            if (sio.getOutTimeRfid() == null ||
+                    (null != sio.getOutTimeRfid() && outSignalMatch(sio, cio))) {
                 //是否是一个更合适的信号
                 sio.setOutTimeRfid(cio.getT());
@@ -99,26 +105,27 @@ public class RealInoutHandler {
     /**
      * 信号匹配，
+     *
      * @param sio
      * @param cio
      * @return true ： 是更合适的信号
      */
-    public boolean outSignalMatch(ScheduleInOut sio, CarInOutEntity cio){
+    public boolean outSignalMatch(ScheduleInOut sio, CarInOutEntity cio) {
         long diff1 = sio.getOutTimeRfid() - sio.getDfsjT();
         long diff2 = cio.getT() - sio.getDfsjT();
-        if(diff1 <= 0 && diff2 <= 0){//都在计划时间之前，用最靠近的信号
-            return diff1<diff2;
+        if (diff1 <= 0 && diff2 <= 0) {//都在计划时间之前，用最靠近的信号
+            return diff1 < diff2;
         }
-        if(Math.abs(diff1) > 1000 * 60 * 30
+        if (Math.abs(diff1) > 1000 * 60 * 30
                 && Math.abs(diff2) < 1000 * 60 * 5)
             return true;
         return false;
     }
     private void addPlanFiled(CarInOutEntity cio, ScheduleInOut sch) {
-        if(null == sch.getOutTimeRfid())
+        if (null == sch.getOutTimeRfid())
             sch.setOutTimeRfid(cio.getT());
         //计划时间
         cio.setPt(sch.getDfsjT());
@@ -132,10 +139,10 @@ public class RealInoutHandler {
         /**
          * 人车是否相符
          */
-        if(StringUtils.isNotEmpty(cio.getJsy())){
+        if (StringUtils.isNotEmpty(cio.getJsy())) {
             String sjGh = cio.getJsy().split("/")[0];
-            if(sch.getjGh().equals(sjGh)){
+            if (sch.getjGh().equals(sjGh)) {
                 cio.setPcMatch(true);
             }
         }
@@ -143,10 +150,65 @@ public class RealInoutHandler {
     /**
      * 重新匹配2辆车的计划和实际信号
+     *
      * @param oldName
      * @param nbbm
      */
-    public static void reCalcOutSignal(String oldName, String nbbm) {
+    public void reCalcOutSignal(String name1, String nbbm2) {
+        //获取车辆的出场计划
+        List<ScheduleInOut> arrayA = ScheduleDataBuffer.getByNbbm(name1), arrayB = ScheduleDataBuffer.getByNbbm(nbbm2);
+        reCalcOutSignal(arrayA);
+        reCalcOutSignal(arrayB);
+    }
+
+    /**
+     * 重新为计划匹配出场信号
+     *
+     * @param arrayA
+     */
+    private void reCalcOutSignal(List<ScheduleInOut> list) {
+        if (null == list || list.size() == 0)
+            return;
+
+        //清空班次上的时间
+        for (ScheduleInOut sio : list)
+            sio.setOutTimeRfid(null);
+
+        List<CarInOutEntity> signals = rfidSignalMaps.get(list.get(0).getNbbm());
+
+        if (null == signals || signals.size() == 0)
+            return;
+
+        Collections.sort(list, new ScheduleComparator());
+        Collections.sort(signals, new CioSignalsComp());
+
+        for (CarInOutEntity cio : signals) {
+
+            for (ScheduleInOut sio : list)
+                matchJh2Sj(cio, sio);
+        }
+    }
+
+    /**
+     * 匹配计划和实际
+     *
+     * @param cio
+     * @param sio
+     */
+    private void matchJh2Sj(CarInOutEntity cio, ScheduleInOut sio) {
+        if (null == sio.getOutTimeRfid()
+                || outSignalMatch(sio, cio))
+            sio.setOutTimeRfid(cio.getT());
     }
 }
+
+
+class CioSignalsComp implements Comparator<CarInOutEntity> {
+
+    @Override
+    public int compare(CarInOutEntity o1, CarInOutEntity o2) {
+        return (int) (o1.getT() - o2.getT());
+    }
+}
+
 package com.bsth.data.msg_queue;
+import com.bsth.data.attendance.RealAttendaceHandler;
 import com.bsth.data.attendance.entity.JsyAttendance;
 import com.bsth.data.in_out.RealInoutHandler;
 import com.bsth.entity.ac.CarInOutEntity;
-import com.bsth.service.schedule.ScheduleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -24,7 +24,7 @@ public class SignalAndAttConsumeQueue implements ApplicationContextAware {
     private static List<Class> clazzs;
     private static LinkedList<Object> linkedList;
-    static ScheduleService outScheduleService;
+    static RealAttendaceHandler realAttendaceHandler;
     static RealInoutHandler realInoutHandler;
     static ConsumeThread thread;
     static long t;
@@ -59,7 +59,7 @@ public class SignalAndAttConsumeQueue implements ApplicationContextAware {
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        outScheduleService = applicationContext.getBean(ScheduleService.class);
+        realAttendaceHandler = applicationContext.getBean(RealAttendaceHandler.class);
         realInoutHandler = applicationContext.getBean(RealInoutHandler.class);
     }
@@ -77,11 +77,9 @@ public class SignalAndAttConsumeQueue implements ApplicationContextAware {
                     obj = linkedList.poll();
                     if (null != obj) {
                         sleepFlag = false;
-                        //驾驶员签到
-                        if(obj instanceof JsyAttendance)
-                            outScheduleService.jsyReport((JsyAttendance) obj);
-                        //车辆进出场
-                        else if(obj instanceof CarInOutEntity)
+                        if(obj instanceof JsyAttendance)//驾驶员签到退
+                            realAttendaceHandler.attendace((JsyAttendance) obj);
+                        else if(obj instanceof CarInOutEntity)//车辆进出场
                             realInoutHandler.inOut((CarInOutEntity)obj);
                     } else {
                         Thread.sleep(500);
@@ -51,6 +51,9 @@ public class ScheduleDataBuffer implements CommandLineRunner {
     @Autowired
     InoutSchFixedRefreshThread fixedRefreshThread;
+    @Autowired
+    RealInoutHandler realInoutHandler;
+
     private final static String TYPE_OUT = "out";
     private final static String TYPE_IN = "in";
@@ -96,7 +99,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
         return cMultimap.get(nbbm);
     }
-    private static void putAll(List<ScheduleInOut> list) {
+    private void putAll(List<ScheduleInOut> list) {
         Long t = System.currentTimeMillis();
         for (ScheduleInOut sio : list) {
             sio.setUt(t);
@@ -111,7 +114,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
         p_c_mapps();
     }
-    public static void put(ScheduleInOut sio) {
+    public void put(ScheduleInOut sio) {
         try {
             if(null == sio.getUt())
                 sio.setUt(System.currentTimeMillis());
@@ -209,7 +212,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
         cMultimap = cMultimapCopy;
     }
-    private static void update(ScheduleInOut old, ScheduleInOut now) {
+    private void update(ScheduleInOut old, ScheduleInOut now) {
         old.setDfsjT(now.getDfsjT());
         old.setZdsjT(now.getZdsjT());
         old.setAttJhTime(now.getAttJhTime());
@@ -227,7 +230,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
             String oldName = old.getNbbm();
             old.setNbbm(now.getNbbm());
             //重新匹配车辆计划和实际出场
-            RealInoutHandler.reCalcOutSignal(oldName, now.getNbbm());
+            realInoutHandler.reCalcOutSignal(oldName, now.getNbbm());
         }
     }
@@ -335,7 +338,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
                 }
                 logger.info("同步进出场班数量 " + listCopy.size());
-                ScheduleDataBuffer.putAll(listCopy);
+                putAll(listCopy);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -21,9 +21,9 @@ public interface ScheduleService {
     /**
      * 驾驶员报到
      * @param att
-     */
-    void jsyReport(JsyAttendance att);
+    void jsyReport(JsyAttendance att);
+     */
     Map<String, Object> findAbnormalByLineArray(String idx);
     Map<String,Object> findSchByLpName(String lineCode, String lpName);
@@ -40,6 +40,9 @@ public class ScheduleServiceImpl implements ScheduleService {
     private static String dataUrl;
+    @Autowired
+    ScheduleDataBuffer scheduleDataBuffer;
+
     static {
         dataUrl = ConfigUtil.get("data.schedule.inout.url");
     }
@@ -67,7 +70,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * 驾驶员报到了哦....
      *
      * @param att
-     */
+
     @Override
     public void jsyReport(JsyAttendance att) {
         //驾驶员的出场计划
@@ -81,7 +84,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //通知页面
     }
-
+     */
     @Override
     public Map<String, Object> findAbnormalByLineArray(String idx) {
         Map<String, Object> rs = new HashMap<>();
@@ -159,7 +162,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             if("SUCCESS".equals(rs.get("status"))){
                 ScheduleInOut sio = JSON.toJavaObject(JSON.parseObject(rs.get("t").toString()), ScheduleInOut.class);
-                ScheduleDataBuffer.put(sio);
+                scheduleDataBuffer.put(sio);
                 //处理相关异常
                 List<AbnormalEntity> aes = mainAbnormalClient.dftz(sio.getId(), "调档");
@@ -193,7 +196,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                 JSONArray array = rs.getJSONArray("list");
                 int size = array.size();
                 for(int i=0; i < size;i ++){
-                    ScheduleDataBuffer.put(JSON.toJavaObject(array.getJSONObject(i), ScheduleInOut.class));
+                    scheduleDataBuffer.put(JSON.toJavaObject(array.getJSONObject(i), ScheduleInOut.class));
                 }
             }
@@ -90,4 +90,24 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 驾驶员报到
+	 * @param sio
+	 */
+	public void scheduleAttendace(ScheduleInOut sio, AbnormalEntity ae) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "abnormal_att");
+		map.put("sio", sio);
+		if(null != ae)
+			map.put("ae", ae);
+
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessage(mapper.writeValueAsString(map));
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -51,7 +51,9 @@ var gb_websocket = (function () {
     var msgHandle = {
         carIn: carInFun,
         carOut: carOutFun,
-        abnormal_out: gb_o_s_ws_handler.out
+        abnormal_out: function (msg) {
+            gb_o_s_ws_handler.out(msg);
+        }
     };
     //websocket回调
@@ -139,7 +139,7 @@
                 fixedExit = true;
                 clearTimeout(fixedTimer);
                 fixedTimer = null;
-                gb_inout_websocket.cancelCallback(socketInoutHandler);
+                gb_websocket.cancelCallback(socketInoutHandler);
             });
             function queryRealInfos(cb) {