Commit d9ac9259a1cb443dd25f92d200ceb74c10db8ca2
1 parent
50952d32
update...
Showing
4 changed files
with
14 additions
and
10 deletions
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
| @@ -20,12 +20,12 @@ import java.util.List; | @@ -20,12 +20,12 @@ import java.util.List; | ||
| 20 | * Created by panzhao on 2017/4/6. | 20 | * Created by panzhao on 2017/4/6. |
| 21 | */ | 21 | */ |
| 22 | @Component | 22 | @Component |
| 23 | -public class SafeDrivDataLoadThread extends Thread{ | 23 | +public class SafeDrivDataLoadThread extends Thread { |
| 24 | 24 | ||
| 25 | Logger logger = LoggerFactory.getLogger(this.getClass()); | 25 | Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 26 | 26 | ||
| 27 | static String url; | 27 | static String url; |
| 28 | - static CloseableHttpClient httpClient = null; | 28 | + static CloseableHttpClient httpClient; |
| 29 | static HttpGet get; | 29 | static HttpGet get; |
| 30 | static RequestConfig requestConfig; | 30 | static RequestConfig requestConfig; |
| 31 | static CloseableHttpResponse response; | 31 | static CloseableHttpResponse response; |
| @@ -51,9 +51,7 @@ public class SafeDrivDataLoadThread extends Thread{ | @@ -51,9 +51,7 @@ public class SafeDrivDataLoadThread extends Thread{ | ||
| 51 | 51 | ||
| 52 | int statusCode = response.getStatusLine().getStatusCode(); | 52 | int statusCode = response.getStatusLine().getStatusCode(); |
| 53 | if(statusCode != 200){ | 53 | if(statusCode != 200){ |
| 54 | - get.abort(); | ||
| 55 | logger.error("http client status code: " + statusCode); | 54 | logger.error("http client status code: " + statusCode); |
| 56 | - return; | ||
| 57 | } | 55 | } |
| 58 | 56 | ||
| 59 | entity = response.getEntity(); | 57 | entity = response.getEntity(); |
| @@ -67,7 +65,7 @@ public class SafeDrivDataLoadThread extends Thread{ | @@ -67,7 +65,7 @@ public class SafeDrivDataLoadThread extends Thread{ | ||
| 67 | 65 | ||
| 68 | list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class); | 66 | list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class); |
| 69 | 67 | ||
| 70 | - for(SafeDriv sd : list){ | 68 | + for (SafeDriv sd : list) { |
| 71 | SafeDrivCenter.put(sd); | 69 | SafeDrivCenter.put(sd); |
| 72 | } | 70 | } |
| 73 | } | 71 | } |
| @@ -75,7 +73,7 @@ public class SafeDrivDataLoadThread extends Thread{ | @@ -75,7 +73,7 @@ public class SafeDrivDataLoadThread extends Thread{ | ||
| 75 | if (null != response) | 73 | if (null != response) |
| 76 | response.close(); | 74 | response.close(); |
| 77 | } catch (Exception e) { | 75 | } catch (Exception e) { |
| 78 | - logger.error("安全驾驶接口报错了" , e.getMessage()); | 76 | + logger.error("安全驾驶接口报错了", e.getMessage()); |
| 79 | } | 77 | } |
| 80 | } | 78 | } |
| 81 | } | 79 | } |
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
| @@ -359,6 +359,10 @@ public class GpsServiceImpl implements GpsService { | @@ -359,6 +359,10 @@ public class GpsServiceImpl implements GpsService { | ||
| 359 | return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0); | 359 | return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0); |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | + public static void main(String[] args){ | ||
| 363 | + System.out.println(getGpsValid(-2147483648)); | ||
| 364 | + } | ||
| 365 | + | ||
| 362 | public Map<String, ArrivalEntity> findArrivalByTs(Long st, Long et, List<DeviceChange> dcs) { | 366 | public Map<String, ArrivalEntity> findArrivalByTs(Long st, Long et, List<DeviceChange> dcs) { |
| 363 | Map<String, ArrivalEntity> map = new HashMap<>(); | 367 | Map<String, ArrivalEntity> map = new HashMap<>(); |
| 364 | 368 |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
| @@ -519,16 +519,18 @@ | @@ -519,16 +519,18 @@ | ||
| 519 | 519 | ||
| 520 | function calcMileageByRoutes(routes, s, e) { | 520 | function calcMileageByRoutes(routes, s, e) { |
| 521 | var code, flag, mileage = 0; | 521 | var code, flag, mileage = 0; |
| 522 | - $.each(routes, function () { | 522 | + $.each(routes, function (i) { |
| 523 | code = this['stationCode']; | 523 | code = this['stationCode']; |
| 524 | if (flag) { | 524 | if (flag) { |
| 525 | if (!this.distances) | 525 | if (!this.distances) |
| 526 | this.distances = 0; | 526 | this.distances = 0; |
| 527 | mileage = gb_common.accAdd(mileage, this.distances); | 527 | mileage = gb_common.accAdd(mileage, this.distances); |
| 528 | } | 528 | } |
| 529 | - if (code == s) | 529 | + if (code == s){ |
| 530 | flag = true; | 530 | flag = true; |
| 531 | - if (code == e) | 531 | + return true; |
| 532 | + } | ||
| 533 | + if (i > 0 && code == e) | ||
| 532 | return false; | 534 | return false; |
| 533 | }); | 535 | }); |
| 534 | return mileage; | 536 | return mileage; |
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/layout.html
| @@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
| 53 | {{/if}} | 53 | {{/if}} |
| 54 | </dd> | 54 | </dd> |
| 55 | <dd>{{obj.section_name}}</dd> | 55 | <dd>{{obj.section_name}}</dd> |
| 56 | - <dd>{{obj.lineName}}</dd> | 56 | + <dd title="{{obj.lineName}}">{{obj.lineName}}</dd> |
| 57 | </dl> | 57 | </dl> |
| 58 | {{/each}} | 58 | {{/each}} |
| 59 | {{if array.length==0}} | 59 | {{if array.length==0}} |