潘钊 / bsth_control · Commits

Commit 657931dab0eb074cdf977776ec5dd4fdf3780f64

Authored by 潘钊
1 parent e61c8124
build: skipped

update

Inline Side-by-side
Showing 7 changed files with 17 additions and 16 deletions
src/main/java/com/bsth/StartCommand.java
  View file @657931d
... ... @@ -93,14 +93,14 @@ public class StartCommand implements CommandLineRunner{
93 93 * 每15秒从数据库抓取到离站信息和班次匹配
94 94 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
95 95 */
96   - //scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
  96 + scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
97 97  
98 98 /**
99 99 * 首个调度指令下发（2分钟运行一次）
100 100 * 每辆车的第一个调度指令由该线程下发
101 101 * 后续班次由 “实际终点到达” 事件触发指令下发
102 102 */
103   - //scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
  103 + scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
104 104  
105 105 } catch (Exception e) {
106 106 e.printStackTrace();
... ...
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
  View file @657931d
... ... @@ -48,7 +48,7 @@ public class GetSchedulePlanThread extends Thread{
48 48 ScheduleBuffer.clear();
49 49  
50 50 List<ScheduleRealInfo> realList = null;
51   - String dateStr = /*sdfyyyyMMdd.format(new Date())*/"2016-06-01";
  51 + String dateStr = sdfyyyyMMdd.format(new Date());
52 52 Date cDate = sdfyyyyMMdd.parse(dateStr);
53 53 //查询数据库是否有今日排班
54 54 int size = scheduleRealInfoRepository.countByDate(cDate);
... ...
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
  View file @657931d
... ... @@ -157,7 +157,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt;
157 157 LineChangeData data = new LineChangeData();
158 158 data.setCityCode(cityCode);
159 159 data.setDeviceId(deviceId);
160   - data.setLineId(String.valueOf(lineId));
  160 + data.setLineId("00" + String.valueOf(lineId));
161 161  
162 162 change.setDeviceId(deviceId);
163 163 change.setOperCode((short) 0X64);
... ...
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
  View file @657931d
... ... @@ -220,8 +220,8 @@ public class GpsArrivalStationThread extends Thread{
220 220 try {
221 221 conn = DBUtils_MS.getConnection();
222 222 ps = conn.prepareStatement(sql);
223   - ps.setInt(1, /*weeks_year*/28);
224   - ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467853749000L);
  223 + ps.setInt(1, weeks_year/*28*/);
  224 + ps.setLong(2, GpsArrivalDataBuffer.markTime/*1467853749000L*/);
225 225  
226 226 Long t = System.currentTimeMillis();
227 227 rs = ps.executeQuery();
... ...
src/main/java/com/bsth/vehicle/gpsdata/entity/ArrivalInfo.java
  View file @657931d
1 1 package com.bsth.vehicle.gpsdata.entity;
2 2  
3   -import java.text.ParseException;
4 3 import java.text.SimpleDateFormat;
5 4 import java.util.Date;
6 5  
... ... @@ -26,12 +25,12 @@ public class ArrivalInfo {
26 25 this.deviceId = deviceId;
27 26  
28 27 //gps是2014年的数据，临时将ts拉到6月1号
29   - try {
  28 + /*try {
30 29 this.ts = sdf2.parse("2016-06-01 " + sdf.format(new Date(ts))).getTime();
31 30 } catch (ParseException e) {
32 31 e.printStackTrace();
33   - }
34   - //this.ts = ts;
  32 + }*/
  33 + this.ts = ts;
35 34  
36 35  
37 36 this.lineCode = lineCode;
... ...
src/main/resources/application.properties
  View file @657931d
1 1 spring.profiles: dev,prod
2   -spring.profiles.active: dev
  2 +spring.profiles.active: prod
3 3  
4 4 spring.view.suffix=.html
5 5 server.session-timeout=-1
... ...
src/main/resources/datatools/config.properties
  View file @657931d
1 1 # 配置数据导入导出用到的配置信息
2 2  
3 3 # 上传文件目录配置（根据不同的环境需要修正）
4   -datatools.fileupload_dir=/Users/xu/resource/project/bsth_control_u_d_files
  4 +datatools.fileupload_dir=/opt/bsth_control_u_d_files
5 5 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
6   -datatools.trans_errordir=/Users/xu/resource/project/bsth_control_u_d_files/erroroutput
  6 +datatools.trans_errordir=/opt/bsth_control_u_d_files/erroroutput
7 7 # 临时输出文件目录
8   -datatools.trans_tempdir=/Users/xu/resource/project/bsth_control_u_d_files/temp
  8 +datatools.trans_tempdir=/opt/bsth_control_u_d_files/temp
9 9  
10 10 #------------------- ktr主配置文件路径（类路径） ------------------
11 11 datatools.kettle_properties=/datatools/kettle.properties
12 12  
13 13 ##------------------ ktr通用变量 ------------------
14 14 #数据库ip地址
15   -datatools.kvars_dbip=192.168.168.201
  15 +#datatools.kvars_dbip=192.168.168.201
  16 +datatools.kvars_dbip=192.168.168.171
16 17 #数据库用户名
17 18 datatools.kvars_dbuname=root
18 19 #数据库密码
19   -datatools.kvars_dbpwd=123456
  20 +#datatools.kvars_dbpwd=123456
  21 +datatools.kvars_dbpwd=root2jsp
20 22  
21 23 # 以下是封装数据导入导出逻辑的ktr转换文件，类路径，以后考虑放到数据库中
22 24 # 测试temp的ktr转换文件
... ...