update...

潘钊
1 parent 149eefc0
Showing 5 changed files with 32 additions and 5 deletions
src/main/java/com/bsth/controller/UpstreamEntrance.java
src/main/java/com/bsth/data/in_out/RealInoutHandler.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/resources/static/js/_websocket.js
src/main/resources/static/pages/abnormal/js/o_s_websocket.js
@@ -2,6 +2,7 @@ package com.bsth.controller;
 import com.alibaba.fastjson.JSON;
 import com.bsth.data.attendance.dto.RemoteAttendaceDTO;
+import com.bsth.data.attendance.entity.JsyAttendance;
 import com.bsth.data.in_out.buffer.ElectricDataBuffer;
 import com.bsth.data.in_out.entity.Electric;
 import com.bsth.data.in_out.entity.RfidInOutDto;
@@ -30,7 +31,7 @@ public class UpstreamEntrance {
      */
     @RequestMapping(value = "attendace", method = RequestMethod.POST)
     public void attendace(@RequestBody RemoteAttendaceDTO attendace){
-        SignalAndAttConsumeQueue.put(attendace);
+        SignalAndAttConsumeQueue.put(JsyAttendance.getInstance(attendace));
     }
     /**
@@ -125,8 +125,8 @@ public class RealInoutHandler {
     }
     private void addPlanFiled(CarInOutEntity cio, ScheduleInOut sch) {
-        if (null == sch.getOutTimeRfid())
-            sch.setOutTimeRfid(cio.getT());
+        /*if (null == sch.getOutTimeRfid())
+            sch.setOutTimeRfid(cio.getT());*/
         //计划时间
         cio.setPt(sch.getDfsjT());
         cio.setLineCode(sch.getLineCode());
@@ -231,6 +231,13 @@ public class ScheduleServiceImpl implements ScheduleService {
             //班次设置签到时间
             ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+
+            //已经报到了
+            if(null != sio && null != sio.getAttSjTime()){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "操作失败，班次已签到！");
+                return rs;
+            }
             sio.setAttSjTime(time);
             //处理掉异常
@@ -262,6 +269,12 @@ public class ScheduleServiceImpl implements ScheduleService {
             //班次设置RFID出场时间
             ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+            if(null != sio && null != sio.getOutTimeRfid()){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "操作失败，班次状态已出场！");
+                return rs;
+            }
+
             sio.setOutTimeRfid(time);
             sio.setCcTimeUser(SecurityUtils.getCurrentUser().getUserName());
@@ -53,6 +53,9 @@ var gb_websocket = (function () {
         carOut: carOutFun,
         abnormal_out: function (msg) {
             gb_o_s_ws_handler.out(msg);
+        },
+        abnormal_att: function (msg) {
+            gb_o_s_ws_handler.attendace(msg);
         }
     };
@@ -6,10 +6,20 @@ var gb_o_s_ws_handler = (function () {
     //班次出场
     var out = function (msg) {
-        console.log('gb_o_s_ws_handler', msg);
+        //console.log('gb_o_s_ws_handler', msg);
+        gb_os_card.update(msg['sio']);
+        gb_o_s_abnormal.handle(msg['ae']);
+    };
+
+    //考勤
+    var attendace = function (msg) {
+        console.log('attendace,attendace', msg);
+        gb_os_card.update(msg['sio']);
+        gb_o_s_abnormal.handle(msg['ae']);
     };
     return {
-        out: out
+        out: out,
+        attendace: attendace
     };
 })();
 \ No newline at end of file