潘钊 / bsth_control · Commits

Commit d2550f64c917bf7a0b0bb65edfa2dabf423b175d

Authored by 廖磊
2 parents 89519584 e99fff41
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control 

into pudong
Inline Side-by-side
Showing 11 changed files with 280 additions and 182 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @d2550f6
@@ -134,7 +134,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, @@ -134,7 +134,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
134 * @throws 134 * @throws
135 */ 135 */
136 @RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST) 136 @RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
137 - public Map<String, Object> realOutAdjust(Map<String, String> map) { 137 + public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
138 return scheduleRealInfoService.realOutAdjust(map); 138 return scheduleRealInfoService.realOutAdjust(map);
139 } 139 }
140 140
src/main/java/com/bsth/data/gpsdata_v2/thread/GpsDataLoaderThread.java
  View file @d2550f6
@@ -32,11 +32,11 @@ public class GpsDataLoaderThread extends Thread { @@ -32,11 +32,11 @@ public class GpsDataLoaderThread extends Thread {
32 @Override 32 @Override
33 public void run() { 33 public void run() {
34 try { 34 try {
35 - List<GpsEntity> list = GatewayHttpLoader.load();  
36 -// if (flag == 0)  
37 -// list = SocketClientLoader.load();  
38 -// else  
39 -// list = GatewayHttpLoader.load(); 35 + List<GpsEntity> list;
  36 + if (flag == 0)
  37 + list = SocketClientLoader.load();
  38 + else
  39 + list = GatewayHttpLoader.load();
40 40
41 if(null != list && list.size() > 0) 41 if(null != list && list.size() > 0)
42 handleProcess.handle(list); 42 handleProcess.handle(list);
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @d2550f6
@@ -238,6 +238,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -238,6 +238,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
238 report2repair.put("9103", "9103"); 238 report2repair.put("9103", "9103");
239 report2repair.put("9104", "9104"); 239 report2repair.put("9104", "9104");
240 report2repair.put("9109", "9109"); 240 report2repair.put("9109", "9109");
  241 + report2repair.put("9201", "9201");
  242 + report2repair.put("9202", "9202");
  243 + report2repair.put("9203", "9203");
  244 + report2repair.put("9204", "9204");
  245 + report2repair.put("9209", "9209");
  246 + report2repair.put("9301", "9301");
  247 + report2repair.put("9302", "9302");
  248 + report2repair.put("9303", "9303");
  249 + report2repair.put("9304", "9304");
  250 + report2repair.put("9305", "9305");
  251 + report2repair.put("9306", "9306");
  252 + report2repair.put("9309", "9309");
241 } 253 }
242 254
243 255
@@ -6352,7 +6364,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6352,7 +6364,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6352 while (it.hasNext()) { 6364 while (it.hasNext()) {
6353 RepairReport rr = it.next(); 6365 RepairReport rr = it.next();
6354 repairReport(rr); 6366 repairReport(rr);
6355 - if (rr.getReportState() == 1) queue.remove(rr); 6367 + if (rr.getReportState() == 1 || System.currentTimeMillis() - rr.getReportDate().getTime() > 86400000) queue.remove(rr);
6356 } 6368 }
6357 } catch (Exception e) { 6369 } catch (Exception e) {
6358 logger.error("维修上报重发错误", e); 6370 logger.error("维修上报重发错误", e);
src/main/resources/application-prodtest.properties
  View file @d2550f6
1 -server.port=9088  
2 -#management.port= 9001  
3 -#management.address= 127.0.0.1  
4 -management.security.enabled=false  
5 -management.context-path=/manage  
6 -dubbo.use=true  
7 -  
8 -spring.jpa.hibernate.ddl-auto= update  
9 -spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy  
10 -#DATABASE  
11 -spring.jpa.database= MYSQL  
12 -spring.jpa.show-sql= false  
13 -spring.datasource.driver-class-name= com.mysql.jdbc.Driver  
14 -spring.datasource.url= jdbc:mysql://10.10.150.24:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false  
15 -spring.datasource.username= root  
16 -spring.datasource.password= root2jsp  
17 -#DATASOURCE  
18 -spring.datasource.max-active=100  
19 -spring.datasource.max-idle=8  
20 -spring.datasource.min-idle=8  
21 -spring.datasource.initial-size=5  
22 -  
23 -spring.datasource.test-on-borrow=true  
24 -spring.datasource.test-on-connect=true  
25 -spring.datasource.test-on-return=true  
26 -spring.datasource.test-while-idle=true  
27 -spring.datasource.validation-query=select 1  
28 -  
29 -## gps client data  
30 -http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all  
31 -## gateway real data  
32 -http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/  
33 -## gateway send directive  
34 -http.send.directive = http://10.10.200.79:8080/transport_server/message/  
35 -## wxsb  
36 -#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do  
37 -#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do  
38 -#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do  
39 -#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do  
40 -http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do  
41 -http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do  
42 -http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do 1 +server.port=9088
  2 +#management.port= 9001
  3 +#management.address= 127.0.0.1
  4 +management.security.enabled=false
  5 +management.context-path=/manage
  6 +dubbo.use=true
  7 +
  8 +spring.jpa.hibernate.ddl-auto= update
  9 +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
  10 +#DATABASE
  11 +spring.jpa.database= MYSQL
  12 +spring.jpa.show-sql= false
  13 +spring.datasource.driver-class-name= com.mysql.jdbc.Driver
  14 +spring.datasource.url= jdbc:mysql://10.10.150.24:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  15 +spring.datasource.username= root
  16 +spring.datasource.password= root2jsp
  17 +#DATASOURCE
  18 +spring.datasource.max-active=100
  19 +spring.datasource.max-idle=8
  20 +spring.datasource.min-idle=8
  21 +spring.datasource.initial-size=5
  22 +
  23 +spring.datasource.test-on-borrow=true
  24 +spring.datasource.test-on-connect=true
  25 +spring.datasource.test-on-return=true
  26 +spring.datasource.test-while-idle=true
  27 +spring.datasource.validation-query=select 1
  28 +
  29 +## gps client data
  30 +http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
  31 +## gateway real data
  32 +http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
  33 +## gateway send directive
  34 +http.send.directive = http://10.10.200.79:8080/transport_server/message/
  35 +## wxsb
  36 +#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
  37 +#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
  38 +#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
  39 +#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
  40 +http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
  41 +http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
  42 +http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
43 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do 43 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
44 \ No newline at end of file 44 \ No newline at end of file
src/main/resources/datatools/config-prodtest.properties
  View file @d2550f6
1 -# 配置数据导入导出用到的配置信息  
2 -  
3 -# 1、kettle配置文件路径（类路径）  
4 -datatools.kettle_properties=/datatools/kettle.properties  
5 -# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）  
6 -  
7 -#数据库ip地址  
8 -datatools.kvars_dbip=10.10.150.24  
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 -# TODO： 1 +# 配置数据导入导出用到的配置信息
  2 +
  3 +# 1、kettle配置文件路径（类路径）
  4 +datatools.kettle_properties=/datatools/kettle.properties
  5 +# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
  6 +
  7 +#数据库ip地址
  8 +datatools.kvars_dbip=10.10.150.24
  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 +# TODO：
src/main/resources/dubbo/config-prod.properties
  View file @d2550f6
1 -# application名字  
2 -spring.dubbo.application.name=bsth_control_v2  
3 -# zookeeper注册中心地址  
4 -spring.dubbo.registry=zookeeper://127.0.0.1:2181  
5 -  
6 -#----------- dubbo:consumer 性能调优选项 -------------#  
7 -# 远程服务调用超时时间，单位毫秒，这里设置30分钟  
8 -spring.dubbo.consumer.timeout=1800000  
9 -# 远程服务调用重试次数，0表示不需要重试  
10 -spring.dubbo.consumer.retries=0  
11 -#----------- dubbo:consumer 服务治理选项 -------------#  
12 -# 启动不检查提供者是否存在  
13 -spring.dubbo.consumer.check=false 1 +# application名字
  2 +spring.dubbo.application.name=bsth_control_v2
  3 +# zookeeper注册中心地址
  4 +spring.dubbo.registry=zookeeper://127.0.0.1:2181
  5 +
  6 +#----------- dubbo:consumer 性能调优选项 -------------#
  7 +# 远程服务调用超时时间，单位毫秒，这里设置30分钟
  8 +spring.dubbo.consumer.timeout=1800000
  9 +# 远程服务调用重试次数，0表示不需要重试
  10 +spring.dubbo.consumer.retries=0
  11 +#----------- dubbo:consumer 服务治理选项 -------------#
  12 +# 启动不检查提供者是否存在
  13 +spring.dubbo.consumer.check=false
src/main/resources/dubbo/config-prodtest.properties
  View file @d2550f6
1 -# application名字  
2 -spring.dubbo.application.name=bsth_control_v2  
3 -# zookeeper注册中心地址  
4 -spring.dubbo.registry=zookeeper://127.0.0.1:2181  
5 -  
6 -#----------- dubbo:consumer 性能调优选项 -------------#  
7 -# 远程服务调用超时时间，单位毫秒，这里设置30分钟  
8 -spring.dubbo.consumer.timeout=1800000  
9 -# 远程服务调用重试次数，0表示不需要重试  
10 -spring.dubbo.consumer.retries=0  
11 -#----------- dubbo:consumer 服务治理选项 -------------#  
12 -# 启动不检查提供者是否存在  
13 -spring.dubbo.consumer.check=false 1 +# application名字
  2 +spring.dubbo.application.name=bsth_control_v2
  3 +# zookeeper注册中心地址
  4 +spring.dubbo.registry=zookeeper://127.0.0.1:2181
  5 +
  6 +#----------- dubbo:consumer 性能调优选项 -------------#
  7 +# 远程服务调用超时时间，单位毫秒，这里设置30分钟
  8 +spring.dubbo.consumer.timeout=1800000
  9 +# 远程服务调用重试次数，0表示不需要重试
  10 +spring.dubbo.consumer.retries=0
  11 +#----------- dubbo:consumer 服务治理选项 -------------#
  12 +# 启动不检查提供者是否存在
  13 +spring.dubbo.consumer.check=false
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
  View file @d2550f6
@@ -182,8 +182,7 @@ @@ -182,8 +182,7 @@
182 (function() { 182 (function() {
183 var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他']; 183 var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
184 var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}]; 184 var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
185 - var modal = '#schedule-fcxxwt-modal'  
186 - ,sch; 185 + var modal = '#schedule-fcxxwt-modal', sch, isReport = false;
187 $(modal).on('init', function(e, data) { 186 $(modal).on('init', function(e, data) {
188 e.stopPropagation(); 187 e.stopPropagation();
189 sch=data.sch; 188 sch=data.sch;
@@ -216,6 +215,7 @@ @@ -216,6 +215,7 @@
216 for (var j = 0;j < reportTypes.length;j++) { 215 for (var j = 0;j < reportTypes.length;j++) {
217 if (items[i] == reportTypes[j].name) { 216 if (items[i] == reportTypes[j].name) {
218 $('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true); 217 $('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
  218 + isReport = true;
219 } 219 }
220 } 220 }
221 } 221 }
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 var f = $('form', modal).formValidation(gb_form_validation_opts); 226 var f = $('form', modal).formValidation(gb_form_validation_opts);
227 f.on('success.form.fv', function(e) { 227 f.on('success.form.fv', function(e) {
228 e.preventDefault(); 228 e.preventDefault();
229 - var data = $(this).serializeJSON(); 229 + var data = $(this).serializeJSON(), reportText = new Array();
230 230
231 //校验实发实达时间 231 //校验实发实达时间
232 if(!validation_s_e_Time(data)){ 232 if(!validation_s_e_Time(data)){
@@ -239,11 +239,40 @@ @@ -239,11 +239,40 @@
239 //修改里程 239 //修改里程
240 var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0; 240 var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
241 // 修改报修类型为字符串 241 // 修改报修类型为字符串
242 - if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");  
243 if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){ 242 if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
244 notify_err("当前操作需要选择调整原因！"); 243 notify_err("当前操作需要选择调整原因！");
245 return; 244 return;
246 } 245 }
  246 + if (data.reportTypes) {
  247 + for (var i = 0;i < data.reportTypes.length;i++) {
  248 + for (var j = 0;j < reportTypes.length;j++) {
  249 + if (data.reportTypes[i] == reportTypes[j].code) {
  250 + reportText.push(reportTypes[j].name);
  251 + break;
  252 + }
  253 + }
  254 + }
  255 + if (!isReport) {
  256 + layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
  257 + btn : [ '确定', '取消' ],
  258 + icon : 3,
  259 + skin : 'layui-layer-cfm-add'
  260 + }, function() {
  261 + layer.closeAll();
  262 + // 修改报修类型为字符串
  263 + data.reportTypes = data.reportTypes.join(";");
  264 + postData(data);
  265 + }, function() {
  266 + $('.uk-button-primary').attr('disabled', false);
  267 + });
  268 + return;
  269 + }
  270 +
  271 + data.reportTypes = data.reportTypes.join(";");
  272 + postData(data);
  273 + return;
  274 + }
  275 +
247 postData(data); 276 postData(data);
248 }); 277 });
249 278
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
  View file @d2550f6
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <div class="uk-form-row"> 14 <div class="uk-form-row">
15 <label class="uk-form-label" >车辆</label> 15 <label class="uk-form-label" >车辆</label>
16 <div class="uk-form-controls"> 16 <div class="uk-form-controls">
17 - <input type="text" value="{{sch.clZbh}}" disabled> 17 + <input type="text" name="clZbh" value="{{sch.clZbh}}" readonly>
18 </div> 18 </div>
19 </div> 19 </div>
20 </div> 20 </div>
@@ -83,24 +83,65 @@ @@ -83,24 +83,65 @@
83 83
84 <script> 84 <script>
85 (function() { 85 (function() {
86 - var modal = '#schedule-sftz-modal',  
87 - sch; 86 + var modal = '#schedule-sftz-modal', sch, isReport = false;
88 var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}]; 87 var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
89 $(modal).on('init', function(e, data) { 88 $(modal).on('init', function(e, data) {
90 e.stopPropagation(); 89 e.stopPropagation();
91 sch = data.sch; 90 sch = data.sch;
  91 + debugger;
92 var formHtml = template('schedule-sftz-form-temp', {sch: sch, reportTypes:reportTypes}); 92 var formHtml = template('schedule-sftz-form-temp', {sch: sch, reportTypes:reportTypes});
93 $('form', modal).html(formHtml); 93 $('form', modal).html(formHtml);
  94 + $('input:checkbox').click(function(){
  95 + var remark = $('[name=remarks]').val(), title = $(this).prop("title");
  96 + if ($(this).prop('checked')) {
  97 + if (remark.indexOf(title) > -1) return;
  98 + $('[name=remarks]').val((remark ? remark + ";" : "") + title);
  99 + } else {
  100 + $('[name=remarks]').val(remark.replace(";" + title, "").replace(title + ";", "").replace(title, ""));
  101 + }
  102 + });
94 103
95 //submit 104 //submit
96 var f = $('form', modal).formValidation(gb_form_validation_opts); 105 var f = $('form', modal).formValidation(gb_form_validation_opts);
97 f.on('success.form.fv', function(e) { 106 f.on('success.form.fv', function(e) {
98 e.preventDefault(); 107 e.preventDefault();
99 - var data = $(this).serializeJSON(); 108 + var data = $(this).serializeJSON(), reportText = new Array();
100 109
101 - // 修改报修类型为字符串  
102 - if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");  
103 - gb_common.$post('/realSchedule/realOutAdjust', data, function(rs) { 110 + if (data.reportTypes) {
  111 + for (var i = 0;i < data.reportTypes.length;i++) {
  112 + for (var j = 0;j < reportTypes.length;j++) {
  113 + if (data.reportTypes[i] == reportTypes[j].code) {
  114 + reportText.push(reportTypes[j].name);
  115 + break;
  116 + }
  117 + }
  118 + }
  119 + if (!isReport) {
  120 + layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
  121 + btn : [ '确定', '取消' ],
  122 + icon : 3,
  123 + skin : 'layui-layer-cfm-add'
  124 + }, function() {
  125 + layer.closeAll();
  126 + // 修改报修类型为字符串
  127 + data.reportTypes = data.reportTypes.join(";");
  128 + postData(data);
  129 + }, function() {
  130 + $('.uk-button-primary').attr('disabled', false);
  131 + });
  132 + return;
  133 + }
  134 +
  135 + data.reportTypes = data.reportTypes.join(";");
  136 + postData(data);
  137 + return;
  138 + }
  139 +
  140 + postData(data);
  141 + });
  142 +
  143 + var postData = function (data) {
  144 + gb_common.$post('/realSchedule/realOutAdjust', data, function(rs) {
104 if (rs.ts) { 145 if (rs.ts) {
105 //更新前端数据 146 //更新前端数据
106 gb_schedule_table.updateSchedule(rs.ts); 147 gb_schedule_table.updateSchedule(rs.ts);
@@ -111,7 +152,7 @@ @@ -111,7 +152,7 @@
111 gb_schedule_table.calc_yfwf_num(sch.xlBm); 152 gb_schedule_table.calc_yfwf_num(sch.xlBm);
112 } 153 }
113 }); 154 });
114 - }); 155 + }
115 156
116 // 维修类型选中 157 // 维修类型选中
117 var initReport = function() { 158 var initReport = function() {
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/wxsb.html
  View file @d2550f6
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <div class="uk-form-row"> 22 <div class="uk-form-row">
23 <label class="uk-form-label" >故障类型</label> 23 <label class="uk-form-label" >故障类型</label>
24 <div class="uk-form-controls"> 24 <div class="uk-form-controls">
25 - <select name="repairTypes"></select> 25 + <select name="reportTypes"></select>
26 </div> 26 </div>
27 </div> 27 </div>
28 </div> 28 </div>
@@ -35,8 +35,7 @@ @@ -35,8 +35,7 @@
35 35
36 <script> 36 <script>
37 (function() { 37 (function() {
38 - var modal = '#schedule-wxsb-modal'  
39 - ,sch; 38 + var modal = '#schedule-wxsb-modal', sch;
40 39
41 $(modal).on('init', function(e, data) { 40 $(modal).on('init', function(e, data) {
42 e.stopPropagation(); 41 e.stopPropagation();
@@ -46,23 +45,40 @@ @@ -46,23 +45,40 @@
46 45
47 //报修类型字典 46 //报修类型字典
48 var opts = new Array(); 47 var opts = new Array();
49 - var repairTypes=[{name:"录像不连续", code:"9201"}, {name:"无录像", code:"9202"}, {name:"录像缺通告", code:"9203"}, {name:"无法调取录像", code:"9204"}, {name:"其它录像报修", code:"9209"}, {name:"黑屏", code:"9301"}, {name:"间歇性黑屏", code:"9302"}, {name:"中门视屏无", code:"9303"}, {name:"卡在启动界面", code:"9304"}, {name:"倒车视频无", code:"9305"}, {name:"启动后显示倒车", code:"9306"}, {name:"其它屏幕报修", code:"9309"}];  
50 - for(var i = 0;i < repairTypes.length;i++){  
51 - opts.push('<option value="'+repairTypes[i].code+'">'+repairTypes[i].name+'</option>'); 48 + var reportTypes = [{name:"录像不连续", code:"9201"}, {name:"无录像", code:"9202"}, {name:"录像缺通告", code:"9203"}, {name:"无法调取录像", code:"9204"}, {name:"其它录像报修", code:"9209"}, {name:"黑屏", code:"9301"}, {name:"间歇性黑屏", code:"9302"}, {name:"中门视屏无", code:"9303"}, {name:"卡在启动界面", code:"9304"}, {name:"倒车视频无", code:"9305"}, {name:"启动后显示倒车", code:"9306"}, {name:"其它屏幕报修", code:"9309"}];
  49 + for(var i = 0;i < reportTypes.length;i++){
  50 + opts.push('<option value="'+reportTypes[i].code+'">'+reportTypes[i].name+'</option>');
52 } 51 }
53 - $('[name=repairTypes]', modal).html(opts.join("")); 52 + $('[name=reportTypes]', modal).html(opts.join(""));
54 53
55 //submit 54 //submit
56 var f = $('form', modal).formValidation(gb_form_validation_opts); 55 var f = $('form', modal).formValidation(gb_form_validation_opts);
57 f.on('success.form.fv', function(e) { 56 f.on('success.form.fv', function(e) {
58 e.preventDefault(); 57 e.preventDefault();
59 $('[type=submit]', f).attr('disabled', 'disabled'); 58 $('[type=submit]', f).attr('disabled', 'disabled');
60 - var data = $(this).serializeJSON();  
61 - gb_common.$post('/realSchedule/wxsb', data, function(rs){  
62 - //更新班次信息  
63 - notify_succ('操作成功!');  
64 - UIkit.modal(modal).hide();  
65 - }); 59 + var data = $(this).serializeJSON(), reportText = new Array();
  60 +
  61 + for (var j = 0;j < reportTypes.length;j++) {
  62 + if (data.reportTypes == reportTypes[j].code) {
  63 + reportText.push(reportTypes[j].name);
  64 + break;
  65 + }
  66 + }
  67 +
  68 + layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
  69 + btn : [ '确定', '取消' ],
  70 + icon : 3,
  71 + skin : 'layui-layer-cfm-add'
  72 + }, function() {
  73 + layer.closeAll();
  74 + gb_common.$post('/realSchedule/wxsb', data, function(rs){
  75 + //更新班次信息
  76 + notify_succ('操作成功!');
  77 + UIkit.modal(modal).hide();
  78 + });
  79 + }, function() {
  80 + $('.uk-button-primary').attr('disabled', false);
  81 + });
66 }); 82 });
67 }); 83 });
68 })(); 84 })();
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
  View file @d2550f6
@@ -289,7 +289,7 @@ var gb_schedule_context_menu = (function () { @@ -289,7 +289,7 @@ var gb_schedule_context_menu = (function () {
289 wxsb: function (sch) { 289 wxsb: function (sch) {
290 open_modal(folder + '/wxsb.html', { 290 open_modal(folder + '/wxsb.html', {
291 sch: sch 291 sch: sch
292 - }, modal_opts); 292 + }, {center: true, bgclose: false, modal: true});
293 } 293 }
294 }; 294 };
295 295