潘钊 / bsth_control · Commits

Commit a433e0a9cac2af844e7789b9d2555a10e5910430

Authored by 廖磊
2 parents fde4f69e e65e5e3b
build: skipped

Merge branch 'minhang' of 

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Inline Side-by-side
Showing 51 changed files with 2674 additions and 257 deletions
@@ -264,6 +264,12 @@ @@ -264,6 +264,12 @@
264 <artifactId>ojdbc</artifactId> 264 <artifactId>ojdbc</artifactId>
265 <version>14</version> 265 <version>14</version>
266 </dependency> 266 </dependency>
  267 +
  268 + <dependency>
  269 + <groupId>org.apache.mina</groupId>
  270 + <artifactId>mina-core</artifactId>
  271 + <version>2.0.13</version>
  272 + </dependency>
267 </dependencies> 273 </dependencies>
268 274
269 <dependencyManagement> 275 <dependencyManagement>
src/main/java/com/bsth/controller/forms/ExportController.java
  View file @a433e0a
@@ -330,69 +330,22 @@ public class ExportController { @@ -330,69 +330,22 @@ public class ExportController {
330 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); 330 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
331 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 331 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
332 ReportUtils ee = new ReportUtils(); 332 ReportUtils ee = new ReportUtils();
333 - List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);  
334 Map<String, Object> map1 = new HashMap<String, Object>(); 333 Map<String, Object> map1 = new HashMap<String, Object>();
335 - List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();  
336 - String xlts="";  
337 - String zsgs="";  
338 - String jh="";  
339 - Float j=0f;  
340 - Float sj=0f;  
341 - Float qz=0f;  
342 - Float ccl=0f;  
343 - Float bcjh=0f;  
344 - String bcsj="";  
345 - Float bczxl=0f;  
346 - String gs="";  
347 - String zhgs="";  
348 334
349 - for (Turnoutrate l : turnoutrate) {  
350 - Map<String, Object> m = new HashMap<String, Object>();  
351 -  
352 - xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());  
353 - zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());  
354 - jh +=l.getXl()==""?0:String.valueOf(l.getXl());  
355 - sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());  
356 - ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());  
357 - bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());  
358 - bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());  
359 - bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());  
360 - gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());  
361 - zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());  
362 -  
363 -  
364 - m.put("rq", l.getRq());  
365 - m.put("gs", l.getGs());  
366 - m.put("zhgs", l.getZhgs());  
367 - m.put("xl", l.getXl());  
368 - m.put("cchjh", l.getCchjh());  
369 - m.put("cchsj", l.getCchsj());  
370 - m.put("cchqz", l.getCchqz());  
371 - m.put("chl", l.getChl());  
372 - m.put("bcjh", l.getBcjh());  
373 - m.put("bcsj", l.getBcsj());  
374 - m.put("bbzxl", l.getBbzxl());  
375 - m.put("sm", l.getSm());  
376 - resList.add(m);  
377 -  
378 -  
379 -  
380 - m=new HashMap<String,Object>();  
381 - m.put("total_xlts", xlts);  
382 - m.put("total_zhgs", zsgs);  
383 - m.put("total_jh", jh);  
384 - m.put("total_sj", sj);  
385 - m.put("total_qz", ccl);  
386 - m.put("total_ccl", bcjh);  
387 - m.put("total_bcjh",bcsj);  
388 - m.put("total_bcsj", bczxl);  
389 - m.put("total_bczxl", bczxl);  
390 - m.put("total_gs", zhgs);  
391 -  
392 -  
393 - map1 = m;  
394 - }  
395 - 335 + List<Map<String, Object>> resList = formsService.turnoutrate(map);
  336 + Map<String, Object> m = resList.get(resList.size() - 1);
  337 + map1.put("line", m.get("line"));
  338 + map1.put("jhcc", m.get("jhcc"));
  339 + map1.put("sjcc", m.get("sjcc"));
  340 + map1.put("jhbc", m.get("jhbc"));
  341 + map1.put("sjbc", m.get("sjbc"));
  342 + map1.put("ccl", m.get("ccl"));
  343 + map1.put("zxl", m.get("zxl"));
  344 + map1.put("qz", m.get("qz"));
  345 + map1.put("sm", m.get("sm"));
  346 +
  347 + resList.remove(m);
  348 +
