update

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