潘钊 / bus_park_dispatch · Commits

Commit f5ce4e87fd312fd2c1ea7c51a563f274def87f55

Authored by 潘钊
1 parent 149eefc0

update...

Inline Side-by-side
Showing 5 changed files with 32 additions and 5 deletions
src/main/java/com/bsth/controller/UpstreamEntrance.java
  View file @f5ce4e8
... ... @@ -2,6 +2,7 @@ package com.bsth.controller;
2 2  
3 3 import com.alibaba.fastjson.JSON;
4 4 import com.bsth.data.attendance.dto.RemoteAttendaceDTO;
  5 +import com.bsth.data.attendance.entity.JsyAttendance;
5 6 import com.bsth.data.in_out.buffer.ElectricDataBuffer;
6 7 import com.bsth.data.in_out.entity.Electric;
7 8 import com.bsth.data.in_out.entity.RfidInOutDto;
... ... @@ -30,7 +31,7 @@ public class UpstreamEntrance {
30 31 */
31 32 @RequestMapping(value = "attendace", method = RequestMethod.POST)
32 33 public void attendace(@RequestBody RemoteAttendaceDTO attendace){
33   - SignalAndAttConsumeQueue.put(attendace);
  34 + SignalAndAttConsumeQueue.put(JsyAttendance.getInstance(attendace));
34 35 }
35 36  
36 37 /**
... ...
src/main/java/com/bsth/data/in_out/RealInoutHandler.java
  View file @f5ce4e8
... ... @@ -125,8 +125,8 @@ public class RealInoutHandler {
125 125 }
126 126  
127 127 private void addPlanFiled(CarInOutEntity cio, ScheduleInOut sch) {
128   - if (null == sch.getOutTimeRfid())
129   - sch.setOutTimeRfid(cio.getT());
  128 + /*if (null == sch.getOutTimeRfid())
  129 + sch.setOutTimeRfid(cio.getT());*/
130 130 //计划时间
131 131 cio.setPt(sch.getDfsjT());
132 132 cio.setLineCode(sch.getLineCode());
... ...
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
  View file @f5ce4e8
... ... @@ -231,6 +231,13 @@ public class ScheduleServiceImpl implements ScheduleService {
231 231  
232 232 //班次设置签到时间
233 233 ScheduleInOut sio = ScheduleDataBuffer.findById(id);
  234 +
  235 + //已经报到了
  236 + if(null != sio && null != sio.getAttSjTime()){
  237 + rs.put("status", ResponseCode.ERROR);
  238 + rs.put("msg", "操作失败，班次已签到！");
  239 + return rs;
  240 + }
234 241 sio.setAttSjTime(time);
235 242  
236 243 //处理掉异常
... ... @@ -262,6 +269,12 @@ public class ScheduleServiceImpl implements ScheduleService {
262 269  
263 270 //班次设置RFID出场时间
264 271 ScheduleInOut sio = ScheduleDataBuffer.findById(id);
  272 + if(null != sio && null != sio.getOutTimeRfid()){
  273 + rs.put("status", ResponseCode.ERROR);
  274 + rs.put("msg", "操作失败，班次状态已出场！");
  275 + return rs;
  276 + }
  277 +
265 278 sio.setOutTimeRfid(time);
266 279 sio.setCcTimeUser(SecurityUtils.getCurrentUser().getUserName());
267 280  
... ...
src/main/resources/static/js/_websocket.js
  View file @f5ce4e8
... ... @@ -53,6 +53,9 @@ var gb_websocket = (function () {
53 53 carOut: carOutFun,
54 54 abnormal_out: function (msg) {
55 55 gb_o_s_ws_handler.out(msg);
  56 + },
  57 + abnormal_att: function (msg) {
  58 + gb_o_s_ws_handler.attendace(msg);
56 59 }
57 60 };
58 61  
... ...
src/main/resources/static/pages/abnormal/js/o_s_websocket.js
  View file @f5ce4e8
... ... @@ -6,10 +6,20 @@ var gb_o_s_ws_handler = (function () {
6 6  
7 7 //班次出场
8 8 var out = function (msg) {
9   - console.log('gb_o_s_ws_handler', msg);
  9 + //console.log('gb_o_s_ws_handler', msg);
  10 + gb_os_card.update(msg['sio']);
  11 + gb_o_s_abnormal.handle(msg['ae']);
  12 + };
  13 +
  14 + //考勤
  15 + var attendace = function (msg) {
  16 + console.log('attendace,attendace', msg);
  17 + gb_os_card.update(msg['sio']);
  18 + gb_o_s_abnormal.handle(msg['ae']);
10 19 };
11 20  
12 21 return {
13   - out: out
  22 + out: out,
  23 + attendace: attendace
14 24 };
15 25 })();
16 26 \ No newline at end of file
... ...