潘钊 / bsth_control · Commits

Commit 077bf7cd9ba589205a3a5d3afaaccf179394ad32

Authored by 王通
1 parent 1cf95f26
build: skipped

1.计划中区间信息字段与实际中不一致，变更实际中字段

Inline Side-by-side
Showing 11 changed files with 46 additions and 45 deletions
src/main/java/com/bsth/data/directive/DirectiveCreator.java
  View file @077bf7c
@@ -147,7 +147,7 @@ public class DirectiveCreator { @@ -147,7 +147,7 @@ public class DirectiveCreator {
147 data.setLineId(lineCodeStr); 147 data.setLineId(lineCodeStr);
148 int seq = 0; 148 int seq = 0;
149 if (sch != null) { 149 if (sch != null) {
150 - String regionId = sch.getRegionId(); 150 + String regionId = sch.getLineRegion();
151 if (StringUtils.hasText(regionId)) { 151 if (StringUtils.hasText(regionId)) {
152 seq = Integer.parseInt(regionId.split("_")[1]); 152 seq = Integer.parseInt(regionId.split("_")[1]);
153 } 153 }
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
  View file @077bf7c
@@ -75,7 +75,7 @@ public class GpsStateProcess { @@ -75,7 +75,7 @@ public class GpsStateProcess {
75 } 75 }
76 76
77 // 线路编码不一致或者未接收到切换区间线的响应 77 // 线路编码不一致或者未接收到切换区间线的响应
78 - if (!sch.getXlBm().equals(gps.getLineId()) || StringUtils.hasText(sch.getRegionId()) && sch.getRegionSwitchState() == 0) { 78 + if (!sch.getXlBm().equals(gps.getLineId()) || StringUtils.hasText(sch.getLineRegion()) && sch.getRegionSwitchState() == 0) {
79 //切换车载的 线路编码 79 //切换车载的 线路编码
80 gpsStatusManager.changeLine(gps.getNbbm(), sch, "同步@系统"); 80 gpsStatusManager.changeLine(gps.getNbbm(), sch, "同步@系统");
81 } 81 }
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @077bf7c
@@ -445,8 +445,8 @@ public class DayOfSchedule { @@ -445,8 +445,8 @@ public class DayOfSchedule {
445 try{ 445 try{
446 final List<ScheduleRealInfo> pstList = list; 446 final List<ScheduleRealInfo> pstList = list;
447 //写入 447 //写入
448 - jdbcTemplate.batchUpdate("insert into bsth_c_s_sp_info_real(id,bc_type,bcs,bcsj,cl_zbh,create_date,dfsj,directive_state,fcno,fcsj,fcsj_actual,j_gh,j_name,jhlc,lp_name,qdz_code,qdz_name,real_exec_date,remarks,s_gh,s_name,schedule_date,schedule_date_str,sflj,sp_id,status,update_date,xl_bm,xl_dir,xl_name,zdsj,zdsj_actual,zdz_code,zdz_name,ccno,df_auto,fgs_bm,fgs_name,gs_bm,gs_name,online,adjust_exps,reissue,jhlc_orig,sigin_compate,drift_status,cc_service,major_station_name,rfid_state,first_rfid_state)" +  
449 - " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() { 448 + jdbcTemplate.batchUpdate("insert into bsth_c_s_sp_info_real(id,bc_type,bcs,bcsj,cl_zbh,create_date,dfsj,directive_state,fcno,fcsj,fcsj_actual,j_gh,j_name,jhlc,lp_name,qdz_code,qdz_name,real_exec_date,remarks,s_gh,s_name,schedule_date,schedule_date_str,sflj,sp_id,status,update_date,xl_bm,xl_dir,xl_name,zdsj,zdsj_actual,zdz_code,zdz_name,ccno,df_auto,fgs_bm,fgs_name,gs_bm,gs_name,online,adjust_exps,reissue,jhlc_orig,sigin_compate,drift_status,cc_service,major_station_name,rfid_state,first_rfid_state,line_region)" +
  449 + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
450 @Override 450 @Override
451 public void setValues(PreparedStatement ps, int i) throws SQLException { 451 public void setValues(PreparedStatement ps, int i) throws SQLException {
452 ScheduleRealInfo sch = pstList.get(i); 452 ScheduleRealInfo sch = pstList.get(i);
@@ -500,6 +500,7 @@ public class DayOfSchedule { @@ -500,6 +500,7 @@ public class DayOfSchedule {
500 ps.setString(48, sch.getMajorStationName()); 500 ps.setString(48, sch.getMajorStationName());
501 ps.setInt(49, sch.getRfidState()); 501 ps.setInt(49, sch.getRfidState());
502 ps.setInt(50, sch.getFirstRfidState()); 502 ps.setInt(50, sch.getFirstRfidState());
  503 + ps.setString(51, sch.getLineRegion());
503 } 504 }
504 505
505 @Override 506 @Override
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
  View file @077bf7c
@@ -101,7 +101,7 @@ public class SchedulePstThread extends Thread { @@ -101,7 +101,7 @@ public class SchedulePstThread extends Thread {
101 ",qdz_name=?,real_exec_date=?,remarks=?,s_gh=?,s_name=?,schedule_date=?,schedule_date_str=?,sflj=?" + 101 ",qdz_name=?,real_exec_date=?,remarks=?,s_gh=?,s_name=?,schedule_date=?,schedule_date_str=?,sflj=?" +
102 ",sp_id=?,status=?,update_date=?,xl_bm=?,xl_dir=?,xl_name=?,zdsj=?,zdsj_actual=?,zdz_code=?,zdz_name=?" + 102 ",sp_id=?,status=?,update_date=?,xl_bm=?,xl_dir=?,xl_name=?,zdsj=?,zdsj_actual=?,zdz_code=?,zdz_name=?" +
103 ",ccno=?,df_auto=?,fgs_bm=?,fgs_name=?,gs_bm=?,gs_name=?,online=?,adjust_exps=?,reissue=?,jhlc_orig=?" + 103 ",ccno=?,df_auto=?,fgs_bm=?,fgs_name=?,gs_bm=?,gs_name=?,online=?,adjust_exps=?,reissue=?,jhlc_orig=?" +
104 - ",sigin_compate=?,drift_status=?,cc_service=?,major_station_name=?,rfid_state=?,first_rfid_state=?,region_id=? where id=?", new BatchPreparedStatementSetter() { 104 + ",sigin_compate=?,drift_status=?,cc_service=?,major_station_name=?,rfid_state=?,first_rfid_state=?,line_region=? where id=?", new BatchPreparedStatementSetter() {
105 @Override 105 @Override
106 public void setValues(PreparedStatement ps, int i) throws SQLException { 106 public void setValues(PreparedStatement ps, int i) throws SQLException {
107 ScheduleRealInfo sch = pstList.get(i); 107 ScheduleRealInfo sch = pstList.get(i);
@@ -154,7 +154,7 @@ public class SchedulePstThread extends Thread { @@ -154,7 +154,7 @@ public class SchedulePstThread extends Thread {
154 ps.setString(47, sch.getMajorStationName()); 154 ps.setString(47, sch.getMajorStationName());
155 ps.setInt(48, sch.getRfidState()); 155 ps.setInt(48, sch.getRfidState());
156 ps.setInt(49, sch.getFirstRfidState()); 156 ps.setInt(49, sch.getFirstRfidState());
157 - ps.setString(50, sch.getRegionId()); 157 + ps.setString(50, sch.getLineRegion());
158 ps.setLong(51, sch.getId()); 158 ps.setLong(51, sch.getId());
159 } 159 }
160 160
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @077bf7c
@@ -260,7 +260,7 @@ public class ScheduleRealInfo implements Cloneable{ @@ -260,7 +260,7 @@ public class ScheduleRealInfo implements Cloneable{
260 /** 260 /**
261 * 区间ID+seq 261 * 区间ID+seq
262 */ 262 */
263 - private String regionId; 263 + private String lineRegion;
264 264
265 /** 265 /**
266 * 封锁站点(站点编号以','分割) 266 * 封锁站点(站点编号以','分割)
@@ -1071,12 +1071,12 @@ public class ScheduleRealInfo implements Cloneable{ @@ -1071,12 +1071,12 @@ public class ScheduleRealInfo implements Cloneable{
1071 this.operationType = operationType; 1071 this.operationType = operationType;
1072 } 1072 }
1073 1073
1074 - public String getRegionId() {  
1075 - return regionId; 1074 + public String getLineRegion() {
  1075 + return lineRegion;
1076 } 1076 }
1077 1077
1078 - public void setRegionId(String regionId) {  
1079 - this.regionId = regionId; 1078 + public void setLineRegion(String lineRegion) {
  1079 + this.lineRegion = lineRegion;
1080 } 1080 }
1081 1081
1082 public String getBlockStations() { 1082 public String getBlockStations() {
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_normal.html
  View file @077bf7c
@@ -115,12 +115,12 @@ @@ -115,12 +115,12 @@
115 </div> 115 </div>
116 </div> 116 </div>
117 </div> 117 </div>
118 - <div class="uk-width-1-2" id="regionId"> 118 + <div class="uk-width-1-2" id="lineRegion">
119 <div class="uk-form-row"> 119 <div class="uk-form-row">
120 <label class="uk-form-label">预设区间</label> 120 <label class="uk-form-label">预设区间</label>
121 <div class="uk-form-controls"> 121 <div class="uk-form-controls">
122 <div class="uk-autocomplete uk-form"> 122 <div class="uk-autocomplete uk-form">
123 - <select name="regionId"> 123 + <select name="lineRegion">
124 </select> 124 </select>
125 </div> 125 </div>
126 </div> 126 </div>
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_two_way.html
  View file @077bf7c
@@ -115,12 +115,12 @@ @@ -115,12 +115,12 @@
115 </div> 115 </div>
116 </div> 116 </div>
117 </div> 117 </div>
118 - <div class="uk-width-1-2" id="regionId"> 118 + <div class="uk-width-1-2" id="lineRegion">
119 <div class="uk-form-row"> 119 <div class="uk-form-row">
120 <label class="uk-form-label">预设区间</label> 120 <label class="uk-form-label">预设区间</label>
121 <div class="uk-form-controls"> 121 <div class="uk-form-controls">
122 <div class="uk-autocomplete uk-form"> 122 <div class="uk-autocomplete uk-form">
123 - <select name="regionId"> 123 + <select name="lineRegion">
124 </select> 124 </select>
125 </div> 125 </div>
126 </div> 126 </div>
@@ -279,12 +279,12 @@ @@ -279,12 +279,12 @@
279 </div> 279 </div>
280 </div> 280 </div>
281 </div> 281 </div>
282 - <div class="uk-width-1-2" id="regionId"> 282 + <div class="uk-width-1-2" id="lineRegion">
283 <div class="uk-form-row"> 283 <div class="uk-form-row">
284 <label class="uk-form-label">预设区间</label> 284 <label class="uk-form-label">预设区间</label>
285 <div class="uk-form-controls"> 285 <div class="uk-form-controls">
286 <div class="uk-autocomplete uk-form"> 286 <div class="uk-autocomplete uk-form">
287 - <select name="regionId"> 287 + <select name="lineRegion">
288 </select> 288 </select>
289 </div> 289 </div>
290 </div> 290 </div>
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/main.html
  View file @077bf7c
@@ -75,9 +75,9 @@ @@ -75,9 +75,9 @@
75 } 75 }
76 opts.push('">', item.regionAlias, '</option>') 76 opts.push('">', item.regionAlias, '</option>')
77 } 77 }
78 - $('.add-sch-form [name=regionId]').html(opts.join('')); 78 + $('.add-sch-form [name=lineRegion]').html(opts.join(''));
79 $('[name=isPreRegion]', modal).on('change', isPreRegionChangeHandle).trigger('change'); 79 $('[name=isPreRegion]', modal).on('change', isPreRegionChangeHandle).trigger('change');
80 - $('[name=regionId]', modal).on('change', regionIdChangeHandle); 80 + $('[name=lineRegion]', modal).on('change', lineRegionChangeHandle);
81 $('[name=isBlock]', modal).on('change', isBlockChangeHandle).trigger('change'); 81 $('[name=isBlock]', modal).on('change', isBlockChangeHandle).trigger('change');
82 $('[name=blockStations]', modal).multipleSelect(); 82 $('[name=blockStations]', modal).multipleSelect();
83 $('.add-sch-form.two_form [name=xlDir]').trigger('change'); 83 $('.add-sch-form.two_form [name=xlDir]').trigger('change');
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 } 125 }
126 opts.push('">', item.regionAlias, '</option>') 126 opts.push('">', item.regionAlias, '</option>')
127 } 127 }
128 - $('[name=regionId]', f).html(opts.join('')); 128 + $('[name=lineRegion]', f).html(opts.join(''));
129 }) 129 })
130 } 130 }
131 131
@@ -263,26 +263,26 @@ @@ -263,26 +263,26 @@
263 bcType = $('[name=bcType]', f), 263 bcType = $('[name=bcType]', f),
264 qdzCode = $('[name=qdzCode]', f), 264 qdzCode = $('[name=qdzCode]', f),
265 zdzCode = $('[name=zdzCode]', f), 265 zdzCode = $('[name=zdzCode]', f),
266 - regionId = $('#regionId', f); 266 + lineRegion = $('#lineRegion', f);
267 if (checked) { 267 if (checked) {
268 bcType.val('region'); 268 bcType.val('region');
269 qdzCode.prop('disabled', true); 269 qdzCode.prop('disabled', true);
270 zdzCode.prop('disabled', true); 270 zdzCode.prop('disabled', true);
271 - regionId.show(); 271 + lineRegion.show();
272 } else { 272 } else {
273 qdzCode.prop('disabled', false); 273 qdzCode.prop('disabled', false);
274 zdzCode.prop('disabled', false); 274 zdzCode.prop('disabled', false);
275 - regionId.hide(); 275 + lineRegion.hide();
276 } 276 }
277 } 277 }
278 278
279 - function regionIdChangeHandle() { 279 + function lineRegionChangeHandle() {
280 var f = $(this).parents('.add-sch-form'), 280 var f = $(this).parents('.add-sch-form'),
281 qdzCode = $('[name=qdzCode]', f), 281 qdzCode = $('[name=qdzCode]', f),
282 zdzCode = $('[name=zdzCode]', f), 282 zdzCode = $('[name=zdzCode]', f),
283 - regionId = $(this).val();  
284 - if (!regionId) return;  
285 - var stationRoutes = lineRegion[regionId].stationRoutes; 283 + lineRegion = $(this).val();
  284 + if (!lineRegion) return;
  285 + var stationRoutes = lineRegion[lineRegion].stationRoutes;
286 if (stationRoutes && stationRoutes.length > 1) { 286 if (stationRoutes && stationRoutes.length > 1) {
287 qdzCode.val(stationRoutes[0].stationCode); 287 qdzCode.val(stationRoutes[0].stationCode);
288 zdzCode.val(stationRoutes[stationRoutes.length - 1].stationCode); 288 zdzCode.val(stationRoutes[stationRoutes.length - 1].stationCode);
@@ -414,7 +414,7 @@ @@ -414,7 +414,7 @@
414 data.jName = data.jsy.split('/')[1]; 414 data.jName = data.jsy.split('/')[1];
415 delete data.jsy; 415 delete data.jsy;
416 if (!data.isPreRegion) { 416 if (!data.isPreRegion) {
417 - delete data.regionId; 417 + delete data.lineRegion;
418 } 418 }
419 if (!data.isBlock) { 419 if (!data.isBlock) {
420 delete data.blockStations; 420 delete data.blockStations;
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_normal.html
  View file @077bf7c
@@ -115,12 +115,12 @@ @@ -115,12 +115,12 @@
115 </div> 115 </div>
116 </div> 116 </div>
117 </div> 117 </div>
118 - <div class="uk-width-1-2" id="regionId"> 118 + <div class="uk-width-1-2" id="lineRegion">
119 <div class="uk-form-row"> 119 <div class="uk-form-row">
120 <label class="uk-form-label">预设区间</label> 120 <label class="uk-form-label">预设区间</label>
121 <div class="uk-form-controls"> 121 <div class="uk-form-controls">
122 <div class="uk-autocomplete uk-form"> 122 <div class="uk-autocomplete uk-form">
123 - <select name="regionId"> 123 + <select name="lineRegion">
124 </select> 124 </select>
125 </div> 125 </div>
126 </div> 126 </div>
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_two_way.html
  View file @077bf7c
@@ -115,12 +115,12 @@ @@ -115,12 +115,12 @@
115 </div> 115 </div>
116 </div> 116 </div>
117 </div> 117 </div>
118 - <div class="uk-width-1-2" id="regionId"> 118 + <div class="uk-width-1-2" id="lineRegion">
119 <div class="uk-form-row"> 119 <div class="uk-form-row">
120 <label class="uk-form-label">预设区间</label> 120 <label class="uk-form-label">预设区间</label>
121 <div class="uk-form-controls"> 121 <div class="uk-form-controls">
122 <div class="uk-autocomplete uk-form"> 122 <div class="uk-autocomplete uk-form">
123 - <select name="regionId"> 123 + <select name="lineRegion">
124 </select> 124 </select>
125 </div> 125 </div>
126 </div> 126 </div>
@@ -289,12 +289,12 @@ @@ -289,12 +289,12 @@
289 </div> 289 </div>
290 </div> 290 </div>
291 </div> 291 </div>
292 - <div class="uk-width-1-2" id="regionId"> 292 + <div class="uk-width-1-2" id="lineRegion">
293 <div class="uk-form-row"> 293 <div class="uk-form-row">
294 <label class="uk-form-label">预设区间</label> 294 <label class="uk-form-label">预设区间</label>
295 <div class="uk-form-controls"> 295 <div class="uk-form-controls">
296 <div class="uk-autocomplete uk-form"> 296 <div class="uk-autocomplete uk-form">
297 - <select name="regionId"> 297 + <select name="lineRegion">
298 </select> 298 </select>
299 </div> 299 </div>
300 </div> 300 </div>
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/main.html
  View file @077bf7c
@@ -75,9 +75,9 @@ @@ -75,9 +75,9 @@
75 } 75 }
76 opts.push('">', item.regionAlias, '</option>') 76 opts.push('">', item.regionAlias, '</option>')
77 } 77 }
78 - $('.add-sch-form [name=regionId]').html(opts.join('')); 78 + $('.add-sch-form [name=lineRegion]').html(opts.join(''));
79 $('[name=isPreRegion]', modal).on('change', isPreRegionChangeHandle).trigger('change'); 79 $('[name=isPreRegion]', modal).on('change', isPreRegionChangeHandle).trigger('change');
80 - $('[name=regionId]', modal).on('change', regionIdChangeHandle); 80 + $('[name=lineRegion]', modal).on('change', lineRegionChangeHandle);
81 $('[name=isBlock]', modal).on('change', isBlockChangeHandle).trigger('change'); 81 $('[name=isBlock]', modal).on('change', isBlockChangeHandle).trigger('change');
82 $('[name=blockStations]', modal).multipleSelect(); 82 $('[name=blockStations]', modal).multipleSelect();
83 $('.add-sch-form.two_form [name=xlDir]').trigger('change'); 83 $('.add-sch-form.two_form [name=xlDir]').trigger('change');
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 } 125 }
126 opts.push('">', item.regionAlias, '</option>') 126 opts.push('">', item.regionAlias, '</option>')
127 } 127 }
128 - $('[name=regionId]', f).html(opts.join('')); 128 + $('[name=lineRegion]', f).html(opts.join(''));
129 }) 129 })
130 } 130 }
131 131
@@ -263,26 +263,26 @@ @@ -263,26 +263,26 @@
263 bcType = $('[name=bcType]', f), 263 bcType = $('[name=bcType]', f),
264 qdzCode = $('[name=qdzCode]', f), 264 qdzCode = $('[name=qdzCode]', f),
265 zdzCode = $('[name=zdzCode]', f), 265 zdzCode = $('[name=zdzCode]', f),
266 - regionId = $('#regionId', f); 266 + lineRegion = $('#lineRegion', f);
267 if (checked) { 267 if (checked) {
268 bcType.val('region'); 268 bcType.val('region');
269 qdzCode.prop('disabled', true); 269 qdzCode.prop('disabled', true);
270 zdzCode.prop('disabled', true); 270 zdzCode.prop('disabled', true);
271 - regionId.show(); 271 + lineRegion.show();
272 } else { 272 } else {
273 qdzCode.prop('disabled', false); 273 qdzCode.prop('disabled', false);
274 zdzCode.prop('disabled', false); 274 zdzCode.prop('disabled', false);
275 - regionId.hide(); 275 + lineRegion.hide();
276 } 276 }
277 } 277 }
278 278
279 - function regionIdChangeHandle() { 279 + function lineRegionChangeHandle() {
280 var f = $(this).parents('.add-sch-form'), 280 var f = $(this).parents('.add-sch-form'),
281 qdzCode = $('[name=qdzCode]', f), 281 qdzCode = $('[name=qdzCode]', f),
282 zdzCode = $('[name=zdzCode]', f), 282 zdzCode = $('[name=zdzCode]', f),
283 - regionId = $(this).val();  
284 - if (!regionId) return;  
285 - var stationRoutes = lineRegion[regionId].stationRoutes; 283 + lineRegion = $(this).val();
  284 + if (!lineRegion) return;
  285 + var stationRoutes = lineRegion[lineRegion].stationRoutes;
286 if (stationRoutes && stationRoutes.length > 1) { 286 if (stationRoutes && stationRoutes.length > 1) {
287 qdzCode.val(stationRoutes[0].stationCode); 287 qdzCode.val(stationRoutes[0].stationCode);
288 zdzCode.val(stationRoutes[stationRoutes.length - 1].stationCode); 288 zdzCode.val(stationRoutes[stationRoutes.length - 1].stationCode);
@@ -417,7 +417,7 @@ @@ -417,7 +417,7 @@
417 data.jName = data.jsy.split('/')[1]; 417 data.jName = data.jsy.split('/')[1];
418 delete data.jsy; 418 delete data.jsy;
419 if (!data.isPreRegion) { 419 if (!data.isPreRegion) {
420 - delete data.regionId; 420 + delete data.lineRegion;
421 } 421 }
422 if (!data.isBlock) { 422 if (!data.isBlock) {
423 delete data.blockStations; 423 delete data.blockStations;