Commit 65a3b3b6a460fd2f6c6ec40f9b2d456832f2b08e
1 parent
a9ef062e
1.青浦加入test环境配置
Showing
5 changed files
with
180 additions
and
1 deletions
src/main/java/com/bsth/XDApplication.java
| @@ -129,6 +129,9 @@ public class XDApplication implements CommandLineRunner { | @@ -129,6 +129,9 @@ public class XDApplication implements CommandLineRunner { | ||
| 129 | case "prod": | 129 | case "prod": |
| 130 | prodInit(); | 130 | prodInit(); |
| 131 | break; | 131 | break; |
| 132 | + case "test": | ||
| 133 | + testInit(); | ||
| 134 | + break; | ||
| 132 | } | 135 | } |
| 133 | }catch (Exception e){ | 136 | }catch (Exception e){ |
| 134 | log.error("线调后台启动出现异常!!", e); | 137 | log.error("线调后台启动出现异常!!", e); |
| @@ -210,4 +213,48 @@ public class XDApplication implements CommandLineRunner { | @@ -210,4 +213,48 @@ public class XDApplication implements CommandLineRunner { | ||
| 210 | //线路版本更新 | 213 | //线路版本更新 |
| 211 | //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS); | 214 | //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS); |
| 212 | } | 215 | } |
| 216 | + | ||
| 217 | + public void testInit(){ | ||
| 218 | + log.info("testInit..."); | ||
| 219 | + ScheduledExecutorService sexec = Application.mainServices; | ||
| 220 | + //安全驾驶 | ||
| 221 | + //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS); | ||
| 222 | + | ||
| 223 | + /** 线调业务 */ | ||
| 224 | + sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程 | ||
| 225 | + sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点 | ||
| 226 | + GpsDataLoaderThread.setFlag(-1); | ||
| 227 | + sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据 | ||
| 228 | + sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码 | ||
| 229 | + | ||
| 230 | + sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | ||
| 231 | + sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 | ||
| 232 | + sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库 | ||
| 233 | + sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 | ||
| 234 | + //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) | ||
| 235 | + sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | ||
| 236 | + sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新 | ||
| 237 | + sexec.scheduleWithFixedDelay(whiteIpDataLoader, 0, 1, TimeUnit.MINUTES);//IP白名单数据更新 | ||
| 238 | + sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行 | ||
| 239 | + DirectivePushQueue.start();//消息队列 -指令,系统下发的 | ||
| 240 | + WebSocketPushQueue.start();//消息队列 -webSocket ,推送至线调web页面的 | ||
| 241 | + | ||
| 242 | + /** 线调为其他程序提供的数据 --写入数据库 */ | ||
| 243 | + //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息(发车屏、信息发布) | ||
| 244 | + //线路首末班数据(网关用,班次更新时写入) | ||
| 245 | + //com.bsth.data.schedule.f_a_l.FirstAndLastHandler | ||
| 246 | + //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息(网关用,补信号) | ||
| 247 | + | ||
| 248 | + //运管处静态数据提交 | ||
| 249 | + //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处"); | ||
| 250 | + //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | ||
| 251 | + //计算油、公里加注 | ||
| 252 | + sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | ||
| 253 | + | ||
| 254 | + //线路版本更新 | ||
| 255 | + sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS); | ||
| 256 | + | ||
| 257 | + //线路版本更新 | ||
| 258 | + //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS); | ||
| 259 | + } | ||
| 213 | } | 260 | } |
src/main/resources/application-test.properties
0 → 100644
| 1 | +server.port=9088 | ||
| 2 | +management.port= 9001 | ||
| 3 | +management.address= 127.0.0.1 | ||
| 4 | + | ||
| 5 | +dubbo.use= false | ||
| 6 | + | ||
| 7 | +spring.jpa.hibernate.ddl-auto= none | ||
| 8 | +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 9 | +#DATABASE | ||
| 10 | +spring.jpa.database= MYSQL | ||
| 11 | +spring.jpa.show-sql= true | ||
| 12 | +spring.datasource.driver-class-name= com.mysql.jdbc.Driver | ||
| 13 | +spring.datasource.url= jdbc:mysql://192.168.40.82/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | ||
| 14 | +spring.datasource.username= root | ||
| 15 | +spring.datasource.password= root2jsp | ||
| 16 | +#DATASOURCE | ||
| 17 | +spring.datasource.max-active=100 | ||
| 18 | +spring.datasource.max-idle=8 | ||
| 19 | +spring.datasource.min-idle=8 | ||
| 20 | +spring.datasource.initial-size=5 | ||
| 21 | + | ||
| 22 | +spring.datasource.test-on-borrow=true | ||
| 23 | +spring.datasource.test-on-connect=true | ||
| 24 | +spring.datasource.test-on-return=true | ||
| 25 | +spring.datasource.test-while-idle=true | ||
| 26 | +spring.datasource.validation-query=select 1 | ||
| 27 | + | ||
| 28 | +## gateway real data | ||
| 29 | +http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/ | ||
| 30 | +## gateway send directive | ||
| 31 | +http.send.directive = http://192.168.40.82:8080/transport_server/message/ | ||
| 32 | +## enabled | ||
| 33 | +enabled.whiteip= false |
src/main/resources/application.properties
src/main/resources/datatools/config-test.properties
0 → 100644
| 1 | +# 配置数据导入导出用到的配置信息 | ||
| 2 | + | ||
| 3 | +# 1、kettle配置文件路径(类路径) | ||
| 4 | +datatools.kettle_properties=/datatools/kettle.properties | ||
| 5 | +# 2、ktr文件通用配置变量(数据库连接,根据不同的环境需要修正) | ||
| 6 | + | ||
| 7 | +#数据库ip地址 | ||
| 8 | +datatools.kvars_dbip=192.168.40.82 | ||
| 9 | +#数据库用户名 | ||
| 10 | +datatools.kvars_dbuname=root | ||
| 11 | +#数据库密码 | ||
| 12 | +datatools.kvars_dbpwd=root2jsp | ||
| 13 | +#数据库库名 | ||
| 14 | +datatools.kvars_dbdname=control | ||
| 15 | + | ||
| 16 | +# 3、上传数据配置信息 | ||
| 17 | +# 上传文件目录配置(根据不同的环境需要修正) | ||
| 18 | +datatools.fileupload_dir=/home/bsth_control_u_d_files | ||
| 19 | +# ktr转换文件,中配置的错误输出目录(根据不同的环境需要修正) | ||
| 20 | +datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput | ||
| 21 | +# 临时输出文件目录 | ||
| 22 | +datatools.trans_tempdir=/home/bsth_control_u_d_files/temp | ||
| 23 | +# 模版文件目录 | ||
| 24 | +datatools.trans_templatedir=/home/bsth_control_u_d_files/template | ||
| 25 | + | ||
| 26 | +##---------------------------- 导入数据ktr ----------------------------## | ||
| 27 | +# 车辆信息导入ktr转换 | ||
| 28 | +datatools.cars_datainputktr=/datatools/ktrs/carsDataInput.ktr | ||
| 29 | +# 人员信息导入 | ||
| 30 | +datatools.employees_datainputktr=/datatools/ktrs/employeesDataInput.ktr | ||
| 31 | +# 路牌信息导入 | ||
| 32 | +datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr | ||
| 33 | +# 时刻表基础信息导入 | ||
| 34 | +datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr | ||
| 35 | +# 时刻表明细信息导入(元数据) | ||
| 36 | +datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr | ||
| 37 | +# 时刻表明细编辑用数据 | ||
| 38 | +datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | ||
| 39 | +# 时刻表明细信息导入 | ||
| 40 | +datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr | ||
| 41 | +# 时刻表明细信息导入2 | ||
| 42 | +datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr | ||
| 43 | +# 时刻表明细信息导入2(版本化) | ||
| 44 | +datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr | ||
| 45 | +# 时刻表明细信息导入2(版本化),使用生成时刻表格式 | ||
| 46 | +datatools.ttinfodetail_datainputktr2version2=/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr | ||
| 47 | + | ||
| 48 | +# 车辆配置信息导入 | ||
| 49 | +datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr | ||
| 50 | +# 人员配置信息导入 | ||
| 51 | +datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.ktr | ||
| 52 | + | ||
| 53 | +# 排版规则信息导入 | ||
| 54 | +datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr | ||
| 55 | + | ||
| 56 | +# 4、数据导出配置信息 | ||
| 57 | +# 导出数据文件目录配置(根据不同的环境需要修正) | ||
| 58 | +datatools.fileoutput_dir=/home/bsth_control_u_d_files | ||
| 59 | + | ||
| 60 | +##---------------------------- 导出数据ktr -----------------------------## | ||
| 61 | +# 车辆信息导出ktr转换 | ||
| 62 | +datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr | ||
| 63 | +# 人员信息导出ktr转换 | ||
| 64 | +datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr | ||
| 65 | +# 时刻表导出元数据ktr转换 | ||
| 66 | +datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr | ||
| 67 | +# 时刻表导出数据ktr转换 | ||
| 68 | +datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr | ||
| 69 | +# 排版规则导出数据ktr转换 | ||
| 70 | +datatools.schedulerule_output=/datatools/ktrs/scheduleRuleDataOutput.ktr | ||
| 71 | + | ||
| 72 | +# 车辆配置信息导出ktr转换 | ||
| 73 | +datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr | ||
| 74 | +# 人员配置信息导出ktr转换 | ||
| 75 | +datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr | ||
| 76 | + | ||
| 77 | +# 路牌信息导出 | ||
| 78 | +datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr | ||
| 79 | + | ||
| 80 | +# 用户登录日志导出 | ||
| 81 | +datatools.usersign_dataoutputktr=/datatools/ktrs/userSignLogOutput.ktr | ||
| 82 | + | ||
| 83 | +# TODO: |
src/main/resources/dubbo/config-test.properties
0 → 100644
| 1 | +# application名字 | ||
| 2 | +spring.dubbo.application.name=bsth_control_v_multi_service | ||
| 3 | +# zookeeper注册中心地址 | ||
| 4 | +spring.dubbo.registry=zookeeper://127.0.0.1:2181 | ||
| 5 | +# protocol配置 | ||
| 6 | +spring.dubbo.protocol.name=dubbo | ||
| 7 | +spring.dubbo.protocol.port=30881 | ||
| 8 | + | ||
| 9 | +#----------- dubbo:consumer 性能调优选项 -------------# | ||
| 10 | +# 远程服务调用超时时间,单位毫秒,这里设置30分钟 | ||
| 11 | +spring.dubbo.consumer.timeout=1800000 | ||
| 12 | +# 远程服务调用重试次数,0表示不需要重试 | ||
| 13 | +spring.dubbo.consumer.retries=0 | ||
| 14 | +#----------- dubbo:consumer 服务治理选项 -------------# | ||
| 15 | +# 启动不检查提供者是否存在 | ||
| 16 | +spring.dubbo.consumer.check=false |