396 try { 349 try {
397 listI.add(resList.iterator()); 350 listI.add(resList.iterator());
398 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 351 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
  View file @a433e0a
@@ -94,7 +94,7 @@ public class MCY_FormsController { @@ -94,7 +94,7 @@ public class MCY_FormsController {
94 94
95 // 营运线路出车率统计表 95 // 营运线路出车率统计表
96 @RequestMapping(value = "/turnoutrate", method = RequestMethod.POST) 96 @RequestMapping(value = "/turnoutrate", method = RequestMethod.POST)
97 - public List<Turnoutrate> turnoutrate(@RequestParam Map<String, Object> map) { 97 + public List<Map<String, Object>> turnoutrate(@RequestParam Map<String, Object> map) {
98 98
99 return formsService.turnoutrate(map); 99 return formsService.turnoutrate(map);
100 } 100 }
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
  View file @a433e0a
@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
14 public class GpsEntity { 14 public class GpsEntity {
15 15
16 /** 公司代码 */ 16 /** 公司代码 */
17 - private Integer companyCode; 17 + private Short companyCode;
18 18
19 /** 线路编码 */ 19 /** 线路编码 */
20 private String lineId; 20 private String lineId;
@@ -47,23 +47,20 @@ public class GpsEntity { @@ -47,23 +47,20 @@ public class GpsEntity {
47 private Float speed; 47 private Float speed;
48 48
49 /** 方向（角度） */ 49 /** 方向（角度） */
50 - private Float direction; 50 + private float direction;
51 51
52 /** 营运状态（ 0 营运 ，1 非营运， -1 无效） */ 52 /** 营运状态（ 0 营运 ，1 非营运， -1 无效） */
53 private Integer state; 53 private Integer state;
54 54
55 /** 上下行（0 上行 ， 1 下行 ， -1 无效） */ 55 /** 上下行（0 上行 ， 1 下行 ， -1 无效） */
56 - private Integer upDown; 56 + private Byte upDown;
57 57
58 /** 车辆内部编码 */ 58 /** 车辆内部编码 */
59 private String nbbm; 59 private String nbbm;
60 60
61 /** 预计到达终点时间 */ 61 /** 预计到达终点时间 */
62 private Float expectStopTime; 62 private Float expectStopTime;
63 -  
64 - /** 设备是否在线  
65 - private boolean online;  
66 - */ 63 +
67 /** 当前执行班次ID */ 64 /** 当前执行班次ID */
68 private Long schId; 65 private Long schId;
69 66
@@ -91,14 +88,6 @@ public class GpsEntity { @@ -91,14 +88,6 @@ public class GpsEntity {
91 /** gps是否有效 设备端发送的状态 */ 88 /** gps是否有效 设备端发送的状态 */
92 private int valid; 89 private int valid;
93 90
94 - public Integer getCompanyCode() {  
95 - return companyCode;  
96 - }  
97 -  
98 - public void setCompanyCode(Integer companyCode) {  
99 - this.companyCode = companyCode;  
100 - }  
101 -  
102 public String getDeviceId() { 91 public String getDeviceId() {
103 return deviceId; 92 return deviceId;
104 } 93 }
@@ -147,21 +136,6 @@ public class GpsEntity { @@ -147,21 +136,6 @@ public class GpsEntity {
147 this.timestamp = timestamp; 136 this.timestamp = timestamp;
148 } 137 }
149 138
150 - public Float getSpeed() {  
151 - return speed;  
152 - }  
153 -  
154 - public void setSpeed(Float speed) {  
155 - this.speed = speed;  
156 - }  
157 -  
158 - public Float getDirection() {  
159 - return direction;  
160 - }  
161 -  
162 - public void setDirection(Float direction) {  
163 - this.direction = direction;  
164 - }  
165 139
166 public Integer getState() { 140 public Integer getState() {
167 return state; 141 return state;
@@ -171,14 +145,6 @@ public class GpsEntity { @@ -171,14 +145,6 @@ public class GpsEntity {
171 this.state = state; 145 this.state = state;
172 } 146 }
173 147
174 - public Integer getUpDown() {  
175 - return upDown;  
176 - }  
177 -  
178 - public void setUpDown(Integer upDown) {  
179 - this.upDown = upDown;  
180 - }  
181 -  
182 public String getNbbm() { 148 public String getNbbm() {
183 return nbbm; 149 return nbbm;
184 } 150 }
@@ -291,4 +257,39 @@ public class GpsEntity { @@ -291,4 +257,39 @@ public class GpsEntity {
291 public void setValid(int valid) { 257 public void setValid(int valid) {
292 this.valid = valid; 258 this.valid = valid;
293 } 259 }
  260 +
  261 +
  262 +
  263 + public short getCompanyCode() {
  264 + return companyCode;
  265 + }
  266 +
  267 + public void setCompanyCode(short companyCode) {
  268 + this.companyCode = companyCode;
  269 + }
  270 +
  271 + public Byte getUpDown() {
  272 + return upDown;
  273 + }
  274 +
  275 + public void setUpDown(Byte upDown) {
  276 + this.upDown = upDown;
  277 + }
  278 +
  279 +
  280 + public float getDirection() {
  281 + return direction;
  282 + }
  283 +
  284 + public void setDirection(float direction) {
  285 + this.direction = direction;
  286 + }
  287 +
  288 + public Float getSpeed() {
  289 + return speed;
  290 + }
  291 +
  292 + public void setSpeed(Float speed) {
  293 + this.speed = speed;
  294 + }
294 } 295 }
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
  View file @a433e0a
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata; @@ -2,6 +2,7 @@ package com.bsth.data.gpsdata;
2 2
3 import com.bsth.data.BasicData; 3 import com.bsth.data.BasicData;
4 import com.bsth.data.forecast.ForecastRealServer; 4 import com.bsth.data.forecast.ForecastRealServer;
  5 +import com.bsth.data.gpsdata.client.ClientApp;
5 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread; 6 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
6 import com.bsth.data.gpsdata.thread.OfflineMonitorThread; 7 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
7 import com.bsth.data.schedule.DayOfSchedule; 8 import com.bsth.data.schedule.DayOfSchedule;
@@ -52,13 +53,18 @@ public class GpsRealData implements CommandLineRunner { @@ -52,13 +53,18 @@ public class GpsRealData implements CommandLineRunner {
52 lineCode2Devices = TreeMultimap.create(); 53 lineCode2Devices = TreeMultimap.create();
53 } 54 }
54 55
  56 + @Autowired
  57 + ClientApp clientApp;
55 @Override 58 @Override
56 public void run(String... arg0) throws Exception { 59 public void run(String... arg0) throws Exception {
57 logger.info("gpsDataLoader,20,3"); 60 logger.info("gpsDataLoader,20,3");
58 - //定时从网关获取GPS数据 61 + //定时从网关http形式获取GPS数据 --- 已弃用，现socket客户端接入数据
59 //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 3, TimeUnit.SECONDS); 62 //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 3, TimeUnit.SECONDS);
60 //定时扫描掉离线 63 //定时扫描掉离线
61 //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS); 64 //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
  65 +
  66 + //gps 客户端
  67 + //clientApp.init();
62 } 68 }
63 69
64 70
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
  View file @a433e0a
@@ -285,7 +285,7 @@ public class GeoCacheData { @@ -285,7 +285,7 @@ public class GeoCacheData {
285 * @param stationCode 285 * @param stationCode
286 * @return 286 * @return
287 */ 287 */
288 - public static boolean isEndStation(String lineId, Integer upDown, String stationCode) { 288 + public static boolean isEndStation(String lineId, Byte upDown, String stationCode) {
289 StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode); 289 StationRoute station = routeCodeMap.get(lineId + "_" + upDown + "_" + stationCode);
290 return station != null && station.getMark().equals("E"); 290 return station != null && station.getMark().equals("E");
291 } 291 }
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
  View file @a433e0a
@@ -4,12 +4,15 @@ import com.bsth.data.gpsdata.GpsEntity; @@ -4,12 +4,15 @@ import com.bsth.data.gpsdata.GpsEntity;
4 import com.bsth.data.gpsdata.GpsRealData; 4 import com.bsth.data.gpsdata.GpsRealData;
5 import com.bsth.data.gpsdata.arrival.handlers.*; 5 import com.bsth.data.gpsdata.arrival.handlers.*;
6 import com.bsth.data.gpsdata.arrival.utils.CircleQueue; 6 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
  7 +import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
  8 +import com.google.common.collect.ArrayListMultimap;
7 import org.slf4j.Logger; 9 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 10 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
11 13
12 import java.util.List; 14 import java.util.List;
  15 +import java.util.Set;
13 import java.util.concurrent.CountDownLatch; 16 import java.util.concurrent.CountDownLatch;
14 import java.util.concurrent.ExecutorService; 17 import java.util.concurrent.ExecutorService;
15 import java.util.concurrent.Executors; 18 import java.util.concurrent.Executors;
@@ -43,10 +46,22 @@ public class GpsRealAnalyse { @@ -43,10 +46,22 @@ public class GpsRealAnalyse {
43 static ExecutorService threadPool = Executors.newFixedThreadPool(50); 46 static ExecutorService threadPool = Executors.newFixedThreadPool(50);
44 47
45 public void analyse(List<GpsEntity> list) { 48 public void analyse(List<GpsEntity> list) {
46 - CountDownLatch count = new CountDownLatch(list.size()); 49 + //如果正在恢复数据
  50 + if (GpsDataRecovery.run)
  51 + return;
  52 + logger.info("analyse gps size: " + list.size());
  53 + //按车辆分组gps
  54 + ArrayListMultimap multimap = ArrayListMultimap.create();
  55 + for(GpsEntity gps : list){
  56 + multimap.put(gps.getNbbm(), gps);
  57 + }
  58 +
  59 + Set<String> ks = multimap.keySet();
  60 + CountDownLatch count = new CountDownLatch(ks.size());
47 61
48 - for(GpsEntity gps : list)  
49 - threadPool.execute(new SignalHandleThread(gps, count)); 62 + for(String nbbm : ks){
  63 + threadPool.execute(new SignalHandleThread(multimap.get(nbbm), count));
  64 + }
50 65
51 try { 66 try {
52 //等待子线程结束 67 //等待子线程结束
@@ -62,11 +77,11 @@ public class GpsRealAnalyse { @@ -62,11 +77,11 @@ public class GpsRealAnalyse {
62 77
63 public class SignalHandleThread implements Runnable { 78 public class SignalHandleThread implements Runnable {
64 79
65 - GpsEntity gps; 80 + List<GpsEntity> list;
66 CountDownLatch count; 81 CountDownLatch count;
67 82
68 - SignalHandleThread(GpsEntity gps, CountDownLatch count) {  
69 - this.gps = gps; 83 + SignalHandleThread(List<GpsEntity> gpsList, CountDownLatch count) {
  84 + this.list = gpsList;
70 this.count = count; 85 this.count = count;
71 } 86 }
72 87
@@ -74,31 +89,33 @@ public class GpsRealAnalyse { @@ -74,31 +89,33 @@ public class GpsRealAnalyse {
74 public void run() { 89 public void run() {
75 90
76 try { 91 try {
77 - //是否有任务  
78 - boolean task;  
79 - CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());  
80 - //掉线处理  
81 - offlineSignalHandle.handle(gps, prevs);  
82 - //状态处理  
83 - task = correctSignalHandle.handle(gps, prevs);  
84 - //场，站内外判断  
85 - stationInsideHandle.handle(gps, prevs);  
86 - //异常判定（越界/超速）  
87 - abnormalStateHandle.handle(gps, prevs);  
88 -  
89 - if(!task)  
90 - return; //无任务的，到这里就结束  
91 -  
92 - //反向处理  
93 - reverseSignalHandle.handle(gps, prevs);  
94 - //进出站动作处理  
95 - inOutStationSignalHandle.handle(gps, prevs);  
96 - GeoCacheData.putGps(gps);  
97 - 92 + for(GpsEntity gps : list){
  93 + //是否有任务
  94 + boolean task;
  95 + CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
  96 + //掉线处理
  97 + offlineSignalHandle.handle(gps, prevs);
  98 + //状态处理
  99 + task = correctSignalHandle.handle(gps, prevs);
  100 + //场，站内外判断
  101 + stationInsideHandle.handle(gps, prevs);
  102 + //异常判定（越界/超速）
  103 + abnormalStateHandle.handle(gps, prevs);
  104 +
  105 + if(!task)
  106 + return; //无任务的，到这里就结束
  107 +
  108 + //反向处理
  109 + reverseSignalHandle.handle(gps, prevs);
  110 + //进出站动作处理
  111 + inOutStationSignalHandle.handle(gps, prevs);
  112 + GeoCacheData.putGps(gps);
  113 + }
98 } catch (Exception e) { 114 } catch (Exception e) {
99 logger.error("", e); 115 logger.error("", e);
100 } finally { 116 } finally {
101 - count.countDown(); 117 + if(count != null)
  118 + count.countDown();
102 } 119 }
103 } 120 }
104 } 121 }
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
  View file @a433e0a
@@ -75,7 +75,7 @@ public abstract class SignalHandle { @@ -75,7 +75,7 @@ public abstract class SignalHandle {
75 Logger logger = LoggerFactory.getLogger(this.getClass()); 75 Logger logger = LoggerFactory.getLogger(this.getClass());
76 private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"); 76 private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
77 protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) { 77 protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
78 - int updown = Integer.parseInt(sch.getXlDir()); 78 + byte updown = Byte.parseByte(sch.getXlDir());
79 //gps 切换走向 79 //gps 切换走向
80 gps.setUpDown(updown); 80 gps.setUpDown(updown);
81 81
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
  View file @a433e0a
@@ -41,7 +41,7 @@ public class CorrectSignalHandle extends SignalHandle { @@ -41,7 +41,7 @@ public class CorrectSignalHandle extends SignalHandle {
41 else 41 else
42 sch = (ScheduleRealInfo) task; 42 sch = (ScheduleRealInfo) task;
43 43
44 - int updown = Integer.parseInt(sch.getXlDir()); 44 + byte updown = Byte.parseByte(sch.getXlDir());
45 //走向 45 //走向
46 if(gps.getUpDown() != updown){ 46 if(gps.getUpDown() != updown){
47 gps.setUpDown(updown); 47 gps.setUpDown(updown);
src/main/java/com/bsth/data/gpsdata/client/ClientApp.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client;
  2 +
  3 +import com.bsth.data.gpsdata.client.pd.codec.PdMessageCodecFactory;
  4 +import com.bsth.data.gpsdata.client.pd.handler.PdClientHandler;
  5 +import com.bsth.data.gpsdata.client.pd.protocol.Pd_31_0;
  6 +import com.bsth.data.gpsdata.client.pf.codec.PfMessageCodecFactory;
  7 +import com.bsth.data.gpsdata.client.pf.handler.PfClientHandler;
  8 +import com.bsth.util.ConfigUtil;
  9 +import org.apache.mina.core.future.ConnectFuture;
  10 +import org.apache.mina.core.future.WriteFuture;
  11 +import org.apache.mina.core.session.IdleStatus;
  12 +import org.apache.mina.core.session.IoSession;
  13 +import org.apache.mina.core.session.IoSessionConfig;
  14 +import org.apache.mina.filter.codec.ProtocolCodecFilter;
  15 +import org.apache.mina.filter.logging.LogLevel;
  16 +import org.apache.mina.filter.logging.LoggingFilter;
  17 +import org.apache.mina.transport.socket.nio.NioSocketConnector;
  18 +import org.springframework.beans.factory.annotation.Autowired;
  19 +import org.springframework.stereotype.Component;
  20 +
  21 +import java.net.InetSocketAddress;
  22 +import java.util.concurrent.ExecutorService;
  23 +import java.util.concurrent.Executors;
  24 +
  25 +/**
  26 + * Created by panzhao on 2017/5/4.
  27 + */
  28 +@Component
  29 +public class ClientApp {
  30 +
  31 + private static NioSocketConnector pdDataConnector;
  32 + private static NioSocketConnector pfDataConnector;
  33 + private static ExecutorService exec;
  34 +
  35 + @Autowired
  36 + private PdClientHandler pdClient;
  37 + @Autowired
  38 + private PfClientHandler pfClient;
  39 + @Autowired
  40 + GpsBeforeBuffer gpsBeforeBuffer;
  41 +
  42 + public static boolean dconnect(String device) {
  43 + boolean flag = false;
  44 + try {
  45 + ConnectFuture con = pdDataConnector.connect(new InetSocketAddress(ConfigUtil.get("gps.server.pd"), Integer.parseInt(ConfigUtil.get("gps.port.pd"))));
  46 + con.awaitUninterruptibly();
  47 + IoSession session = con.getSession();
  48 + session.setAttribute("deviceId", device);
  49 + com.bsth.data.gpsdata.client.pd.protocol.PdMessage msg = new com.bsth.data.gpsdata.client.pd.protocol.PdMessage();
  50 + Pd_31_0 body = new Pd_31_0();
  51 + body.setFunCode((short)0x15);
  52 + body.setLineId(0);
  53 + body.setDeviceId(device);
  54 + msg.setMessageBody(body);
  55 + msg.setVersion((short)1);
  56 + msg.setSerialNo((short)1);
  57 + msg.setCommandType((short)0x31);
  58 + byte[] bytes = msg.write();
  59 + WriteFuture write = session.write(bytes);
  60 + write.awaitUninterruptibly();
  61 + flag = true;
  62 + //SessionManager.getInstance().register(device, session);
  63 + } catch (Exception e) {
  64 + e.printStackTrace();
  65 + }
  66 + return flag;
  67 + }
  68 +
  69 + public static boolean fconnect(String device) {
  70 + boolean flag = false;
  71 + try {
  72 + ConnectFuture con = pfDataConnector.connect(new InetSocketAddress(ConfigUtil.get("gps.server.pf"), Integer.parseInt(ConfigUtil.get("gps.port.pf"))));
  73 + con.awaitUninterruptibly();
  74 + IoSession session = con.getSession();
  75 + session.setAttribute("deviceId", device);
  76 + flag = true;
  77 + } catch (Exception e) {
  78 + e.printStackTrace();
  79 + }
  80 + return flag;
  81 + }
  82 +
  83 + public void init() {
  84 + exec = Executors.newFixedThreadPool(4);
  85 + //sexec.scheduleAtFixedRate(new SessionChecker(), 1, 1, TimeUnit.MINUTES);
  86 + /*******************************浦东********************************/
  87 + pdDataConnector = new NioSocketConnector();
  88 +
  89 + LoggingFilter log = new LoggingFilter();
  90 + log.setMessageReceivedLogLevel(LogLevel.DEBUG);
  91 + pdDataConnector.getFilterChain().addLast("logger", log);
  92 +
  93 + pdDataConnector.getFilterChain().addLast("codec",
  94 + new ProtocolCodecFilter(new PdMessageCodecFactory()));
  95 +
  96 + IoSessionConfig config = pdDataConnector.getSessionConfig();
  97 +
  98 + config.setReadBufferSize(4096);
  99 + config.setWriteTimeout(10000);
  100 + config.setWriterIdleTime(60000);
  101 +
  102 + config.setIdleTime(IdleStatus.BOTH_IDLE, 60);
  103 +
  104 + pdDataConnector.setHandler(pdClient);
  105 +
  106 + dconnect(ConfigUtil.get("forward.device.name"));
  107 + /*******************************浦东转发********************************/
  108 + pfDataConnector = new NioSocketConnector();
  109 +
  110 + LoggingFilter log1 = new LoggingFilter();
  111 + log1.setMessageReceivedLogLevel(LogLevel.DEBUG);
  112 + pfDataConnector.getFilterChain().addLast("logger", log1);
  113 +
  114 + pfDataConnector.getFilterChain().addLast("codec",
  115 + new ProtocolCodecFilter(new PfMessageCodecFactory()));
  116 +
  117 + IoSessionConfig config1 = pfDataConnector.getSessionConfig();
  118 +
  119 + config1.setReadBufferSize(4096);
  120 + config1.setWriteTimeout(10000);
  121 + config1.setWriterIdleTime(60000);
  122 +
  123 + config1.setIdleTime(IdleStatus.BOTH_IDLE, 60);
  124 +
  125 + pfDataConnector.setHandler(pfClient);
  126 + fconnect(ConfigUtil.get("forward.device.name"));
  127 +
  128 +
  129 + gpsBeforeBuffer.init();
  130 + }
  131 +}
src/main/java/com/bsth/data/gpsdata/client/GpsBeforeBuffer.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client;
  2 +
  3 +import com.bsth.Application;
  4 +import com.bsth.data.BasicData;
  5 +import com.bsth.data.gpsdata.GpsEntity;
  6 +import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
  7 +import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
  8 +import org.apache.commons.lang3.StringUtils;
  9 +import org.springframework.beans.factory.annotation.Autowired;
  10 +import org.springframework.stereotype.Component;
  11 +
  12 +import java.util.ArrayList;
  13 +import java.util.LinkedList;
  14 +import java.util.List;
  15 +import java.util.concurrent.TimeUnit;
  16 +
  17 +/**
  18 + * 从 socket client 到 .. 的缓冲
  19 + * Created by panzhao on 2017/5/4.
  20 + */
  21 +@Component
  22 +public class GpsBeforeBuffer {
  23 +
  24 + static LinkedList<GpsEntity> linkedList = new LinkedList<>();
  25 +
  26 + @Autowired
  27 + GpsHandleThread gpsHandleThread;
  28 +
  29 + public void put(BasicInfo basicInfo){
  30 + //放弃补发数据
  31 + byte cacheData = getCacheState(basicInfo.getServiceState());
  32 + if(cacheData == 1)
  33 + return;
  34 + GpsEntity gps = new GpsEntity();
  35 +
  36 + gps.setDeviceId(basicInfo.getDeviceId());
  37 + gps.setTimestamp(basicInfo.getTimestamp());
  38 + gps.setLat(basicInfo.getLat());
  39 + gps.setLon(basicInfo.getLon());
  40 + gps.setDirection((float)basicInfo.getDirection() / 10);
  41 + gps.setValid(basicInfo.getGpsValid());
  42 + gps.setCompanyCode(basicInfo.getCompanyCode());
  43 + gps.setStopNo(basicInfo.getStopNo());
  44 + gps.setUpDown(basicInfo.getUpOrDown());
  45 + gps.setSpeed((float)basicInfo.getSpeedGps() / 10);
  46 + gps.setLineId(String.valueOf(basicInfo.getLineId()));
  47 + gps.setState((int) getService(basicInfo.getServiceState()));
  48 + //没有设备号
  49 + if (StringUtils.isBlank(gps.getDeviceId()))
  50 + return;
  51 +
  52 + String nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
  53 + if (StringUtils.isBlank(nbbm))
  54 + gps.setIncomplete(true);
  55 + else
  56 + gps.setNbbm(nbbm);
  57 +
  58 + linkedList.addLast(gps);
  59 + }
  60 +
  61 + public byte getCacheState(long serviceState) {
  62 + return (byte)(((serviceState & 0x00100000) == 0x00100000) ? 1 : 0);
  63 + }
  64 +
  65 + public void init(){
  66 + Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20, 2, TimeUnit.SECONDS);
  67 + }
  68 +
  69 + @Component
  70 + public static class GpsHandleThread extends Thread{
  71 +
  72 + List<GpsEntity> list;
  73 +
  74 + @Autowired
  75 + GpsRealAnalyse gpsRealAnalyse;
  76 +
  77 + @Override
  78 + public void run() {
  79 + list = new ArrayList<>(100);
  80 +
  81 + GpsEntity gps;
  82 + for(int i = 0; i < 2000; i ++){
  83 + gps = linkedList.poll();
  84 + if(gps == null)
  85 + break;
  86 + list.add(gps);
  87 + }
  88 +
  89 + gpsRealAnalyse.analyse(list);
  90 + }
  91 + }
  92 +
  93 + /**
  94 + * 获取运营状态
  95 + *
  96 + * @return -1无效 0运营 1未运营
  97 + */
  98 + public static byte getService(long serviceState) {
  99 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
  100 + return -1;
  101 + return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
  102 + }
  103 +}
src/main/java/com/bsth/data/gpsdata/client/common/ExceptionUtil.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.common;
  2 +
  3 +public class ExceptionUtil {
  4 +
  5 + public static String getTrace(Throwable e) {
  6 + StringBuilder sb = new StringBuilder();
  7 + sb.append(e.toString());
  8 + for (StackTraceElement ste : e.getStackTrace()) {
  9 + sb.append(ste).append("\r\n");
  10 + }
  11 + return sb.toString();
  12 + }
  13 +}
src/main/java/com/bsth/data/gpsdata/client/common/Protocol2BizUtil.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.common;
  2 +
  3 +//import com.bsth.data.gpsdata.socket_client_001.pd.protocol.BasicInfo;
  4 +//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.PfMessage;
  5 +//import com.bsth.data.gpsdata.socket_client_001.pf.protocol.Pf_1_0;
  6 +
  7 +import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
  8 +import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
  9 +import com.bsth.data.gpsdata.client.pf.protocol.Pf_1_0;
  10 +import org.slf4j.Logger;
  11 +import org.slf4j.LoggerFactory;
  12 +
  13 +public class Protocol2BizUtil {
  14 +
  15 + private final static Logger log = LoggerFactory.getLogger(Protocol2BizUtil.class);
  16 +
  17 + /**
  18 + * 从协议数据中获得基本数据
  19 + */
  20 + public static BasicInfo getBasicInfoFromMsg(PfMessage msg) {
  21 + if (msg == null) return null;
  22 + BasicInfo info = null;
  23 + if (msg.getCommandType() == 0x01) {
  24 + Pf_1_0 pf_1_0 = (Pf_1_0)msg.getMessageBody();
  25 + info = new BasicInfo();
  26 + info.setLineId(pf_1_0.getXldm());
  27 + info.setDeviceId(pf_1_0.getMtd());
  28 + info.setDriverEmpNo(Integer.parseInt(pf_1_0.getDriver().trim()));
  29 + info.setCarparkNo(pf_1_0.getTccbh());
  30 + info.setStopNo(pf_1_0.getZdbh());
  31 + double lon = pf_1_0.getLon()/1000000, lat = pf_1_0.getLat()/1000000;
  32 + info.setCarLon(((long)lon) * 1000000 + (long)((lon - (long)lon) * 600000));
  33 + info.setCarLat(((int)lat) * 1000000 + (int)((lat - (int)lat) * 600000));
  34 + info.setTimestamp(pf_1_0.getFssj().getTime());
  35 + info.setSpeedGps((short)pf_1_0.getSpeed());
  36 + info.setSpeedSensor((short)(pf_1_0.getSpeed()));
  37 + info.setDirection((short)(pf_1_0.getFx()));
  38 + info.setServiceState(0);
  39 + info.setService(pf_1_0.getYyzt() == 0 ? true : false);
  40 + info.setUpOrDown(pf_1_0.getSxxzt() == 0 ? true : false);
  41 +
  42 + info.setLon(Float.parseFloat(String.valueOf(lon)));
  43 + info.setLat(Float.parseFloat(String.valueOf(lat)));
  44 + }
  45 +
  46 + return info;
  47 + }
  48 +}
src/main/java/com/bsth/data/gpsdata/client/common/ThreadLocalDateUtil.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.common;
  2 +
  3 +import java.text.DateFormat;
  4 +import java.text.ParseException;
  5 +import java.text.SimpleDateFormat;
  6 +import java.util.Date;
  7 +
  8 +public class ThreadLocalDateUtil {
  9 + private static final String date_format = "yyyyMMddHHmmss";
  10 + private static ThreadLocal<DateFormat> threadLocal = new ThreadLocal<DateFormat>();
  11 +
  12 + public static DateFormat getDateFormat()
  13 + {
  14 + DateFormat df = threadLocal.get();
  15 + if(df==null){
  16 + df = new SimpleDateFormat(date_format);
  17 + threadLocal.set(df);
  18 + }
  19 + return df;
  20 + }
  21 +
  22 + public static String formatDate(Date date) throws ParseException {
  23 + return getDateFormat().format(date);
  24 + }
  25 +
  26 + public static Date parse(String strDate) throws ParseException {
  27 + return getDateFormat().parse(strDate);
  28 + }
  29 +}
src/main/java/com/bsth/data/gpsdata/client/msg/IMessage.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.msg;
  2 +
  3 +public interface IMessage extends IMessageIO {
  4 +
  5 + public IMessageBody getMessageBody();
  6 +}
src/main/java/com/bsth/data/gpsdata/client/msg/IMessageBody.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.msg;
  2 +
  3 +public interface IMessageBody extends IMessageIO {
  4 +
  5 + public String getDeviceId();
  6 +
  7 + public long getTimestamp();
  8 +}
src/main/java/com/bsth/data/gpsdata/client/msg/IMessageIO.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.msg;
  2 +
  3 +public interface IMessageIO {
  4 +
  5 + public void read(byte[] bytes);
  6 +
  7 + public byte[] write();
  8 +}
src/main/java/com/bsth/data/gpsdata/client/pd/codec/MessageDecoder.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.codec;
  2 +
  3 +import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
  4 +import org.apache.mina.core.buffer.IoBuffer;
  5 +import org.apache.mina.core.session.IoSession;
  6 +import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
  7 +import org.apache.mina.filter.codec.ProtocolDecoderOutput;
  8 +
  9 +
  10 +public class MessageDecoder extends CumulativeProtocolDecoder {
  11 +
  12 + @Override
  13 + protected boolean doDecode(IoSession session, IoBuffer in,
  14 + ProtocolDecoderOutput out) throws Exception {
  15 + // TODO Auto-generated method stub
  16 + while (in.remaining() > 3) {
  17 + in.mark();
  18 + byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
  19 + int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
  20 + if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
  21 + if (in.remaining() > len) {
  22 + byte[] bytes = new byte[len + 1];
  23 + in.get(bytes);
  24 + PdMessage msg = new PdMessage();
  25 + msg.read(bytes);
  26 + out.write(msg);
  27 + /*if ("true".equals(ConfigUtil.getProperty("protocolup", "true"))) {
  28 + UpProtocolDataService.getInstance().write(new byte[]{ head1, head2, lenh, lenl });
  29 + UpProtocolDataService.getInstance().write(bytes);
  30 + }*/
  31 + } else {
  32 + in.reset();
  33 + return false;
  34 + }
  35 + }
  36 + }
  37 + return false;
  38 + }
  39 +
  40 + /*private static String toHexString(byte[] bytes) {
  41 + StringBuilder sb = new StringBuilder();
  42 + for (byte b : bytes) {
  43 + sb.append(Integer.toHexString(b & 0xff) + "|");
  44 + }
  45 + return sb.toString();
  46 + }*/
  47 +}
src/main/java/com/bsth/data/gpsdata/client/pd/codec/MessageEncoder.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.codec;
  2 +
  3 +import org.apache.mina.core.buffer.IoBuffer;
  4 +import org.apache.mina.core.session.IoSession;
  5 +import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
  6 +import org.apache.mina.filter.codec.ProtocolEncoderOutput;
  7 +
  8 +
  9 +public class MessageEncoder extends ProtocolEncoderAdapter {
  10 +
  11 + @Override
  12 + public void encode(IoSession session, Object message,
  13 + ProtocolEncoderOutput out) throws Exception {
  14 + // TODO Auto-generated method stub
  15 + IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
  16 + buf.put((byte[])message);
  17 + buf.flip();
  18 + out.write(buf);
  19 + /*if ("true".equals(ConfigUtil.getProperty("protocoldown", "true"))) {
  20 + DownProtocolDataService.getInstance().write((byte[])message);
  21 + }*/
  22 + }
  23 +
  24 +}
src/main/java/com/bsth/data/gpsdata/client/pd/codec/PdMessageCodecFactory.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.codec;
  2 +
  3 +import org.apache.mina.core.session.IoSession;
  4 +import org.apache.mina.filter.codec.ProtocolCodecFactory;
  5 +import org.apache.mina.filter.codec.ProtocolDecoder;
  6 +import org.apache.mina.filter.codec.ProtocolEncoder;
  7 +
  8 +public class PdMessageCodecFactory implements ProtocolCodecFactory {
  9 +
  10 + private ProtocolEncoder encoder;
  11 + private ProtocolDecoder decoder;
  12 +
  13 + public PdMessageCodecFactory() {
  14 + encoder = new MessageEncoder();
  15 + decoder = new MessageDecoder();
  16 + }
  17 +
  18 + @Override
  19 + public ProtocolEncoder getEncoder(IoSession session) throws Exception {
  20 + // TODO Auto-generated method stub
  21 + return encoder;
  22 + }
  23 +
  24 + @Override
  25 + public ProtocolDecoder getDecoder(IoSession session) throws Exception {
  26 + // TODO Auto-generated method stub
  27 + return decoder;
  28 + }
  29 +
  30 +}
src/main/java/com/bsth/data/gpsdata/client/pd/common/ConvertUtil.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.common;
  2 +
  3 +import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
  4 +import org.slf4j.Logger;
  5 +import org.slf4j.LoggerFactory;
  6 +
  7 +import java.text.ParseException;
  8 +import java.util.Arrays;
  9 +import java.util.Calendar;
  10 +import java.util.Date;
  11 +
  12 +
  13 +public class ConvertUtil {
  14 +
  15 + private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
  16 +
  17 + public static int bcd2int(byte[] bytes, int start, int len) {
  18 + if (len > 4 || len == 0)
  19 + throw new IllegalArgumentException("bcd2int 字节数不符合要求");
  20 + String temp = "";
  21 + for (int i = 0;i < len;i++) {
  22 + int val = bytes[start + i] & 0xff;
  23 + if (val < 10) temp += 0;
  24 + temp += Integer.toHexString(val);
  25 + }
  26 + return Integer.parseInt(temp);
  27 + }
  28 +
  29 + public static byte[] int2bcd(int val, int len) {
  30 + if (len > 4 || len == 0)
  31 + throw new IllegalArgumentException("int2bcd 字节数不符合要求");
  32 + byte[] result = new byte[len];
  33 + for (int i = len - 1;i > -1;i--) {
  34 + result[i] = (byte)Integer.parseInt(val%100 + "", 16);
  35 + val = val/100;
  36 + }
  37 + return result;
  38 + }
  39 +
  40 + public static long bcd2long(byte[] bytes, int start, int len) {
  41 + if (len > 8 || len == 0)
  42 + throw new IllegalArgumentException("bcd2long 字节数不符合要求");
  43 + String temp = "";
  44 + for (int i = 0;i < len;i++) {
  45 + int val = bytes[start + i] & 0xff;
  46 + if (val < 10) temp += 0;
  47 + temp += Integer.toHexString(val);
  48 + }
  49 + return Long.parseLong(temp);
  50 + }
  51 +
  52 + public static byte[] long2bcd(long val, int len) {
  53 + if (len > 8 || len == 0)
  54 + throw new IllegalArgumentException("long2bcd 字节数不符合要求");
  55 + byte[] result = new byte[len];
  56 + for (int i = len - 1;i > -1;i--) {
  57 + result[i] = (byte)Integer.parseInt(val%100 + "", 16);
  58 + val = val/100;
  59 + }
  60 + return result;
  61 + }
  62 +
  63 + public static String ascii2string(byte[] bytes, int start, int len) {
  64 + return new String(Arrays.copyOfRange(bytes, start, start + len));
  65 + }
  66 +
  67 + public static byte[] string2ascii(String val, int len) {
  68 + byte[] result = new byte[len];
  69 + byte[] bytes = val.getBytes();
  70 + if (bytes.length > len && len != 0)
  71 + throw new IllegalArgumentException("string2ascii 参数不符合要求");
  72 + if (len != 0)
  73 + for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
  74 + else return bytes;
  75 + return result;
  76 + }
  77 +
  78 + public static long bcd2timestamp(byte[] bytes, int start) {
  79 + String temp = "20";
  80 + for (int i = 0;i < 6;i++) {
  81 + int val = bytes[start + i] & 0xff;
  82 + if (val < 10) temp += 0;
  83 + temp += Integer.toHexString(val);
  84 + }
  85 + Date date = null;
  86 + try {
  87 + date = ThreadLocalDateUtil.parse(temp);
  88 + } catch (ParseException e) {
  89 + log.error("协议中时间数据异常：" + temp);
  90 + }
  91 + if (date != null) return date.getTime();
  92 + return -1;
  93 + }
  94 +
  95 + public static byte[] timestamp2bcd(long val) {
  96 + byte[] result = new byte[6];
  97 + Calendar c = Calendar.getInstance();
  98 + c.setTime(new Date(val));
  99 + result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
  100 + result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
  101 + result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
  102 + result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
  103 + result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
  104 + result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
  105 + return result;
  106 + }
  107 +
  108 + public static byte[] int2hex(int val, int len) {
  109 + if (len < 1)
  110 + throw new IllegalArgumentException("int2hex len 参数不符合要求");
  111 + byte[] result = new byte[len];
  112 + for (int i = 0;i < len;i++) {
  113 + result[len - 1 - i] = (byte)(val%100);
  114 + val = val/100;
  115 + }
  116 +
  117 + return result;
  118 + }
  119 +
  120 + public static int bytes2int(byte[] bytes, int start, int len) {
  121 + int val = 0;
  122 + for (int i = 0; i < len; i++) {
  123 + int shift = (len - 1 - i) * 8;
  124 + val += (bytes[start + i] & 0x0000FF) << shift;
  125 + }
  126 +
  127 + return val;
  128 + }
  129 +}
src/main/java/com/bsth/data/gpsdata/client/pd/handler/PdClientHandler.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.handler;
  2 +
  3 +import com.bsth.data.gpsdata.client.ClientApp;
  4 +import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
  5 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  6 +import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
  7 +import com.bsth.data.gpsdata.client.pd.protocol.Pd_41_0;
  8 +import com.bsth.data.gpsdata.client.pd.protocol.Pd_42_0;
  9 +import org.apache.mina.core.service.IoHandlerAdapter;
  10 +import org.apache.mina.core.session.IdleStatus;
  11 +import org.apache.mina.core.session.IoSession;
  12 +import org.apache.mina.transport.socket.SocketSessionConfig;
  13 +import org.slf4j.Logger;
  14 +import org.slf4j.LoggerFactory;
  15 +import org.springframework.beans.factory.annotation.Autowired;
  16 +import org.springframework.stereotype.Service;
  17 +
  18 +import java.io.IOException;
  19 +
  20 +
  21 +@Service
  22 +public class PdClientHandler extends IoHandlerAdapter{
  23 +
  24 + private final static Logger log = LoggerFactory.getLogger(PdClientHandler.class);
  25 +
  26 + @Autowired
  27 + GpsBeforeBuffer gpsBeforeBuffer;
  28 +
  29 + @Override
  30 + public void sessionCreated(IoSession session) throws Exception {
  31 + SocketSessionConfig cfg = (SocketSessionConfig) session.getConfig();
  32 + cfg.setSoLinger(0);
  33 + }
  34 +
  35 + @Override
  36 + public void sessionOpened(IoSession session) throws Exception {
  37 +
  38 + }
  39 +
  40 + @Override
  41 + public void sessionClosed(IoSession session) throws Exception {
  42 + String deviceId = (String)session.getAttribute("deviceId");
  43 + if (deviceId != null) {
  44 + //SessionManager.getInstance().unregister(deviceId);
  45 + log.info("连网关设备编号:" + deviceId + "断开连接");
  46 + log.warn(deviceId + "网关设备注销");
  47 +
  48 + ClientApp.dconnect(deviceId);
  49 + } else {
  50 + log.info("连网关设备编号:" + deviceId + "断开连接");
  51 + }
  52 + }
  53 +
  54 + @Override
  55 + public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
  56 + session.closeNow();
  57 + }
  58 +
  59 + @Override
  60 + public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
  61 + if (cause instanceof IOException) session.closeNow();
  62 + log.error("PdClientHandler异常：", cause);
  63 + }
  64 +
  65 + @Override
  66 + public void messageReceived(IoSession session, Object message) throws Exception {
  67 + PdMessage msg = (PdMessage)message;
  68 + IMessageBody body = msg.getMessageBody();
  69 + if (body != null) {
  70 + //String deviceId = body.getDeviceId();
  71 + if (0x31 == msg.getCommandType()) {
  72 + //IoSession regSession = SessionManager.getInstance().getSession(deviceId);
  73 + //if (regSession != null) regSession.closeNow();
  74 + //SessionManager.getInstance().register(deviceId, session);
  75 + log.debug("设备编号:" + body.getDeviceId() + "建立连接");
  76 + }
  77 + else if(0x41 == msg.getCommandType()){
  78 + Pd_41_0 pd41 = (Pd_41_0)msg.getMessageBody();
  79 + gpsBeforeBuffer.put(pd41.getInfo());
  80 + }
  81 + else if(0x42 == msg.getCommandType()){
  82 + Pd_42_0 pd42 = (Pd_42_0)msg.getMessageBody();
  83 + gpsBeforeBuffer.put(pd42.getInfo());
  84 + }
  85 + }
  86 + }
  87 +
  88 + @Override
  89 + public void messageSent(IoSession session, Object message) throws Exception {
  90 +
  91 + }
  92 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/BasicInfo.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
  5 +
  6 +import java.nio.ByteBuffer;
  7 +import java.util.Date;
  8 +
  9 +
  10 +public class BasicInfo {
  11 +
  12 + private int cityCode;
  13 + private short industryCode;
  14 + private short companyCode;
  15 + private String deviceId;
  16 + private int lineId;
  17 + private int driverEmpNo;
  18 + private short carparkSerialNo;
  19 + private String carparkNo;
  20 + private short stopSerialNo;
  21 + private String stopNo;
  22 + // 经度 bcd 5 0121245333表示经度为121度24.5333分
  23 + private long carLon;
  24 + // 维度
  25 + private int carLat;
  26 + private long timestamp;
  27 + // 速度（传感器）bcd 2 保留一位小数 km/h
  28 + private short speedSensor;
  29 + // 速度（gps）bcd 2 保留一位小数 km/h
  30 + private short speedGps;
  31 + // 方向 bcd 2 0-359.5 保留一位小数
  32 + private short direction;
  33 + // 车内温度 bcd 2 第一字节为符号 00为正 01为负 后一字节为温度
  34 + private short inTemp;
  35 + // 营运状态 hex 4高位在前
  36 + // 第一字节位 7 GPS有/无效|6 场外/内|5 起终点站外/内|4 上/下行|3 已知/未知|2站外/站内|1 营运/非营运|0 在线路上/不在
  37 + // 7=1时其它位无效|0=1时3,4,5无效 第二字节6,7无效|3=1时2,4无效 第二字节6,7无效
  38 + // 第二字节位 7 非/标杆点|6 非/中途校时点|5 点/熄火|4 实时/缓存数据|3 门开/关|2 预留|1 非/包车|0预留
  39 + // 1=1时 第一字节0-6无效 6,7无效
  40 + // 后两个字节保留
  41 + private long serviceState;
  42 + // 调控状态
  43 + private long controlState;
  44 + // 累计里程 km 保留两位小数
  45 + private int totalMiles;
  46 + // 水温
  47 + private byte waterTemp;
  48 + // 油耗 (第一个字节 + 第二个字节/10)升/百公里
  49 + private int oilConsumption;
  50 + // 发动机转速 100转/秒
  51 + private int engineSpeed;
  52 + private float lon;
  53 + private float lat;
  54 +
  55 + private boolean inOutStopFlag = false;
  56 +
  57 + public void read(byte[] bytes, int idx) {
  58 + // TODO Auto-generated method stub
  59 + ByteBuffer buf = ByteBuffer.wrap(bytes);
  60 + cityCode = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
  61 + industryCode = (short)(bytes[idx] & 0xff); idx++;
  62 + companyCode = (short)(bytes[idx] & 0xff); idx++;
  63 + deviceId = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
  64 + lineId = ConvertUtil.bcd2int(bytes, idx, 3); idx += 3;
  65 + driverEmpNo = ConvertUtil.bcd2int(bytes, idx, 4); idx +=4;
  66 + carparkSerialNo = (short)(bytes[idx] & 0xff); idx++;
  67 + carparkNo = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
  68 + stopSerialNo = (short)(bytes[idx] & 0xff); idx++;
  69 + stopNo = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
  70 + carLon = ConvertUtil.bcd2long(bytes, idx, 5); lon = (int)(carLon/1000000) + carLon%1000000/600000f; idx += 5;
  71 + carLat = ConvertUtil.bcd2int(bytes, idx, 4); lat = carLat/1000000 + carLat%1000000/600000f; idx += 4;
  72 + timestamp = ConvertUtil.bcd2timestamp(bytes, idx); idx += 6;
  73 + speedSensor = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
  74 + speedGps = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
  75 + direction = (short)(ConvertUtil.bcd2int(bytes, idx, 2)); idx += 2;
  76 + inTemp = (short)ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
  77 + serviceState = buf.getInt(idx) & 0xffffffff; idx += 4;
  78 + controlState = buf.getInt(idx) & 0xffffffff; idx += 4;
  79 + totalMiles = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
  80 + waterTemp = bytes[idx]; idx++;
  81 + oilConsumption = ConvertUtil.bcd2int(bytes, idx, 4); idx += 4;
  82 + engineSpeed = buf.getShort(idx) & 0xffff; idx += 2;
  83 + }
  84 +
  85 + public byte[] write() {
  86 + ByteBuffer buf = ByteBuffer.allocate(80);
  87 + buf.put(ConvertUtil.int2bcd(cityCode, 3));
  88 + buf.put((byte)industryCode);
  89 + buf.put((byte)companyCode);
  90 + buf.put(ConvertUtil.string2ascii(deviceId, 8));
  91 + buf.put(ConvertUtil.int2bcd(lineId, 3));
  92 + buf.put(ConvertUtil.int2bcd(driverEmpNo, 4));
  93 + buf.put((byte)carparkSerialNo);
  94 + buf.put(ConvertUtil.string2ascii(carparkNo, 8));
  95 + buf.put((byte)stopSerialNo);
  96 + buf.put(ConvertUtil.string2ascii(stopNo, 8));
  97 + buf.put(ConvertUtil.long2bcd(carLon, 5));
  98 + buf.put(ConvertUtil.long2bcd(carLat, 4));
  99 + buf.put(ConvertUtil.timestamp2bcd(timestamp));
  100 + buf.put(ConvertUtil.int2bcd(speedSensor, 2));
  101 + buf.put(ConvertUtil.int2bcd(speedGps, 2));
  102 + buf.put(ConvertUtil.int2bcd(direction, 2));
  103 + buf.put(ConvertUtil.int2bcd(inTemp, 2));
  104 + buf.putInt((int)serviceState);
  105 + buf.putInt((int)controlState);
  106 + buf.put(ConvertUtil.int2bcd(totalMiles, 4));
  107 + buf.put(waterTemp);
  108 + buf.put(ConvertUtil.int2bcd(oilConsumption, 2));
  109 + buf.putShort((short)engineSpeed);
  110 +
  111 + return buf.array();
  112 + }
  113 +
  114 + public String getDeviceId() {
  115 + // TODO Auto-generated method stub
  116 + return deviceId;
  117 + }
  118 +
  119 + public int getCityCode() {
  120 + return cityCode;
  121 + }
  122 +
  123 + public short getIndustryCode() {
  124 + return industryCode;
  125 + }
  126 +
  127 + public short getCompanyCode() {
  128 + return companyCode;
  129 + }
  130 +
  131 + public int getLineId() {
  132 + return lineId;
  133 + }
  134 +
  135 + public int getDriverEmpNo() {
  136 + return driverEmpNo;
  137 + }
  138 +
  139 + public short getCarparkSerialNo() {
  140 + return carparkSerialNo;
  141 + }
  142 +
  143 + public String getCarparkNo() {
  144 + return carparkNo;
  145 + }
  146 +
  147 + public short getStopSerialNo() {
  148 + return stopSerialNo;
  149 + }
  150 +
  151 + public String getStopNo() {
  152 + return stopNo;
  153 + }
  154 +
  155 + public long getCarLon() {
  156 + return carLon;
  157 + }
  158 +
  159 + public int getCarLat() {
  160 + return carLat;
  161 + }
  162 +
  163 + public long getTimestamp() {
  164 + return timestamp;
  165 + }
  166 +
  167 + public short getSpeedSensor() {
  168 + return speedSensor;
  169 + }
  170 +
  171 + public short getSpeedGps() {
  172 + return speedGps;
  173 + }
  174 +
  175 + public short getDirection() {
  176 + return direction;
  177 + }
  178 +
  179 + public short getInTemp() {
  180 + return inTemp;
  181 + }
  182 +
  183 + public long getServiceState() {
  184 + return serviceState;
  185 + }
  186 +
  187 + public long getControlState() {
  188 + return controlState;
  189 + }
  190 +
  191 + public int getTotalMiles() {
  192 + return totalMiles;
  193 + }
  194 +
  195 + public byte getWaterTemp() {
  196 + return waterTemp;
  197 + }
  198 +
  199 + public int getOilConsumption() {
  200 + return oilConsumption;
  201 + }
  202 +
  203 + public int getEngineSpeed() {
  204 + return engineSpeed;
  205 + }
  206 +
  207 + public float getLon() {
  208 + return lon;
  209 + }
  210 +
  211 + public void setLon(float lon) {
  212 + this.lon = lon;
  213 + }
  214 +
  215 + public float getLat() {
  216 + return lat;
  217 + }
  218 +
  219 + public void setLat(float lat) {
  220 + this.lat = lat;
  221 + }
  222 +
  223 + public void setStopNo(String stopNo) {
  224 + this.stopNo = stopNo;
  225 + }
  226 +
  227 + public byte getGpsValid() {
  228 + return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
  229 + }
  230 +
  231 + /**
  232 + * 获取车辆在场外/内
  233 + * @return -1无效 0场外1场内
  234 + */
  235 + public byte getInOrOutCarpark() {
  236 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
  237 + || (serviceState & 0x01000000) == 0x01000000) return -1;
  238 + return (byte)(((serviceState & 0x40000000) == 0x40000000) ? 1 : 0);
  239 + }
  240 +
  241 + public void setInOrOutCarpark(boolean inOutFlag) {
  242 + if (inOutFlag) serviceState |= 0x40000000;
  243 + else serviceState &= 0xbfffffff;
  244 + }
  245 +
  246 + /**
  247 + * 获取车辆在起终点站外/内
  248 + * @return -1无效 0起终点站外1起终点站内
  249 + */
  250 + public byte getInOrOutStartEnd() {
  251 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
  252 + || (serviceState & 0x01000000) == 0x01000000) return -1;
  253 + return (byte)(((serviceState & 0x20000000) == 0x20000000) ? 1 : 0);
  254 + }
  255 +
  256 + /**
  257 + * 获取车辆线路上下行
  258 + * @return -1无效 0上行 1下行
  259 + */
  260 + public byte getUpOrDown() {
  261 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
  262 + || (serviceState & 0x01000000) == 0x01000000
  263 + || (serviceState & 0x08000000) == 0x08000000) return -1;
  264 + return (byte)(((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
  265 + }
  266 +
  267 + public void setUpOrDown(boolean upOrDown) {
  268 + if (!upOrDown) serviceState |= 0x10000000;
  269 + else serviceState &= 0xefffffff;
  270 + }
  271 +
  272 + /**
  273 + * 获取车辆在站外/内
  274 + * @return -1无效 0站外 1站内
  275 + */
  276 + public byte getInOrOutStop() {
  277 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
  278 + || (serviceState & 0x01000000) == 0x01000000
  279 + || (serviceState & 0x08000000) == 0x08000000) return -1;
  280 + return (byte)(((serviceState & 0x04000000) == 0x04000000) ? 1 : 0);
  281 + }
  282 +
  283 + public void setInOrOutStop(boolean isInOrOutStop) {
  284 + inOutStopFlag = true;
  285 + if (isInOrOutStop) serviceState |= 0x04000000;
  286 + else serviceState &= 0xfbffffff;
  287 + }
  288 +
  289 + /**
  290 + * 获取运营状态
  291 + * @return -1无效 0运营 1未运营
  292 + */
  293 + public byte getService() {
  294 + if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000) return -1;
  295 + return (byte)(((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
  296 + }
  297 +
  298 + public void setService(boolean service) {
  299 + if (!service) serviceState |= 0x02000000;
  300 + else serviceState &= 0xfdffffff;
  301 + }
  302 +
  303 + /**
  304 + * 获得车辆状态
  305 + * @return 0点火 1熄火
  306 + */
  307 + public byte getVehicleState() {
  308 + return (byte)(((serviceState & 0x00200000) == 0x00200000) ? 1 : 0);
  309 + }
  310 +
  311 + public void setInOutStopFlag(boolean inOutStopFlag) {
  312 + this.inOutStopFlag = inOutStopFlag;
  313 + }
  314 +
  315 + public boolean getInOutStopFlag() {
  316 + return inOutStopFlag;
  317 + }
  318 +
  319 + public String toString() {
  320 + Date d = new Date();d.setTime(timestamp);
  321 + StringBuilder sb = new StringBuilder();
  322 + sb.append("城市代码：").append(cityCode)
  323 + .append("行业代码：").append(industryCode)
  324 + .append("公司代码：").append(companyCode)
  325 + .append("设备号：").append(deviceId)
  326 + .append("线路编号：").append(lineId)
  327 + .append("驾驶员工号：").append(driverEmpNo)
  328 + .append("停车场序列号：").append(carparkSerialNo)
  329 + .append("停车场编号：").append(carparkNo)
  330 + .append("站点序列号").append(stopSerialNo)
  331 + .append("站点编号：").append(stopNo)
  332 + .append("经度：").append(carLon)
  333 + .append("维度：").append(carLat)
  334 + .append("时间戳：").append(d)
  335 + .append("速度（传感器）：").append(speedSensor)
  336 + .append("速度（gps）").append(speedGps)
  337 + .append("方向：").append(direction)
  338 + .append("车内温度：").append(inTemp)
  339 + .append("营运状态：").append(serviceState)
  340 + .append("调控状态：").append(controlState)
  341 + .append("总里程：").append(totalMiles)
  342 + .append("水温：").append(waterTemp)
  343 + .append("油耗：").append(oilConsumption)
  344 + .append("发动机速度：").append(engineSpeed);
  345 +
  346 + return sb.toString();
  347 + }
  348 + /* ----------------------------------------------------- */
  349 +
  350 + public void setCityCode(int cityCode) {
  351 + this.cityCode = cityCode;
  352 + }
  353 +
  354 + public void setIndustryCode(short industryCode) {
  355 + this.industryCode = industryCode;
  356 + }
  357 +
  358 + public void setCompanyCode(short companyCode) {
  359 + this.companyCode = companyCode;
  360 + }
  361 +
  362 + public void setDeviceId(String deviceId) {
  363 + this.deviceId = deviceId;
  364 + }
  365 +
  366 + public void setLineId(int lineId) {
  367 + this.lineId = lineId;
  368 + }
  369 +
  370 + public void setDriverEmpNo(int driverEmpNo) {
  371 + this.driverEmpNo = driverEmpNo;
  372 + }
  373 +
  374 + public void setCarparkSerialNo(short carparkSerialNo) {
  375 + this.carparkSerialNo = carparkSerialNo;
  376 + }
  377 +
  378 + public void setCarparkNo(String carparkNo) {
  379 + this.carparkNo = carparkNo;
  380 + }
  381 +
  382 + public void setStopSerialNo(short stopSerialNo) {
  383 + this.stopSerialNo = stopSerialNo;
  384 + }
  385 +
  386 + public void setCarLon(long carLon) {
  387 + this.carLon = carLon;
  388 + }
  389 +
  390 + public void setCarLat(int carLat) {
  391 + this.carLat = carLat;
  392 + }
  393 +
  394 + public void setTimestamp(long timestamp) {
  395 + this.timestamp = timestamp;
  396 + }
  397 +
  398 + public void setSpeedSensor(short speedSensor) {
  399 + this.speedSensor = speedSensor;
  400 + }
  401 +
  402 + public void setSpeedGps(short speedGps) {
  403 + this.speedGps = speedGps;
  404 + }
  405 +
  406 + public void setDirection(short direction) {
  407 + this.direction = direction;
  408 + }
  409 +
  410 + public void setInTemp(short inTemp) {
  411 + this.inTemp = inTemp;
  412 + }
  413 +
  414 + public void setServiceState(long serviceState) {
  415 + this.serviceState = serviceState;
  416 + }
  417 +
  418 + public void setControlState(long controlState) {
  419 + this.controlState = controlState;
  420 + }
  421 +
  422 + public void setTotalMiles(int totalMiles) {
  423 + this.totalMiles = totalMiles;
  424 + }
  425 +
  426 + public void setWaterTemp(byte waterTemp) {
  427 + this.waterTemp = waterTemp;
  428 + }
  429 +
  430 + public void setOilConsumption(int oilConsumption) {
  431 + this.oilConsumption = oilConsumption;
  432 + }
  433 +
  434 + public void setEngineSpeed(int engineSpeed) {
  435 + this.engineSpeed = engineSpeed;
  436 + }
  437 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/PdFactory.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  5 +
  6 +public class PdFactory {
  7 +
  8 + public static IMessageBody create(int commandType, byte[] data) {
  9 + String pkgName = PdFactory.class.getPackage().getName();
  10 + IMessageBody body = null;
  11 + try {
  12 + Class<?> cls = Class.forName(pkgName + ".Pd_" + Integer.toHexString(commandType).toUpperCase() + "_0");
  13 + body = (IMessageBody)cls.newInstance();
  14 + body.read(data);
  15 + } catch (ClassNotFoundException e) {
  16 + // TODO Auto-generated catch block
  17 + //e.printStackTrace();
  18 + } catch (InstantiationException e) {
  19 + // TODO Auto-generated catch block
  20 + e.printStackTrace();
  21 + } catch (IllegalAccessException e) {
  22 + // TODO Auto-generated catch block
  23 + e.printStackTrace();
  24 + }
  25 + return body;
  26 + }
  27 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/PdMessage.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.msg.IMessage;
  5 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  6 +
  7 +import java.nio.ByteBuffer;
  8 +import java.util.Arrays;
  9 +
  10 +public class PdMessage implements IMessage {
  11 +
  12 + private short version;
  13 + private short serialNo;
  14 + private short commandType;
  15 + private IMessageBody messageBody;
  16 + private byte checkSum;
  17 +
  18 + public short getVersion() {
  19 + return version;
  20 + }
  21 +
  22 + public void setVersion(short version) {
  23 + this.version = version;
  24 + }
  25 +
  26 + public short getSerialNo() {
  27 + return serialNo;
  28 + }
  29 +
  30 + public void setSerialNo(short serialNo) {
  31 + this.serialNo = serialNo;
  32 + }
  33 +
  34 + public short getCommandType() {
  35 + return commandType;
  36 + }
  37 +
  38 + public void setCommandType(short commandType) {
  39 + this.commandType = commandType;
  40 + }
  41 +
  42 + public IMessageBody getMessageBody() {
  43 + return messageBody;
  44 + }
  45 +
  46 + public void setMessageBody(IMessageBody messageBody) {
  47 + this.messageBody = messageBody;
  48 + }
  49 +
  50 + public byte getCheckSum() {
  51 + return checkSum;
  52 + }
  53 +
  54 + public void setCheckSum(byte checkSum) {
  55 + this.checkSum = checkSum;
  56 + }
  57 +
  58 + public void read(byte[] data) {
  59 + int idx = 0, len = data.length;
  60 + version = (short)(data[idx] & 0xff); idx++;
  61 + serialNo = (short)(data[idx] & 0xff); idx++;
  62 + commandType = (short)(data[idx] & 0xff); idx++;
  63 + byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
  64 + checkSum = data[len - 1];
  65 + byte sum = 0;
  66 + for (int i = 0;i < len - 1;i++) {
  67 + sum += data[i];
  68 + }
  69 + if (sum == checkSum) {
  70 + messageBody = PdFactory.create(commandType, temp);
  71 + }
  72 + }
  73 +
  74 + public byte[] write() {
  75 + byte[] bytes = messageBody.write();
  76 + ByteBuffer buf = ByteBuffer.allocate(bytes.length + 8);
  77 + buf.put(new byte[] { (byte)0xfa, (byte)0xf5 });
  78 + buf.putShort((short)(bytes.length + 3));
  79 + buf.put((byte)version);
  80 + buf.put((byte)serialNo);
  81 + buf.put((byte)commandType);
  82 + buf.put(bytes);
  83 + checkSum = 0;
  84 + checkSum += (byte)version;
  85 + checkSum += (byte)serialNo;
  86 + checkSum += (byte)commandType;
  87 + for (byte b : bytes) {
  88 + checkSum += b;
  89 + }
  90 + buf.put(checkSum);
  91 + return buf.array();
  92 + }
  93 +
  94 + public String toString() {
  95 + StringBuilder sb = new StringBuilder();
  96 + sb.append("报文版本号：").append(version)
  97 + .append("报文序列号：").append(serialNo)
  98 + .append("报文命令字：0x").append(Integer.toHexString(commandType))
  99 + .append("报文主体：(").append(messageBody).append(")")
  100 + .append("报文校验和：").append(checkSum);
  101 +
  102 + return sb.toString();
  103 + }
  104 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/Pd_31_0.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  5 +import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
  6 +
  7 +import java.nio.ByteBuffer;
  8 +import java.util.Date;
  9 +
  10 +
  11 +public class Pd_31_0 implements IMessageBody {
  12 +
  13 + // bcd 1
  14 + private short funCode;
  15 + // bcd 3
  16 + private int lineId;
  17 + // ascii 8
  18 + private String deviceId;
  19 + // bcd 6 yyMMddhhmmss
  20 + private long timestamp;
  21 + // hex 8
  22 + private String reserved;
  23 +
  24 + @Override
  25 + public void read(byte[] bytes) {
  26 + // TODO Auto-generated method stub
  27 + int idx = 0;
  28 + funCode = (short)(bytes[idx] & 0xff);idx++;
  29 + lineId = ConvertUtil.bcd2int(bytes, idx, 3);idx += 3;
  30 + deviceId = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
  31 + timestamp = ConvertUtil.bcd2timestamp(bytes, idx);idx += 6;
  32 + reserved = ConvertUtil.ascii2string(bytes, idx, 8);idx += 8;
  33 + }
  34 +
  35 + @Override
  36 + public byte[] write() {
  37 + // TODO Auto-generated method stub
  38 + ByteBuffer buf = ByteBuffer.allocate(26);
  39 + buf.put((byte)funCode);
  40 + buf.put(ConvertUtil.int2bcd(lineId, 3));
  41 + buf.put(deviceId.getBytes());
  42 + buf.put(ConvertUtil.timestamp2bcd(timestamp));
  43 + buf.put(new byte[]{0,0,0,0,0,0,0,0});
  44 + return buf.array();
  45 + }
  46 +
  47 + public short getFunCode() {
  48 + return funCode;
  49 + }
  50 +
  51 + public int getLineId() {
  52 + return lineId;
  53 + }
  54 +
  55 + public String getDeviceId() {
  56 + return deviceId;
  57 + }
  58 +
  59 + public long getTimestamp() {
  60 + return timestamp;
  61 + }
  62 +
  63 + public String getReserved() {
  64 + return reserved;
  65 + }
  66 +
  67 + public void setFunCode(short funCode) {
  68 + this.funCode = funCode;
  69 + }
  70 +
  71 + public void setLineId(int lineId) {
  72 + this.lineId = lineId;
  73 + }
  74 +
  75 + public void setDeviceId(String deviceId) {
  76 + this.deviceId = deviceId;
  77 + }
  78 +
  79 + public void setTimeStamp(long timestamp) {
  80 + this.timestamp = timestamp;
  81 + }
  82 +
  83 + public void setReserved(String reserved) {
  84 + this.reserved = reserved;
  85 + }
  86 +
  87 + public String toString() {
  88 + Date d = new Date();
  89 + d.setTime(timestamp);
  90 + StringBuilder sb = new StringBuilder();
  91 + sb.append("功能号：").append(Integer.toHexString(funCode))
  92 + .append("线路编号：").append(lineId)
  93 + .append("设备编号：").append(deviceId)
  94 + .append("时间戳：").append(d);
  95 + return sb.toString();
  96 + }
  97 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/Pd_41_0.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  5 +import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
  6 +
  7 +import java.nio.ByteBuffer;
  8 +
  9 +
  10 +public class Pd_41_0 implements IMessageBody {
  11 +
  12 + private BasicInfo info;
  13 + private short leaveStopDis;
  14 +
  15 + public BasicInfo getInfo() {
  16 + return info;
  17 + }
  18 +
  19 + public void setInfo(BasicInfo info) {
  20 + this.info = info;
  21 + }
  22 +
  23 + public short getLeaveStopDis() {
  24 + return leaveStopDis;
  25 + }
  26 +
  27 + public void setLeaveStopDis(short leaveStopDis) {
  28 + this.leaveStopDis = leaveStopDis;
  29 + }
  30 +
  31 + @Override
  32 + public void read(byte[] bytes) {
  33 + // TODO Auto-generated method stub
  34 + int idx = 0;
  35 + info = new BasicInfo();
  36 + info.read(bytes, idx); idx += 80;
  37 + leaveStopDis = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
  38 + }
  39 +
  40 + @Override
  41 + public byte[] write() {
  42 + // TODO Auto-generated method stub
  43 + ByteBuffer buf = ByteBuffer.allocate(82);
  44 + buf.put(info.write());
  45 + buf.put(ConvertUtil.int2bcd(leaveStopDis, 2));
  46 +
  47 + return buf.array();
  48 + }
  49 +
  50 + @Override
  51 + public String getDeviceId() {
  52 + // TODO Auto-generated method stub
  53 + return info.getDeviceId();
  54 + }
  55 +
  56 + public String toString() {
  57 + StringBuilder sb = new StringBuilder();
  58 + sb.append("基本数据：").append(info.toString())
  59 + .append("离站距离：").append(leaveStopDis);
  60 +
  61 + return sb.toString();
  62 + }
  63 +
  64 + @Override
  65 + public long getTimestamp() {
  66 + // TODO Auto-generated method stub
  67 + return info.getTimestamp();
  68 + }
  69 +}
src/main/java/com/bsth/data/gpsdata/client/pd/protocol/Pd_42_0.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pd.protocol;
  2 +
  3 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  4 +import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
  5 +
  6 +import java.nio.ByteBuffer;
  7 +
  8 +public class Pd_42_0 implements IMessageBody {
  9 +
  10 + private BasicInfo info;
  11 + // 站间里程 保留两位小数 km
  12 + private short stopBetMiles;
  13 + private short frontDoorUp;
  14 + private short frontDoorDown;
  15 + private short backDoorUp;
  16 + private short backDoorDown;
  17 + // 本站留车人数
  18 + private int stay;
  19 + // 本站刷卡次数
  20 + private short cardCount;
  21 + // 本站刷卡金额
  22 + private int cardMoney;
  23 + // 免费刷卡次数
  24 + private short freeCardCount;
  25 + // 免费刷卡金额
  26 + private int freeCardMoney;
  27 + // 总刷卡次数
  28 + private int totalCardCount;
  29 + // 总数卡金额
  30 + private long totalCardMoney;
  31 + // 总免费刷卡次数
  32 + private int totalFreeCardCount;
  33 + // 总免费刷卡金额
  34 + private long totalFreeCardMoney;
  35 + // 客流站号
  36 + private short passengerStopNo;
  37 +
  38 + @Override
  39 + public void read(byte[] bytes) {
  40 + // TODO Auto-generated method stub
  41 + ByteBuffer buf = ByteBuffer.wrap(bytes);
  42 + int idx = 0;
  43 + info = new BasicInfo();
  44 + info.read(bytes, idx); idx += 80;
  45 + stopBetMiles = (short) ConvertUtil.bcd2int(bytes, idx, 2); idx += 2;
  46 + frontDoorUp = (short)(buf.get(idx) & 0xff); idx++;
  47 + frontDoorDown = (short)(buf.get(idx) & 0xff); idx++;
  48 + backDoorUp = (short)(buf.get(idx) & 0xff); idx++;
  49 + backDoorDown = (short)(buf.get(idx) & 0xff); idx++;
  50 + stay = buf.getShort(idx) & 0xffff; idx += 2;
  51 + cardCount = (short)(buf.get(idx) & 0xff); idx++;
  52 + cardMoney = buf.getShort(idx) & 0xffff; idx += 2;
  53 + freeCardCount = (short)(buf.get(idx) & 0xff); idx++;
  54 + freeCardMoney = buf.getShort(idx) & 0xffff; idx += 2;
  55 + totalCardCount = buf.getShort(idx) & 0xffff; idx += 2;
  56 + totalCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
  57 + totalFreeCardCount = buf.getShort(idx) & 0xffff; idx += 2;
  58 + totalFreeCardMoney = buf.getInt(idx) & 0xffffffffl; idx += 4;
  59 + passengerStopNo = (short)(buf.get(idx) & 0xff); idx++;
  60 + }
  61 +
  62 + @Override
  63 + public byte[] write() {
  64 + // TODO Auto-generated method stub
  65 + ByteBuffer buf = ByteBuffer.allocate(107);
  66 + buf.put(info.write());
  67 + buf.put(ConvertUtil.int2bcd(stopBetMiles, 2));
  68 + buf.put((byte)frontDoorUp);
  69 + buf.put((byte)frontDoorDown);
  70 + buf.put((byte)backDoorUp);
  71 + buf.put((byte)backDoorDown);
  72 + buf.putShort((short)stay);
  73 + buf.put((byte)cardCount);
  74 + buf.putShort((short)cardMoney);
  75 + buf.put((byte)freeCardCount);
  76 + buf.putShort((short)freeCardMoney);
  77 + buf.putShort((short)totalCardCount);
  78 + buf.putInt((int)totalCardMoney);
  79 + buf.putShort((short)totalFreeCardCount);
  80 + buf.putInt((int)totalFreeCardMoney);
  81 + buf.put((byte)passengerStopNo);
  82 +
  83 + return buf.array();
  84 + }
  85 +
  86 + @Override
  87 + public String getDeviceId() {
  88 + // TODO Auto-generated method stub
  89 + return info.getDeviceId();
  90 + }
  91 +
  92 + public BasicInfo getInfo() {
  93 + return info;
  94 + }
  95 +
  96 + public short getStopBetMiles() {
  97 + return stopBetMiles;
  98 + }
  99 +
  100 + public short getFrontDoorUp() {
  101 + return frontDoorUp;
  102 + }
  103 +
  104 + public short getFrontDoorDown() {
  105 + return frontDoorDown;
  106 + }
  107 +
  108 + public short getBackDoorUp() {
  109 + return backDoorUp;
  110 + }
  111 +
  112 + public short getBackDoorDown() {
  113 + return backDoorDown;
  114 + }
  115 +
  116 + public int getStay() {
  117 + return stay;
  118 + }
  119 +
  120 + public short getCardCount() {
  121 + return cardCount;
  122 + }
  123 +
  124 + public int getCardMoney() {
  125 + return cardMoney;
  126 + }
  127 +
  128 + public short getFreeCardCount() {
  129 + return freeCardCount;
  130 + }
  131 +
  132 + public int getFreeCardMoney() {
  133 + return freeCardMoney;
  134 + }
  135 +
  136 + public int getTotalCardCount() {
  137 + return totalCardCount;
  138 + }
  139 +
  140 + public long getTotalCardMoney() {
  141 + return totalCardMoney;
  142 + }
  143 +
  144 + public int getTotalFreeCardCount() {
  145 + return totalFreeCardCount;
  146 + }
  147 +
  148 + public long getTotalFreeCardMoney() {
  149 + return totalFreeCardMoney;
  150 + }
  151 +
  152 + public short getPassengerStopNo() {
  153 + return passengerStopNo;
  154 + }
  155 +
  156 + public String toString() {
  157 + StringBuilder sb = new StringBuilder();
  158 + sb.append("基本数据：").append(info.toString())
  159 + .append("站间距离：").append(stopBetMiles)
  160 + .append("前门上客：").append(frontDoorUp)
  161 + .append("前门下客：").append(frontDoorDown)
  162 + .append("后门上客：").append(backDoorUp)
  163 + .append("后门下客：").append(backDoorDown)
  164 + .append("本站留车人数：").append(stay)
  165 + .append("本站刷卡次数：").append(cardCount)
  166 + .append("本站刷卡金额：").append(cardMoney)
  167 + .append("免费刷卡次数：").append(freeCardCount)
  168 + .append("免费刷卡金额：").append(freeCardMoney)
  169 + .append("总刷卡次数：").append(totalCardCount)
  170 + .append("总数卡金额：").append(totalCardMoney)
  171 + .append("总免费刷卡次数：").append(totalFreeCardCount)
  172 + .append("总免费刷卡金额：").append(totalFreeCardMoney)
  173 + .append("客流站号：").append(passengerStopNo);
  174 +
  175 + return sb.toString();
  176 + }
  177 +
  178 + @Override
  179 + public long getTimestamp() {
  180 + // TODO Auto-generated method stub
  181 + return info.getTimestamp();
  182 + }
  183 +}
src/main/java/com/bsth/data/gpsdata/client/pf/codec/MessageDecoder.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.codec;
  2 +
  3 +import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
  4 +import org.apache.mina.core.buffer.IoBuffer;
  5 +import org.apache.mina.core.session.IoSession;
  6 +import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
  7 +import org.apache.mina.filter.codec.ProtocolDecoderOutput;
  8 +
  9 +
  10 +public class MessageDecoder extends CumulativeProtocolDecoder {
  11 +
  12 + @Override
  13 + protected boolean doDecode(IoSession session, IoBuffer in,
  14 + ProtocolDecoderOutput out) throws Exception {
  15 + // TODO Auto-generated method stub
  16 + while (in.remaining() > 3) {
  17 + in.mark();
  18 + byte head1 = in.get(), head2 = in.get(), lenh = in.get(), lenl = in.get();
  19 + int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
  20 + if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
  21 + if (in.remaining() > len) {
  22 + byte[] bytes = new byte[len + 1];
  23 + in.get(bytes);
  24 + PfMessage msg = new PfMessage();
  25 + msg.read(bytes);
  26 + out.write(msg);
  27 + } else {
  28 + in.reset();
  29 + return false;
  30 + }
  31 + }
  32 + }
  33 + return false;
  34 + }
  35 +
  36 + /*private static String toHexString(byte[] bytes) {
  37 + StringBuilder sb = new StringBuilder();
  38 + for (byte b : bytes) {
  39 + sb.append(Integer.toHexString(b & 0xff) + "|");
  40 + }
  41 + return sb.toString();
  42 + }*/
  43 +}
src/main/java/com/bsth/data/gpsdata/client/pf/codec/MessageEncoder.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.codec;
  2 +
  3 +import org.apache.mina.core.buffer.IoBuffer;
  4 +import org.apache.mina.core.session.IoSession;
  5 +import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
  6 +import org.apache.mina.filter.codec.ProtocolEncoderOutput;
  7 +
  8 +public class MessageEncoder extends ProtocolEncoderAdapter {
  9 +
  10 + @Override
  11 + public void encode(IoSession session, Object message,
  12 + ProtocolEncoderOutput out) throws Exception {
  13 + // TODO Auto-generated method stub
  14 + IoBuffer buf = IoBuffer.allocate(1024).setAutoExpand(true);
  15 + buf.put((byte[])message);
  16 + buf.flip();
  17 + out.write(buf);
  18 + }
  19 +
  20 +}
src/main/java/com/bsth/data/gpsdata/client/pf/codec/PfMessageCodecFactory.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.codec;
  2 +
  3 +import org.apache.mina.core.session.IoSession;
  4 +import org.apache.mina.filter.codec.ProtocolCodecFactory;
  5 +import org.apache.mina.filter.codec.ProtocolDecoder;
  6 +import org.apache.mina.filter.codec.ProtocolEncoder;
  7 +
  8 +public class PfMessageCodecFactory implements ProtocolCodecFactory {
  9 +
  10 + private ProtocolEncoder encoder;
  11 + private ProtocolDecoder decoder;
  12 +
  13 + public PfMessageCodecFactory() {
  14 + encoder = new MessageEncoder();
  15 + decoder = new MessageDecoder();
  16 + }
  17 +
  18 + @Override
  19 + public ProtocolEncoder getEncoder(IoSession session) throws Exception {
  20 + // TODO Auto-generated method stub
  21 + return encoder;
  22 + }
  23 +
  24 + @Override
  25 + public ProtocolDecoder getDecoder(IoSession session) throws Exception {
  26 + // TODO Auto-generated method stub
  27 + return decoder;
  28 + }
  29 +
  30 +}
src/main/java/com/bsth/data/gpsdata/client/pf/common/ConvertUtil.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.common;
  2 +
  3 +import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
  4 +import org.slf4j.Logger;
  5 +import org.slf4j.LoggerFactory;
  6 +
  7 +import java.text.ParseException;
  8 +import java.util.Arrays;
  9 +import java.util.Calendar;
  10 +import java.util.Date;
  11 +
  12 +
  13 +public class ConvertUtil {
  14 +
  15 + private final static Logger log = LoggerFactory.getLogger(ConvertUtil.class);
  16 +
  17 + public static int bcd2int(byte[] bytes, int start, int len) {
  18 + if (len > 4 || len == 0)
  19 + throw new IllegalArgumentException("bcd2int 字节数不符合要求");
  20 + String temp = "";
  21 + for (int i = 0;i < len;i++) {
  22 + int val = bytes[start + i] & 0xff;
  23 + if (val < 10) temp += 0;
  24 + temp += Integer.toHexString(val);
  25 + }
  26 + return Integer.parseInt(temp);
  27 + }
  28 +
  29 + public static byte[] int2bcd(int val, int len) {
  30 + if (len > 4 || len == 0)
  31 + throw new IllegalArgumentException("int2bcd 字节数不符合要求");
  32 + byte[] result = new byte[len];
  33 + for (int i = len - 1;i > -1;i--) {
  34 + result[i] = (byte)Integer.parseInt(val%100 + "", 16);
  35 + val = val/100;
  36 + }
  37 + return result;
  38 + }
  39 +
  40 + public static long bcd2long(byte[] bytes, int start, int len) {
  41 + if (len > 8 || len == 0)
  42 + throw new IllegalArgumentException("bcd2long 字节数不符合要求");
  43 + String temp = "";
  44 + for (int i = 0;i < len;i++) {
  45 + int val = bytes[start + i] & 0xff;
  46 + if (val < 10) temp += 0;
  47 + temp += Integer.toHexString(val);
  48 + }
  49 + return Long.parseLong(temp);
  50 + }
  51 +
  52 + public static byte[] long2bcd(long val, int len) {
  53 + if (len > 8 || len == 0)
  54 + throw new IllegalArgumentException("long2bcd 字节数不符合要求");
  55 + byte[] result = new byte[len];
  56 + for (int i = len - 1;i > -1;i--) {
  57 + result[i] = (byte)Integer.parseInt(val%100 + "", 16);
  58 + val = val/100;
  59 + }
  60 + return result;
  61 + }
  62 +
  63 + public static String ascii2string(byte[] bytes, int start, int len) {
  64 + return new String(Arrays.copyOfRange(bytes, start, start + len));
  65 + }
  66 +
  67 + public static byte[] string2ascii(String val, int len) {
  68 + byte[] result = new byte[len];
  69 + byte[] bytes = val.getBytes();
  70 + if (bytes.length > len && len != 0)
  71 + throw new IllegalArgumentException("string2ascii 参数不符合要求");
  72 + if (len != 0)
  73 + for (int i = 0, l = bytes.length;i < l;i++) result[i] = bytes[i];
  74 + else return bytes;
  75 + return result;
  76 + }
  77 +
  78 + public static long bcd2timestamp(byte[] bytes, int start) {
  79 + String temp = "20";
  80 + for (int i = 0;i < 6;i++) {
  81 + int val = bytes[start + i] & 0xff;
  82 + if (val < 10) temp += 0;
  83 + temp += Integer.toHexString(val);
  84 + }
  85 + Date date = null;
  86 + try {
  87 + date = ThreadLocalDateUtil.parse(temp);
  88 + } catch (ParseException e) {
  89 + log.error("协议中时间数据异常：" + temp);
  90 + }
  91 + if (date != null) return date.getTime();
  92 + return -1;
  93 + }
  94 +
  95 + public static byte[] timestamp2bcd(long val) {
  96 + byte[] result = new byte[6];
  97 + Calendar c = Calendar.getInstance();
  98 + c.setTime(new Date(val));
  99 + result[0] = (byte)(Integer.parseInt(c.get(Calendar.YEAR)%100 + "", 16));
  100 + result[1] = (byte)(Integer.parseInt(c.get(Calendar.MONTH) + 1 + "", 16));
  101 + result[2] = (byte)Integer.parseInt(c.get(Calendar.DAY_OF_MONTH) + "", 16);
  102 + result[3] = (byte)Integer.parseInt(c.get(Calendar.HOUR_OF_DAY) + "", 16);
  103 + result[4] = (byte)Integer.parseInt(c.get(Calendar.MINUTE) + "", 16);
  104 + result[5] = (byte)Integer.parseInt(c.get(Calendar.SECOND) + "", 16);
  105 + return result;
  106 + }
  107 +
  108 + public static byte[] int2hex(int val, int len) {
  109 + if (len < 1)
  110 + throw new IllegalArgumentException("int2hex len 参数不符合要求");
  111 + byte[] result = new byte[len];
  112 + for (int i = 0;i < len;i++) {
  113 + result[len - 1 - i] = (byte)(val%100);
  114 + val = val/100;
  115 + }
  116 +
  117 + return result;
  118 + }
  119 +}
src/main/java/com/bsth/data/gpsdata/client/pf/handler/PfClientHandler.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.handler;
  2 +
  3 +import com.bsth.data.gpsdata.client.ClientApp;
  4 +import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
  5 +import com.bsth.data.gpsdata.client.common.Protocol2BizUtil;
  6 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  7 +import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
  8 +import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
  9 +import org.apache.mina.core.service.IoHandlerAdapter;
  10 +import org.apache.mina.core.session.IdleStatus;
  11 +import org.apache.mina.core.session.IoSession;
  12 +import org.slf4j.Logger;
  13 +import org.slf4j.LoggerFactory;
  14 +import org.springframework.beans.factory.annotation.Autowired;
  15 +import org.springframework.stereotype.Service;
  16 +
  17 +import java.io.IOException;
  18 +
  19 +@Service
  20 +public class PfClientHandler extends IoHandlerAdapter{
  21 +
  22 + private final static Logger log = LoggerFactory.getLogger(PfClientHandler.class);
  23 +
  24 + //@Autowired
  25 + //private MessageProcessor processor;
  26 +
  27 + @Autowired
  28 + GpsBeforeBuffer gpsBeforeBuffer;
  29 +
  30 + @Override
  31 + public void sessionCreated(IoSession session) throws Exception {
  32 +
  33 + }
  34 +
  35 + @Override
  36 + public void sessionOpened(IoSession session) throws Exception {
  37 +
  38 + }
  39 +
  40 + @Override
  41 + public void sessionClosed(IoSession session) throws Exception {
  42 + String deviceId = (String)session.getAttribute("deviceId");
  43 + if (deviceId != null) {
  44 + //SessionManager.getInstance().unregister(deviceId);
  45 + log.info("连老网关设备编号:" + deviceId + "断开连接");
  46 + log.warn(deviceId + "老网关设备注销");
  47 + ClientApp.fconnect(deviceId);
  48 + }
  49 + }
  50 +
  51 + @Override
  52 + public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
  53 + session.closeNow();
  54 + }
  55 +
  56 + @Override
  57 + public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
  58 + if (cause instanceof IOException) session.closeNow();
  59 + log.error("PfClientHandler exceptionCaught", cause);
  60 + }
  61 +
  62 + @Override
  63 + public void messageReceived(IoSession session, Object message) throws Exception {
  64 + PfMessage msg = (PfMessage)message;
  65 + IMessageBody body = msg.getMessageBody();
  66 + if (body != null) {
  67 + String deviceId = body.getDeviceId();
  68 + if (0x1 == msg.getCommandType()) {
  69 + log.debug("设备编号:" + body.getDeviceId() + "建立连接");
  70 + }
  71 +
  72 + BasicInfo info = Protocol2BizUtil.getBasicInfoFromMsg(msg);
  73 + gpsBeforeBuffer.put(info);
  74 + }
  75 +
  76 + }
  77 +
  78 + @Override
  79 + public void messageSent(IoSession session, Object message) throws Exception {
  80 +
  81 + }
  82 +}
src/main/java/com/bsth/data/gpsdata/client/pf/protocol/PfFactory.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.protocol;
  2 +
  3 +
  4 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  5 +
  6 +public class PfFactory {
  7 +
  8 + public static IMessageBody create(int commandType, byte[] data) {
  9 + String pkgName = PfFactory.class.getPackage().getName();
  10 + IMessageBody body = null;
  11 + try {
  12 + Class<?> cls = Class.forName(pkgName + ".Pf_" + Integer.toHexString(commandType).toUpperCase() + "_0");
  13 + body = (IMessageBody)cls.newInstance();
  14 + body.read(data);
  15 + } catch (ClassNotFoundException e) {
  16 + // TODO Auto-generated catch block
  17 + //e.printStackTrace();
  18 + } catch (InstantiationException e) {
  19 + // TODO Auto-generated catch block
  20 + e.printStackTrace();
  21 + } catch (IllegalAccessException e) {
  22 + // TODO Auto-generated catch block
  23 + e.printStackTrace();
  24 + }
  25 + return body;
  26 + }
  27 +}
src/main/java/com/bsth/data/gpsdata/client/pf/protocol/PfMessage.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.protocol;
  2 +
  3 +import com.bsth.data.gpsdata.client.msg.IMessage;
  4 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  5 +
  6 +import java.util.Arrays;
  7 +
  8 +public class PfMessage implements IMessage {
  9 +
  10 + private short version;
  11 + private short serialNo;
  12 + private short commandType;
  13 + private IMessageBody messageBody;
  14 + private byte checkSum;
  15 +
  16 + public short getVersion() {
  17 + return version;
  18 + }
  19 +
  20 + public void setVersion(short version) {
  21 + this.version = version;
  22 + }
  23 +
  24 + public short getSerialNo() {
  25 + return serialNo;
  26 + }
  27 +
  28 + public void setSerialNo(short serialNo) {
  29 + this.serialNo = serialNo;
  30 + }
  31 +
  32 + public short getCommandType() {
  33 + return commandType;
  34 + }
  35 +
  36 + public void setCommandType(short commandType) {
  37 + this.commandType = commandType;
  38 + }
  39 +
  40 + public IMessageBody getMessageBody() {
  41 + return messageBody;
  42 + }
  43 +
  44 + public void setMessageBody(IMessageBody messageBody) {
  45 + this.messageBody = messageBody;
  46 + }
  47 +
  48 + public byte getCheckSum() {
  49 + return checkSum;
  50 + }
  51 +
  52 + public void setCheckSum(byte checkSum) {
  53 + this.checkSum = checkSum;
  54 + }
  55 +
  56 + public void read(byte[] data) {
  57 + int idx = 0, len = data.length;
  58 + //version = (short)(data[idx] & 0xff); idx++;
  59 + //serialNo = (short)(data[idx] & 0xff); idx++;
  60 + commandType = (short)(data[idx] & 0xff); idx++;
  61 + byte[] temp = Arrays.copyOfRange(data, idx, len - 1);
  62 + checkSum = data[len - 1];
  63 + if (0xff == (checkSum & 0xff)) {
  64 + try {
  65 + messageBody = PfFactory.create(commandType, temp);
  66 + } catch (Exception e) {
  67 +
  68 + }
  69 + }
  70 + }
  71 +
  72 + public byte[] write() {
  73 + return null;
  74 + }
  75 +
  76 + public String toString() {
  77 + StringBuilder sb = new StringBuilder();
  78 + //sb.append("报文版本号：").append(version)
  79 + //.append("报文序列号：").append(serialNo)
  80 + sb.append("报文命令字：0x").append(Integer.toHexString(commandType))
  81 + .append("报文主体：(").append(messageBody).append(")")
  82 + .append("报文校验和：").append(checkSum);
  83 +
  84 + return sb.toString();
  85 + }
  86 +}
src/main/java/com/bsth/data/gpsdata/client/pf/protocol/Pf_1_0.java 0 → 100644
  View file @a433e0a
  1 +package com.bsth.data.gpsdata.client.pf.protocol;
  2 +
  3 +import com.bsth.data.gpsdata.client.msg.IMessageBody;
  4 +import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
  5 +
  6 +import java.nio.ByteBuffer;
  7 +import java.util.Date;
  8 +
  9 +
  10 +public class Pf_1_0 implements IMessageBody {
  11 +
  12 + /** 1、车载终端识别码-byte[8] */
  13 + private String mtd;
  14 + /** 2、司机工号-byte[8] */
  15 + private String driver;
  16 + /** 3、包车状态-byte[1] */
  17 + private int bczt;
  18 + /** 4、线路状态-byte[1] */
  19 + private int xlzt;
  20 + /** 5、线路代码-byte[6] */
  21 + private int xldm;
  22 + /** 6、营运状态-byte[1] */
  23 + private int yyzt;
  24 + /** 7、进出站状态-byte[1] */
  25 + private int jczzt;
  26 + /** 8、站点编号-byte[8] */
  27 + private String zdbh;
  28 + /** 9、进出停车场状态（0：厂内，1：厂外，2：未知）-byte[1] */
  29 + private int jctcczt;
  30 + /** 10、停车场编号-byte[8] */
  31 + private String tccbh;
  32 + /** 11、路段编码-byte[12] */
  33 + private String ldbh;
  34 + /** 12、上下行状态-byte[1] */
  35 + private int sxxzt;
  36 + /** 13、速度-byte[1] */
  37 + private int speed;
  38 + /** 14、初始异常状态-byte[1] */
  39 + private int csyczt;
  40 + /** 15、结束异常状态-byte[1] */
  41 + private int jsyczt;
  42 + /** 16、车辆位置经度（纠偏后）-byte[4] */
  43 + private double lon;
  44 + /** 17、车辆位置维度（纠偏后）-byte[4] */
  45 + private double lat;
  46 + /** 18、方向-byte[2] */
  47 + private int fx;
  48 + /** 19、发送时间-byte[4] */
  49 + private Date fssj;
  50 + /** 20、离下站距离-byte[2] */
  51 + private int lxzjl;
  52 + /** 21、本站留车人数-byte[2] */
  53 + private int bzlcrs;
  54 + /** 22、车辆位置经度（未纠偏）-byte[4] */
  55 + private double lon_old;
  56 + /** 23、车辆位置经度（未纠偏）-byte[4] */
  57 + private double lat_old;
  58 + /** 24、城建X坐标 */
  59 + private double x;
  60 + /** 25、城建Y坐标 */
  61 + private double y;
  62 +
  63 + public String getMtd() {
  64 + return mtd;
  65 + }
  66 +
  67 + public void setMtd(String mtd) {
  68 + this.mtd = mtd;
  69 + }
  70 +
  71 + public String getDriver() {
  72 + return driver;
  73 + }
  74 +
  75 + public void setDriver(String driver) {
  76 + this.driver = driver;
  77 + }
  78 +
  79 + public int getBczt() {
  80 + return bczt;
  81 + }
  82 +
  83 + public void setBczt(int bczt) {
  84 + this.bczt = bczt;
  85 + }
  86 +
  87 + public int getXlzt() {
  88 + return xlzt;
  89 + }
  90 +
  91 + public void setXlzt(int xlzt) {
  92 + this.xlzt = xlzt;
  93 + }
  94 +
  95 + public int getXldm() {
  96 + return xldm;
  97 + }
  98 +
  99 + public void setXldm(int xldm) {
  100 + this.xldm = xldm;
  101 + }
  102 +
  103 + public int getYyzt() {
  104 + return yyzt;
  105 + }
  106 +
  107 + public void setYyzt(int yyzt) {
  108 + this.yyzt = yyzt;
  109 + }
  110 +
  111 + public int getJczzt() {
  112 + return jczzt;
  113 + }
  114 +
  115 + public void setJczzt(int jczzt) {
  116 + this.jczzt = jczzt;
  117 + }
  118 +
  119 + public String getZdbh() {
  120 + return zdbh;
  121 + }
  122 +
  123 + public void setZdbh(String zdbh) {
  124 + this.zdbh = zdbh;
  125 + }
  126 +
  127 + public int getJctcczt() {
  128 + return jctcczt;
  129 + }
  130 +
  131 + public void setJctcczt(int jctcczt) {
  132 + this.jctcczt = jctcczt;
  133 + }
  134 +
  135 + public String getTccbh() {
  136 + return tccbh;
  137 + }
  138 +
  139 + public void setTccbh(String tccbh) {
  140 + this.tccbh = tccbh;
  141 + }
  142 +
  143 + public String getLdbh() {
  144 + return ldbh;
  145 + }
  146 +
  147 + public void setLdbh(String ldbh) {
  148 + this.ldbh = ldbh;
  149 + }
  150 +
  151 + public int getSxxzt() {
  152 + return sxxzt;
  153 + }
  154 +
  155 + public void setSxxzt(int sxxzt) {
  156 + this.sxxzt = sxxzt;
  157 + }
  158 +
  159 + public int getSpeed() {
  160 + return speed;
  161 + }
  162 +
  163 + public void setSpeed(int speed) {
  164 + this.speed = speed;
  165 + }
  166 +
  167 + public int getCsyczt() {
  168 + return csyczt;
  169 + }
  170 +
  171 + public void setCsyczt(int csyczt) {
  172 + this.csyczt = csyczt;
  173 + }
  174 +
  175 + public int getJsyczt() {
  176 + return jsyczt;
  177 + }
  178 +
  179 + public void setJsyczt(int jsyczt) {
  180 + this.jsyczt = jsyczt;
  181 + }
  182 +
  183 + public double getLon() {
  184 + return lon;
  185 + }
  186 +
  187 + public void setLon(double lon) {
  188 + this.lon = lon;
  189 + }
  190 +
  191 + public double getLat() {
  192 + return lat;
  193 + }
  194 +
  195 + public void setLat(double lat) {
  196 + this.lat = lat;
  197 + }
  198 +
  199 + public int getFx() {
  200 + return fx;
  201 + }
  202 +
  203 + public void setFx(int fx) {
  204 + this.fx = fx;
  205 + }
  206 +
  207 + public Date getFssj() {
  208 + return fssj;
  209 + }
  210 +
  211 + public void setFssj(Date fssj) {
  212 + this.fssj = fssj;
  213 + }
  214 +
  215 + public int getLxzjl() {
  216 + return lxzjl;
  217 + }
  218 +
  219 + public void setLxzjl(int lxzjl) {
  220 + this.lxzjl = lxzjl;
  221 + }
  222 +
  223 + public int getBzlcrs() {
  224 + return bzlcrs;
  225 + }
  226 +
  227 + public void setBzlcrs(int bzlcrs) {
  228 + this.bzlcrs = bzlcrs;
  229 + }
  230 +
  231 + public double getLon_old() {
  232 + return lon_old;
  233 + }
  234 +
  235 + public void setLon_old(double lon_old) {
  236 + this.lon_old = lon_old;
  237 + }
  238 +
  239 + public double getLat_old() {
  240 + return lat_old;
  241 + }
  242 +
  243 + public void setLat_old(double lat_old) {
  244 + this.lat_old = lat_old;
  245 + }
  246 +
  247 + public double getX() {
  248 + return x;
  249 + }
  250 +
  251 + public void setX(double x) {
  252 + this.x = x;
  253 + }
  254 +
  255 + public double getY() {
  256 + return y;
  257 + }
  258 +
  259 + public void setY(double y) {
  260 + this.y = y;
  261 + }
  262 +
  263 + public byte[] write() {
  264 + return null;
  265 + }
  266 +
  267 + @Override
  268 + public void read(byte[] bytes) {
  269 + // TODO Auto-generated method stub
  270 + int idx = 0;
  271 + ByteBuffer buf = ByteBuffer.wrap(bytes);
  272 + mtd = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
  273 + driver = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
  274 + bczt = buf.get(idx); idx++;
  275 + xlzt = buf.get(idx); idx++;
  276 + xldm = Integer.parseInt(ConvertUtil.ascii2string(bytes, idx, 6).trim()); idx += 6;
  277 + yyzt = buf.get(idx); idx++;
  278 + jczzt = buf.get(idx); idx++;
  279 + zdbh = ConvertUtil.ascii2string(bytes, idx, 8).trim(); idx += 8;
  280 + jctcczt = buf.get(idx); idx++;
  281 + tccbh = ConvertUtil.ascii2string(bytes, idx, 8); idx += 8;
  282 + ldbh = ConvertUtil.ascii2string(bytes, idx, 12).trim(); idx += 12;
  283 + sxxzt = buf.get(idx); idx++;
  284 + speed = buf.get(idx)*10; idx++;
  285 + csyczt = buf.get(idx); idx++;
  286 + jsyczt = buf.get(idx); idx++;
  287 + byte flagx = buf.get(idx); idx++;
  288 + if (flagx == 0) x = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
  289 + else x = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
  290 + idx += 3;
  291 + byte flagy = buf.get(idx); idx++;
  292 + if (flagy == 0) y = ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
  293 + else y = -ConvertUtil.bytes2int(bytes, idx, 3)/100.0;
  294 + idx += 3;
  295 + fx = buf.getShort(idx)*(short)10; idx += 2;
  296 + fssj = new Date(ConvertUtil.bytes2int(bytes, idx, 4) * 1000L); idx += 4;
  297 + lxzjl = buf.getShort(idx); idx += 2;
  298 + bzlcrs = buf.getShort(idx); idx += 2;
  299 + lon = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
  300 + lat = ConvertUtil.bytes2int(bytes, idx, 4); idx += 4;
  301 + }
  302 +
  303 + @Override
  304 + public String getDeviceId() {
  305 + // TODO Auto-generated method stub
  306 + return mtd;
  307 + }
  308 +
  309 + @Override
  310 + public long getTimestamp() {
  311 + // TODO Auto-generated method stub
  312 + return 0;
  313 + }
  314 +}
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
  View file @a433e0a
@@ -98,7 +98,7 @@ public class GpsDataRecovery implements ApplicationContextAware { @@ -98,7 +98,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
98 gps.setLon(rs.getFloat("LON")); 98 gps.setLon(rs.getFloat("LON"));
99 gps.setLineId(rs.getString("LINE_ID")); 99 gps.setLineId(rs.getString("LINE_ID"));
100 gps.setTimestamp(rs.getLong("TS")); 100 gps.setTimestamp(rs.getLong("TS"));
101 - gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE"))); 101 + gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
102 return gps; 102 return gps;
103 } 103 }
104 }); 104 });
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @a433e0a
@@ -144,8 +144,6 @@ public class DayOfSchedule implements CommandLineRunner { @@ -144,8 +144,6 @@ public class DayOfSchedule implements CommandLineRunner {
144 @Override 144 @Override
145 public void run(String... arg0) throws Exception { 145 public void run(String... arg0) throws Exception {
146 basicDataLoader.loadAllData(); 146 basicDataLoader.loadAllData();
147 - //从数据库恢复排班  
148 - //dataRecovery();  
149 147
150 //翻班线程 148 //翻班线程
151 // Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS); 149 // Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
  View file @a433e0a
@@ -123,7 +123,7 @@ public class LateAdjustHandle implements ApplicationContextAware{ @@ -123,7 +123,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
123 //进的是班次起点（名称一样即可） 123 //进的是班次起点（名称一样即可）
124 gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo())); 124 gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
125 if(gps.getStationName().equals(sch.getQdzName()) 125 if(gps.getStationName().equals(sch.getQdzName())
126 - && sch.getLateMinute() > 0){ 126 + /*&& sch.getLateMinute() > 0*/){
127 //自动调整待发 到达时间 + 停靠时间 127 //自动调整待发 到达时间 + 停靠时间
128 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000)); 128 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
129 sch.setDfsjAll(dt); 129 sch.setDfsjAll(dt);
src/main/java/com/bsth/repository/LineRepository.java
  View file @a433e0a
@@ -38,4 +38,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; { @@ -38,4 +38,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
38 List<Line> findLine(String line); 38 List<Line> findLine(String line);
39 39
40 public Line findByLineCode(String string); 40 public Line findByLineCode(String string);
  41 +
  42 + @Query(value = " SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
  43 + public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
41 } 44 }
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @a433e0a
@@ -251,7 +251,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -251,7 +251,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
251 return null; 251 return null;
252 } 252 }
253 // 根据当前GPS确定 上下行和营运状态 253 // 根据当前GPS确定 上下行和营运状态
254 - Integer upDown = null, state = null; 254 + Byte upDown = null;
  255 + Integer state = null;
255 if (null == sch) { 256 if (null == sch) {
256 GpsEntity gpsData = gpsRealDataBuffer.get(deviceId); 257 GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
257 if (null == gpsData) { 258 if (null == gpsData) {
@@ -273,7 +274,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -273,7 +274,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
273 state = gpsData.getState(); 274 state = gpsData.getState();
274 } 275 }
275 } else { 276 } else {
276 - upDown = Integer.parseInt(sch.getXlDir()); 277 + upDown = Byte.parseByte(sch.getXlDir());
277 state = 0; 278 state = 0;
278 } 279 }
279 280
src/main/java/com/bsth/service/forms/FormsService.java
  View file @a433e0a
@@ -35,7 +35,7 @@ public interface FormsService { @@ -35,7 +35,7 @@ public interface FormsService {
35 35
36 public List<Operationservice> operationservice(Map<String, Object> map); 36 public List<Operationservice> operationservice(Map<String, Object> map);
37 37
38 - public List<Turnoutrate> turnoutrate(Map<String, Object> map); 38 + public List<Map<String, Object>> turnoutrate(Map<String, Object> map);
39 39
40 public List<Executionrate> executionrate(Map<String, Object> map); 40 public List<Executionrate> executionrate(Map<String, Object> map);
41 41
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @a433e0a
@@ -9,14 +9,17 @@ import java.text.SimpleDateFormat; @@ -9,14 +9,17 @@ import java.text.SimpleDateFormat;
9 import java.util.ArrayList; 9 import java.util.ArrayList;
10 import java.util.Date; 10 import java.util.Date;
11 import java.util.HashMap; 11 import java.util.HashMap;
  12 +import java.util.HashSet;
12 import java.util.List; 13 import java.util.List;
13 import java.util.Map; 14 import java.util.Map;
  15 +import java.util.Set;
14 16
15 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.jdbc.core.JdbcTemplate; 18 import org.springframework.jdbc.core.JdbcTemplate;
17 import org.springframework.jdbc.core.RowMapper; 19 import org.springframework.jdbc.core.RowMapper;
18 import org.springframework.stereotype.Service; 20 import org.springframework.stereotype.Service;
19 21
  22 +import com.bsth.entity.Line;
20 import com.bsth.entity.mcy_forms.Linepasswengerflow; 23 import com.bsth.entity.mcy_forms.Linepasswengerflow;
21 import com.bsth.entity.mcy_forms.Operationservice; 24 import com.bsth.entity.mcy_forms.Operationservice;
22 import com.bsth.entity.mcy_forms.Shifday; 25 import com.bsth.entity.mcy_forms.Shifday;
@@ -27,6 +30,8 @@ import com.bsth.entity.mcy_forms.Vehicleloading; @@ -27,6 +30,8 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
27 import com.bsth.entity.mcy_forms.Waybillday; 30 import com.bsth.entity.mcy_forms.Waybillday;
28 import com.bsth.entity.oil.Ylb; 31 import com.bsth.entity.oil.Ylb;
29 import com.bsth.entity.realcontrol.ScheduleRealInfo; 32 import com.bsth.entity.realcontrol.ScheduleRealInfo;
  33 +import com.bsth.entity.schedule.SchedulePlanInfo;
  34 +import com.bsth.repository.LineRepository;
30 import com.bsth.repository.oil.YlbRepository; 35 import com.bsth.repository.oil.YlbRepository;
31 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository; 36 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
32 import com.bsth.data.BasicData; 37 import com.bsth.data.BasicData;
@@ -60,6 +65,10 @@ public class FormsServiceImpl implements FormsService { @@ -60,6 +65,10 @@ public class FormsServiceImpl implements FormsService {
60 65
61 @Autowired 66 @Autowired
62 YlbRepository ylbRepository; 67 YlbRepository ylbRepository;
  68 +
  69 + @Autowired
  70 + LineRepository lineRepository;
  71 +
63 72
64 // 行车路单日报表 73 // 行车路单日报表
65 @Override 74 @Override
@@ -734,11 +743,13 @@ public class FormsServiceImpl implements FormsService { @@ -734,11 +743,13 @@ public class FormsServiceImpl implements FormsService {
734 743
735 // 营运线路出车率统计表 744 // 营运线路出车率统计表
736 @Override 745 @Override
737 - public List<Turnoutrate> turnoutrate(Map<String, Object> map) { 746 + public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
738 747
739 - List<Turnoutrate> resList = new ArrayList<Turnoutrate>(); 748 + List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
740 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); 749 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
741 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日"); 750 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
  751 + NumberFormat numberFormat = NumberFormat.getInstance();
  752 + numberFormat.setMaximumFractionDigits(2);
742 Date d = null; 753 Date d = null;
743 Date d1 = null; 754 Date d1 = null;
744 try { 755 try {
@@ -750,68 +761,134 @@ public class FormsServiceImpl implements FormsService { @@ -750,68 +761,134 @@ public class FormsServiceImpl implements FormsService {
750 } 761 }
751 String rq2 = sdf1.format(d); 762 String rq2 = sdf1.format(d);
752 String rq3 = sdf1.format(d1); 763 String rq3 = sdf1.format(d1);
  764 + String company = map.get("gsdmTurn").toString();
  765 + String subCompany = map.get("fgsdmTurn").toString();
  766 + String line = map.get("line").toString();
  767 + String startDate = map.get("startDate").toString();
  768 + String endDate = map.get("endDate").toString();
753 769
754 rq = rq2 + "-" + rq3; 770 rq = rq2 + "-" + rq3;
755 771
756 - String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "  
757 - + " (select count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"  
758 - + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "' "  
759 - + " and '" + map.get("endDate").toString() + "' and xl_bm='"+ map.get("line").toString() + "' "  
760 - + " AND gs_bm is not null "  
761 - + " AND bc_type NOT IN ('in', 'out')"  
762 - + " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"  
763 - + " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"  
764 -// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "  
765 - + " ) a left JOIN ("  
766 - + " SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car "  
767 - + " from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "  
768 - + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "' and '"  
769 - + map.get("endDate").toString() + "' and xl_bm='" + map.get("line").toString()  
770 - + "' AND gs_bm is not null "  
771 - + " AND bc_type NOT IN ('in', 'out')"  
772 -// + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "  
773 - + " ) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "  
774 - + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm ";  
775 - List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() { 772 + List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
  773 + List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
  774 +
  775 + String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
  776 + + "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
  777 + if(line.trim().length() != 0){
  778 + sql += "and xl_bm = '"+line+"' ";
  779 + }
  780 + List<SchedulePlanInfo> planList = jdbcTemplate.query(sql, new RowMapper<SchedulePlanInfo>() {
776 781
777 @Override 782 @Override
778 - public Turnoutrate mapRow(ResultSet arg0, int arg1) throws SQLException {  
779 - Turnoutrate tu = new Turnoutrate();  
780 - NumberFormat numberFormat = NumberFormat.getInstance();  
781 - numberFormat.setMaximumFractionDigits(2);  
782 - int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;  
783 - int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;  
784 - int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;  
785 - int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;  
786 - String result1 = numberFormat.format((float) scl / (float) jcl * 100);  
787 - String result2 = numberFormat.format((float) sbc / (float) jbc * 100);  
788 - tu.setRq(rq);  
789 - if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)  
790 - return tu;  
791 - tu.setGs(arg0.getString("gs_name").toString());  
792 - tu.setZhgs(arg0.getString("fgs_name").toString());  
793 -// tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");  
794 - tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");  
795 - tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");  
796 - tu.setCchjh("" + jcl);  
797 - tu.setCchsj("" + scl);  
798 - tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");  
799 - tu.setChl(result1 + "%");// 出车率  
800 - tu.setBcjh("" + jbc);  
801 - tu.setBcsj("" + sbc);  
802 - tu.setBbzxl(result2 + "%");// 班次执行率  
803 - tu.setSm(arg0.getString("gs_name").toString());  
804 - tu.setGsgs(arg0.getString("gslsbm").toString());  
805 - tu.setFgsgs(arg0.getString("fgsbm").toString());  
806 - return tu; 783 + public SchedulePlanInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
  784 + SchedulePlanInfo schedule = new SchedulePlanInfo();
  785 + schedule.setGsName(arg0.getString("gs_name"));
  786 + schedule.setFgsName(arg0.getString("fgs_name"));
  787 + schedule.setClZbh(arg0.getString("cl_zbh"));
  788 + schedule.setFcsj(arg0.getString("fcsj"));
  789 + schedule.setBcType(arg0.getString("bc_type"));
  790 + schedule.setXlBm(arg0.getString("xl_bm"));
  791 + schedule.setXlName(arg0.getString("xl_name"));
  792 + schedule.setScheduleDate(arg0.getDate("schedule_date"));
  793 + return schedule;
807 } 794 }
808 795
809 }); 796 });
810 797
811 - for(Turnoutrate t : list){  
812 - if(t.getGs() != null && t.getGs().trim().length() != 0)  
813 - resList.add(t); 798 +
  799 + for(Line line1 : lineList){
  800 + if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
  801 + Map<String, Object> m = new HashMap<String, Object>();
  802 + m.put("rq", rq);
  803 + m.put("line", line1.getName());
  804 + m.put("xlBm", line1.getLineCode());
  805 + m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
  806 + m.put("sm", "");
  807 + resList.add(m);
  808 + }
  809 + }
  810 + for(Map<String, Object> m : resList){
  811 + String xlBm = m.get("xlBm").toString();
  812 + List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
  813 + List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
  814 + for(ScheduleRealInfo schedule : list){
  815 + if(schedule.getXlBm().equals(xlBm)){
  816 + reals.add(schedule);
  817 + }
  818 + }
  819 + for(SchedulePlanInfo schedule : planList){
  820 + if(schedule.getXlBm().equals(xlBm)){
  821 + plans.add(schedule);
  822 + }
  823 + }
  824 + Set<String> jhcc = new HashSet<String>();
  825 + Set<String> sjcc = new HashSet<String>();
  826 + for(SchedulePlanInfo schedule : plans){
  827 + if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
  828 + m.put("gsName", schedule.getGsName());
  829 + }
  830 + if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
  831 + m.put("fgsName", schedule.getFgsName());
  832 + }
  833 + jhcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
  834 + }
  835 + for(ScheduleRealInfo schedule : reals){
  836 + if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
  837 + m.put("gsName", schedule.getGsName());
  838 + }
  839 + if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
  840 + m.put("fgsName", schedule.getFgsName());
  841 + }
  842 + sjcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
  843 + }
  844 + m.put("jhcc", jhcc.size());
  845 + m.put("sjcc", sjcc.size());
  846 + if(jhcc.size() != 0 && sjcc.size() != 0){
  847 + m.put("ccl", numberFormat.format(((float)sjcc.size() / jhcc.size())*100)+"%");
  848 + }else{
  849 + m.put("ccl", "--");
  850 + }
  851 + int jhbc = culateMileageService.culateJhbc(reals, "");
  852 + int sjbc = culateMileageService.culateSjbc(reals, "");
  853 + m.put("jhbc", jhbc);
  854 + m.put("sjbc", sjbc);
  855 + if(jhbc != 0 && sjbc != 0){
  856 + m.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
  857 + }else{
  858 + m.put("zxl", "--");
  859 + }
  860 + }
  861 + Map<String, Object> tempMap = new HashMap<String, Object>();
  862 + int jhcc = 0;
  863 + int sjcc = 0;
  864 + int jhbc = 0;
  865 + int sjbc = 0;
  866 + int qz = 0;
  867 + for(Map<String, Object> m : resList){
  868 + jhcc += Integer.valueOf(m.get("jhcc").toString());
  869 + sjcc += Integer.valueOf(m.get("sjcc").toString());
  870 + jhbc += Integer.valueOf(m.get("jhbc").toString());
  871 + sjbc += Integer.valueOf(m.get("sjbc").toString());
  872 + qz += Integer.valueOf(m.get("qz").toString());
  873 + }
  874 + tempMap.put("rq", "分类汇总");
  875 + tempMap.put("line", "共" + resList.size() + "条线路");
  876 + tempMap.put("jhcc", jhcc);
  877 + tempMap.put("sjcc", sjcc);
  878 + tempMap.put("jhbc", jhbc);
  879 + tempMap.put("sjbc", sjbc);
  880 + tempMap.put("qz", qz);
  881 + if(jhcc != 0 && sjcc != 0){
  882 + tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
  883 + }else{
  884 + tempMap.put("ccl", "--");
  885 + }
  886 + if(jhbc != 0 && sjbc != 0){
  887 + tempMap.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
  888 + }else{
  889 + tempMap.put("zxl", "--");
814 } 890 }
  891 + resList.add(tempMap);
815 892
816 return resList; 893 return resList;
817 } 894 }
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a433e0a
@@ -408,6 +408,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -408,6 +408,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
408 t.setsName(sName);//补上售票员名称 408 t.setsName(sName);//补上售票员名称
409 } 409 }
410 } 410 }
  411 + else{
  412 + t.setsGh("");
  413 + t.setsName("");
  414 + }
411 415
412 //公司 和 分公司名称 416 //公司 和 分公司名称
413 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm())); 417 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
@@ -498,6 +502,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -498,6 +502,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
498 t.setsName(sName);//补上售票员名称 502 t.setsName(sName);//补上售票员名称
499 } 503 }
500 } 504 }
  505 + else{
  506 + t.setsGh("");
  507 + t.setsName("");
  508 + }
501 509
502 //公司 和 分公司名称 510 //公司 和 分公司名称
503 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm())); 511 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
src/main/resources/logback.xml
  View file @a433e0a
@@ -177,6 +177,10 @@ @@ -177,6 +177,10 @@
177 level="INFO" additivity="false"> 177 level="INFO" additivity="false">
178 <appender-ref ref="GPS_COUNT" /> 178 <appender-ref ref="GPS_COUNT" />
179 </logger> 179 </logger>
  180 + <logger name="com.bsth.data.gpsdata.arrival.GpsRealAnalyse"
  181 + level="INFO" additivity="false">
  182 + <appender-ref ref="GPS_COUNT" />
  183 + </logger>
180 <!--<logger name="org.hibernate.SQL" level="TRACE">--> 184 <!--<logger name="org.hibernate.SQL" level="TRACE">-->
181 <!--<appender-ref ref="STDOUT" />--> 185 <!--<appender-ref ref="STDOUT" />-->
182 <!--</logger>--> 186 <!--</logger>-->
src/main/resources/static/pages/forms/mould/turnoutrate.xls
View file @a433e0a
No preview for this file type
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
  View file @a433e0a
@@ -92,20 +92,20 @@ @@ -92,20 +92,20 @@
92 <tbody id="tbody"> 92 <tbody id="tbody">
93 93
94 </tbody> 94 </tbody>
95 - <tr>  
96 - <td colspan="1">分类汇总</td>  
97 - <td><span id="total_gs">&nbsp;</span></td>  
98 - <td><span id="total_zhgs">&nbsp;</span></td>  
99 - <td><span id="total_xlts">&nbsp;</span></td>  
100 - <td><span id="total_jh">&nbsp;</span></td>  
101 - <td><span id="total_sj">&nbsp;</span></td>  
102 - <td><span id="total_qz">&nbsp;</span></td>  
103 - <td><span id="total_ccl">&nbsp;</span></td>  
104 - <td><span id="total_bcjh">&nbsp;</span></td>  
105 - <td><span id="total_bcsj">&nbsp;</span></td>  
106 - <td><span id="total_bczxl">&nbsp;</span></td>  
107 - <td><span id="total_sm">&nbsp;</span></td>  
108 - </tr> 95 +<!-- <tr> -->
  96 +<!-- <td colspan="1">分类汇总</td> -->
  97 +<!-- <td><span id="total_gs">&nbsp;</span></td> -->
  98 +<!-- <td><span id="total_zhgs">&nbsp;</span></td> -->
  99 +<!-- <td><span id="total_xlts">&nbsp;</span></td> -->
  100 +<!-- <td><span id="total_jh">&nbsp;</span></td> -->
  101 +<!-- <td><span id="total_sj">&nbsp;</span></td> -->
  102 +<!-- <td><span id="total_qz">&nbsp;</span></td> -->
  103 +<!-- <td><span id="total_ccl">&nbsp;</span></td> -->
  104 +<!-- <td><span id="total_bcjh">&nbsp;</span></td> -->
  105 +<!-- <td><span id="total_bcsj">&nbsp;</span></td> -->
  106 +<!-- <td><span id="total_bczxl">&nbsp;</span></td> -->
  107 +<!-- <td><span id="total_sm">&nbsp;</span></td> -->
  108 +<!-- </tr> -->
109 </table> 109 </table>
110 </div> 110 </div>
111 </div> 111 </div>
@@ -197,53 +197,53 @@ @@ -197,53 +197,53 @@
197 $("#query").on("click",function(){ 197 $("#query").on("click",function(){
198 198
199 line = $("#line").val(); 199 line = $("#line").val();
200 - startDate1=$("#startDate").val();  
201 - endDate1=$("#endDate").val(); 200 + startDate=$("#startDate").val();
  201 + endDate=$("#endDate").val();
202 gsdmTurn=$("#gsdmTurn").val(); 202 gsdmTurn=$("#gsdmTurn").val();
203 fgsdmTurn=$("#fgsdmTurn").val(); 203 fgsdmTurn=$("#fgsdmTurn").val();
204 - if(startDate1!=''&&endDate1!=''){ 204 + if(startDate!=''&&endDate!=''){
205 $post('/mcy_forms/turnoutrate', 205 $post('/mcy_forms/turnoutrate',
206 - { gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){ 206 + { gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:startDate,endDate:endDate,type:'query'},function(result){
207 // var result=[]; 207 // var result=[];
208 // 把数据填充到模版中 208 // 把数据填充到模版中
209 var tbodyHtml = template('turnoutrate',{list:result}); 209 var tbodyHtml = template('turnoutrate',{list:result});
210 // 把渲染好的模版html文本追加到表格中 210 // 把渲染好的模版html文本追加到表格中
211 $('#tbody').html(tbodyHtml); 211 $('#tbody').html(tbodyHtml);
212 - line = $("#line").val();  
213 - startDate = $("#startDate").val();  
214 - endDate = $("#endDate").val();  
215 - $("#sDate").text(startDate);  
216 - $("#eDate").text(endDate); 212 + line = $("#line").val();
  213 + startDate = $("#startDate").val();
  214 + endDate = $("#endDate").val();
  215 + $("#sDate").text(startDate);
  216 + $("#eDate").text(endDate);
217 217
218 - var total_xlts = 0,total_jh = 0;  
219 - var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;  
220 - var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;  
221 - var total_gs=0;  
222 - var total_zhgs=0;  
223 - $.each(result, function(i, obj) {  
224 - total_gs +=Number(obj.gsgs);  
225 - total_zhgs +=Number(obj.fgsgs);  
226 - total_xlts += Number(obj.xl);  
227 - total_jh = Number(obj.cchjh)+Number(total_jh);  
228 - total_sj = Number(obj.cchsj)+Number(total_sj);  
229 - total_qz = Number(obj.cchqz)+Number(total_qz); 218 +// var total_xlts = 0,total_jh = 0;
  219 +// var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
  220 +// var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
  221 +// var total_gs=0;
  222 +// var total_zhgs=0;
  223 +// $.each(result, function(i, obj) {
  224 +// total_gs +=Number(obj.gsgs);
  225 +// total_zhgs +=Number(obj.fgsgs);
  226 +// total_xlts += Number(obj.xl);
  227 +// total_jh = Number(obj.cchjh)+Number(total_jh);
  228 +// total_sj = Number(obj.cchsj)+Number(total_sj);
  229 +// total_qz = Number(obj.cchqz)+Number(total_qz);
230 230
231 - total_ccl =(Number(total_sj)/Number(total_jh))*100;  
232 - total_bcjh = Number(obj.bcjh)+Number(total_bcjh);  
233 - total_bcsj = Number(obj.bcsj)+Number(total_bcsj);  
234 - total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100; 231 +// total_ccl =(Number(total_sj)/Number(total_jh))*100;
  232 +// total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
  233 +// total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
  234 +// total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
235 235
236 - });  
237 - $("#total_gs").text(total_gs);  
238 - $("#total_zhgs").text(total_zhgs);  
239 - $("#total_xlts").text(total_xlts);  
240 - $("#total_jh").text(total_jh);  
241 - $("#total_sj").text(total_sj);  
242 - $("#total_qz").text(total_qz);  
243 - $("#total_ccl").text(total_ccl.toFixed(2)+'%');  
244 - $("#total_bcjh").text(total_bcjh);  
245 - $("#total_bcsj").text(total_bcsj);  
246 - $("#total_bczxl").text(total_bczxl.toFixed(2)+'%'); 236 +// });
  237 +// $("#total_gs").text(total_gs);
  238 +// $("#total_zhgs").text(total_zhgs);
  239 +// $("#total_xlts").text(total_xlts);
  240 +// $("#total_jh").text(total_jh);
  241 +// $("#total_sj").text(total_sj);
  242 +// $("#total_qz").text(total_qz);
  243 +// $("#total_ccl").text(total_ccl.toFixed(2)+'%');
  244 +// $("#total_bcjh").text(total_bcjh);
  245 +// $("#total_bcsj").text(total_bcsj);
  246 +// $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
247 247
248 var temp = {}; 248 var temp = {};
249 var today_account = 0; 249 var today_account = 0;
@@ -278,18 +278,23 @@ @@ -278,18 +278,23 @@
278 <script type="text/html" id="turnoutrate"> 278 <script type="text/html" id="turnoutrate">
279 {{each list as obj i}} 279 {{each list as obj i}}
280 <tr> 280 <tr>
281 - <td>{{obj.rq}}</td>  
282 - <td>{{obj.gs}}</td>  
283 - <td>{{obj.zhgs}}</td>  
284 - <td>{{obj.xl}}</td>  
285 - <td>{{obj.cchjh}}</td>  
286 - <td>{{obj.cchsj}}</td>  
287 - <td>{{obj.cchqz}}</td>  
288 - <td>{{obj.chl}}</td>  
289 - <td>{{obj.bcjh}}</td>  
290 - <td>{{obj.bcsj}}</td>  
291 - <td>{{obj.bbzxl}}</td>  
292 - <td>{{obj.gs}}</td> 281 + {{if obj.rq == '分类汇总'}}
  282 + <td colspan='3'>{{obj.rq}}</td>
  283 + {{/if}}
  284 + {{if obj.rq != '分类汇总'}}
  285 + <td>{{obj.rq}}</td>
  286 + <td>{{obj.gsName}}</td>
  287 + <td>{{obj.fgsName}}</td>
  288 + {{/if}}
  289 + <td>{{obj.line}}</td>
  290 + <td>{{obj.jhcc}}</td>
  291 + <td>{{obj.sjcc}}</td>
  292 + <td>{{obj.qz}}</td>
  293 + <td>{{obj.ccl}}</td>
  294 + <td>{{obj.jhbc}}</td>
  295 + <td>{{obj.sjbc}}</td>
  296 + <td>{{obj.zxl}}</td>
  297 + <td>{{obj.sm}}</td>
293 </tr> 298 </tr>
294 {{/each}} 299 {{/each}}
295 {{if list.length == 0}} 300 {{if list.length == 0}}
src/main/resources/static/real_control_v2/assets/imgs/time.gif 0 → 100644
  View file @a433e0a
src/main/resources/static/real_control_v2/js/main.js
  View file @a433e0a
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) { @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
169 function showUpdateDescription() { 169 function showUpdateDescription() {
170 //更新说明 170 //更新说明
171 var updateDescription = { 171 var updateDescription = {
172 - date: '2017-05-03',  
173 - text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>' 172 + date: '2017-05-04',
  173 + text: '<h5>修复了一个问题，该问题导致在应急停靠时间设置为0的时候，待发时间不会自动调整。</h5>'
174 }; 174 };
175 175
176 var storage = window.localStorage 176 var storage = window.localStorage
src/main/resources/static/real_control_v2/js/minute_timer.js 0 → 100644
  View file @a433e0a
  1 +/** 时钟 */
  2 +var gb_minute_timer = (function () {
  3 +
  4 +
  5 + var getServerTime = function (cb) {
  6 + function oncallback(jqXHR) {
  7 + var time = jqXHR && jqXHR.getResponseHeader("Date");
  8 + if (time)
  9 + callback(new Date(time))
  10 + }
  11 +
  12 + if ("function" == typeof callback)
  13 + $.ajax({
  14 + url: "/real_control_v2/assets/imgs/time.gif",
  15 + type: "HEAD"
  16 + }).done(function (data, textStatus, jqXHR) {
  17 + oncallback(jqXHR)
  18 + }).fail(function (jqXHR, textStatus, errorThrown) {
  19 + oncallback(jqXHR)
  20 + })
  21 + };
  22 +
  23 +
  24 + setTimeout(function () {
  25 + getServerTime(function () {
  26 + console.log('cb,,', cb);
  27 + });
  28 + }, 5000);
  29 +
  30 +})();
0 \ No newline at end of file 31 \ No newline at end of file
src/main/resources/static/real_control_v2/main.html
  View file @a433e0a
@@ -183,6 +183,8 @@ @@ -183,6 +183,8 @@
183 <script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script> 183 <script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script>
184 <!-- tts --> 184 <!-- tts -->
185 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script> 185 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
  186 +<!-- minute_timer.js -->
  187 +<script src="/real_control_v2/js/minute_timer.js" merge="custom_js"></script>
186 188
187 <!-- echart --> 189 <!-- echart -->
188 <script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script> 190 <script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>