潘钊 / bsth_control · Commits

Commit 4dc6075d22457e6c3596c485cafa636bc705b663

Authored by 娄高锋
2 parents 8f59aa12 2c995d50
build: skipped

Merge branch 'lggj' of http://61.169.120.202:8888/panzhaov5/bsth_control into lggj

Inline Side-by-side
Showing 20 changed files with 148 additions and 33 deletions
src/main/java/com/bsth/controller/schedule/BController.java
  View file @4dc6075
... ... @@ -148,6 +148,21 @@ public class BController<T, ID extends Serializable> {
148 148 return rtn;
149 149 }
150 150  
  151 + // HTTP DELETE方法改成 POST方法
  152 + @RequestMapping(value = "/pd/{id}", method = RequestMethod.POST)
  153 + public Map<String, Object> postDelete(@PathVariable("id") ID id) {
  154 + Map<String, Object> rtn = new HashMap<>();
  155 + try {
  156 + bService.delete(id);
  157 + rtn.put("status", ResponseCode.SUCCESS);
  158 + } catch (ScheduleException exp) {
  159 + rtn.put("status", ResponseCode.ERROR);
  160 + rtn.put("msg", exp.getMessage());
  161 + }
  162 +
  163 + return rtn;
  164 + }
  165 +
151 166 //---------------- 数据服务操作 ----------------//
152 167 // 上传excel文件
153 168 @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
... ...
src/main/resources/datatools/config-test.properties
  View file @4dc6075
... ... @@ -15,13 +15,13 @@ datatools.kvars_dbdname=lg_control
15 15  
16 16 # 3、上传数据配置信息
17 17 # 上传文件目录配置（根据不同的环境需要修正）
18   -datatools.fileupload_dir=/home/bsth_control_u_d_files
  18 +datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
19 19 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
20   -datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput
  20 +datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
21 21 # 临时输出文件目录
22   -datatools.trans_tempdir=/home/bsth_control_u_d_files/temp
  22 +datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
23 23 # 模版文件目录
24   -datatools.trans_templatedir=/home/bsth_control_u_d_files/template
  24 +datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
25 25  
26 26 ##---------------------------- 导入数据ktr ----------------------------##
27 27 # 车辆信息导入ktr转换
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
  View file @4dc6075
... ... @@ -294,7 +294,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
294 294 };
295 295  
296 296 self.deleteCar = function(id) {
297   - Cars.delete({id: id}, function(result) {
  297 + Cars.postDelete({id: id}, function(result) {
298 298 if (result.msg) { // 暂时这样做，之后全局拦截
299 299 alert("失败：" + result.msg);
300 300 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/service.js
  View file @4dc6075
... ... @@ -36,6 +36,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
36 36 },
37 37 save: {
38 38 method: 'POST'
  39 + },
  40 + postDelete: {
  41 + url : '/cars_sc/pd/:id',
  42 + method: 'POST',
  43 + params: {id: '@id'}
39 44 }
40 45 }
41 46 ),
... ... @@ -78,4 +83,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(
78 83  
79 84 }
80 85 ]
81   -);
82 86 \ No newline at end of file
  87 +);
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @4dc6075
... ... @@ -34,7 +34,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
34 34 {name: "personnelType", desc: "性别"},
35 35 {name: "company", desc: "所在公司"},
36 36 {name: "brancheCompany", desc: "分公司"},
37   - {name: "posts", desc: "工种"}
  37 + {name: "posts", desc: "工种"},
  38 + {name: "createDate", desc: "创建时间"}
38 39 ];
39 40 // 排序字段
40 41 var orderColumns = {
... ... @@ -274,7 +275,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
274 275 };
275 276  
276 277 self.deleteEmp = function(id) {
277   - Employee.delete({id: id}, function(result) {
  278 + Employee.postDelete({id: id}, function(result) {
278 279 if (result.msg) { // 暂时这样做，之后全局拦截
279 280 alert("失败：" + result.msg);
280 281 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/service.js
  View file @4dc6075
... ... @@ -36,6 +36,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
36 36 },
37 37 save: {
38 38 method: 'POST'
  39 + },
  40 + postDelete: {
  41 + url : '/ee/pd/:id',
  42 + method: 'POST',
  43 + params: {id: '@id'}
39 44 }
40 45 }
41 46 ),
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @4dc6075
... ... @@ -37,6 +37,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
37 37 },
38 38 save: {
39 39 method: 'POST'
  40 + },
  41 + postDelete: {
  42 + url : '/cars_sc/pd/:id',
  43 + method: 'POST',
  44 + params: {id: '@id'}
40 45 }
41 46 }
42 47 ),
... ... @@ -79,7 +84,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
79 84  
80 85 }
81 86 ]
82   -);
  87 +);
  88 +
83 89 // 车辆设备信息service
84 90 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
85 91 return $resource(
... ... @@ -158,6 +164,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
158 164 },
159 165 save: {
160 166 method: 'POST'
  167 + },
  168 + postDelete: {
  169 + url : '/ee/pd/:id',
  170 + method: 'POST',
  171 + params: {id: '@id'}
161 172 }
162 173 }
163 174 ),
... ... @@ -295,6 +306,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
295 306 },
296 307 save: {
297 308 method: 'POST'
  309 + },
  310 + postDelete: {
  311 + url : '/cci/pd/:id',
  312 + method: 'POST',
  313 + params: {id: '@id'}
298 314 }
299 315 }
300 316 ),
... ... @@ -315,7 +331,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
315 331 }
316 332 )
317 333 };
318   -}]);
  334 +}]);
  335 +
319 336 // 线路运营统计service
320 337 angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
321 338 return $resource(
... ... @@ -369,6 +386,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
369 386 },
370 387 delete: {
371 388 method: 'DELETE'
  389 + },
  390 + postDelete: {
  391 + url : '/eci/pd/:id',
  392 + method: 'POST',
  393 + params: {id: '@id'}
372 394 }
373 395 }
374 396 ),
... ... @@ -415,7 +437,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
415 437 }
416 438 )
417 439 };
418   -}]);
  440 +}]);
  441 +
419 442 // 路牌管理service
420 443 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
421 444 return {
... ... @@ -450,8 +473,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
450 473 },
451 474 save: {
452 475 method: 'POST'
  476 + },
  477 + postDelete: {
  478 + url : '/gic/pd/:id',
  479 + method: 'POST',
  480 + params: {id: '@id'}
453 481 }
454   - // 内部还有默认的方法delete
455 482 }
456 483 ),
457 484 lpno: $resource(
... ... @@ -488,7 +515,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
488 515 }
489 516 )
490 517 };
491   -}]);
  518 +}]);
  519 +
492 520 // 套跑管理service
493 521 angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
494 522 return {
... ... @@ -526,11 +554,17 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
526 554 },
527 555 delete: {
528 556 method: 'DELETE'
  557 + },
  558 + postDelete: {
  559 + url : '/rms/pd/:id',
  560 + method: 'POST',
  561 + params: {id: '@id'}
529 562 }
530 563 }
531 564 )
532 565 };
533   -}]);
  566 +}]);
  567 +
534 568 // 排班计划管理service
535 569 angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
536 570 return {
... ... @@ -736,6 +770,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
736 770 },
737 771 delete: {
738 772 method: 'DELETE'
  773 + },
  774 + postDelete: {
  775 + url : '/sr1fc/pd/:id',
  776 + method: 'POST',
  777 + params: {id: '@id'}
739 778 }
740 779 }
741 780 ),
... ... @@ -793,6 +832,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
793 832 return dst;
794 833 }
795 834 }
  835 + },
  836 + postDelete: {
  837 + url : '/tic_ec/pd/:id',
  838 + method: 'POST',
  839 + params: {id: '@id'}
796 840 }
797 841 }
798 842 ),
... ... @@ -903,6 +947,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
903 947 return dst; // 业务错误留给控制器处理
904 948 }
905 949 }
  950 + },
  951 + postDelete: {
  952 + url : '/tidc/pd/:id',
  953 + method: 'POST',
  954 + params: {id: '@id'}
906 955 }
907 956 }
908 957 ),
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @4dc6075
... ... @@ -27,7 +27,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
27 27 {name: "cl.insideCode", desc: "内部编号"},
28 28 {name: "equipmentCode", desc: "设备编号"},
29 29 {name: "qyrq", desc: "启用日期"},
30   - {name: "isCancel", desc: "是否作废"}
  30 + {name: "isCancel", desc: "是否作废"},
  31 + {name: "createDate", desc: "创建时间"}
31 32 ];
32 33 // 排序字段
33 34 var orderColumns = {
... ... @@ -244,7 +245,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
244 245 });
245 246 };
246 247 self.toggleBusConfig = function(id) {
247   - BusConfig.delete({id: id}, function(result) {
  248 + BusConfig.postDelete({id: id}, function(result) {
248 249 if (result.msg) { // 暂时这样做，之后全局拦截
249 250 alert("失败：" + result.msg);
250 251 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/service.js
  View file @4dc6075
... ... @@ -32,6 +32,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
32 32 },
33 33 save: {
34 34 method: 'POST'
  35 + },
  36 + postDelete: {
  37 + url : '/cci/pd/:id',
  38 + method: 'POST',
  39 + params: {id: '@id'}
35 40 }
36 41 }
37 42 ),
... ... @@ -52,4 +57,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
52 57 }
53 58 )
54 59 };
55   -}]);
56 60 \ No newline at end of file
  61 +}]);
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
  View file @4dc6075
... ... @@ -27,7 +27,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
27 27 {name: "jsy.personnelName", desc: "驾驶员姓名"},
28 28 {name: "spy.jobCodeori", desc: "售票员工号"},
29 29 {name: "spy.personnelName", desc: "售票员姓名"},
30   - {name: "isCancel", desc: "是否作废"}
  30 + {name: "isCancel", desc: "是否作废"},
  31 + {name: "createDate", desc: "创建时间"}
31 32 ];
32 33 // 排序字段
33 34 var orderColumns = {
... ... @@ -259,7 +260,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
259 260 };
260 261  
261 262 self.toggleEmpConfig = function(id) {
262   - EmpConfig.delete({id: id}, function(result) {
  263 + EmpConfig.postDelete({id: id}, function(result) {
263 264 if (result.msg) { // 暂时这样做，之后全局拦截
264 265 alert("失败：" + result.msg);
265 266 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/service.js
  View file @4dc6075
... ... @@ -35,6 +35,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
35 35 },
36 36 delete: {
37 37 method: 'DELETE'
  38 + },
  39 + postDelete: {
  40 + url : '/eci/pd/:id',
  41 + method: 'POST',
  42 + params: {id: '@id'}
38 43 }
39 44 }
40 45 ),
... ... @@ -81,4 +86,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
81 86 }
82 87 )
83 88 };
84   -}]);
85 89 \ No newline at end of file
  90 +}]);
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
  View file @4dc6075
... ... @@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
26 26 {name: "lpNo", desc: "路牌编号"},
27 27 {name: "lpName", desc: "路牌名称"},
28 28 {name: "lpType", desc: "路牌类型"},
29   - {name: "isCancel", desc: "是否作废"}
  29 + {name: "isCancel", desc: "是否作废"},
  30 + {name: "createDate", desc: "创建时间"}
30 31 ];
31 32 // 排序字段
32 33 var orderColumns = {
... ... @@ -250,7 +251,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
250 251 };
251 252 // 作废切换
252 253 self.toggleGuideboard = function(id) {
253   - Gb.delete({id: id}, function(result) {
  254 + Gb.postDelete({id: id}, function(result) {
254 255 if (result.status == "ERROR") { // 暂时这样做，之后全局拦截
255 256 alert("失败：" + result.msg);
256 257 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/service.js
  View file @4dc6075
... ... @@ -32,8 +32,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
32 32 },
33 33 save: {
34 34 method: 'POST'
  35 + },
  36 + postDelete: {
  37 + url : '/gic/pd/:id',
  38 + method: 'POST',
  39 + params: {id: '@id'}
35 40 }
36   - // 内部还有默认的方法delete
37 41 }
38 42 ),
39 43 lpno: $resource(
... ... @@ -70,4 +74,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
70 74 }
71 75 )
72 76 };
73   -}]);
74 77 \ No newline at end of file
  78 +}]);
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
  View file @4dc6075
... ... @@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
26 26 {name: "rerunLp.lpName", desc: "套跑路牌"},
27 27 {name: "rerunType", desc: "套跑类型"},
28 28 {name: "useXl.name", desc: "线路"},
29   - {name: "isCancel", desc: "是否作废"}
  29 + {name: "isCancel", desc: "是否作废"},
  30 + {name: "createDate", desc: "创建时间"}
30 31 ];
31 32 // 排序字段
32 33 var orderColumns = {
... ... @@ -141,7 +142,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
141 142 });
142 143 };
143 144 self.toggleRerun = function(id) {
144   - RM.delete({id: id}, function(result) {
  145 + RM.postDelete({id: id}, function(result) {
145 146 if (result.msg) { // 暂时这样做，之后全局拦截
146 147 alert("失败：" + result.msg);
147 148 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/service.js
  View file @4dc6075
... ... @@ -35,8 +35,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
35 35 },
36 36 delete: {
37 37 method: 'DELETE'
  38 + },
  39 + postDelete: {
  40 + url : '/rms/pd/:id',
  41 + method: 'POST',
  42 + params: {id: '@id'}
38 43 }
39 44 }
40 45 )
41 46 };
42   -}]);
43 47 \ No newline at end of file
  48 +}]);
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
  View file @4dc6075
... ... @@ -24,7 +24,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
24 24 {name: "xl.name", desc: "线路名称"},
25 25 {name: "updateDate", desc: "修改时间"},
26 26 {name: "qyrq", desc: "启用日期"},
27   - {name: "carConfigInfo.cl.insideCode", desc: "车辆"}
  27 + {name: "carConfigInfo.cl.insideCode", desc: "车辆"},
  28 + {name: "createDate", desc: "创建时间"}
28 29 ];
29 30 // 排序字段
30 31 var orderColumns = {
... ... @@ -257,7 +258,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
257 258 };
258 259  
259 260 self.deleteRule = function(id) {
260   - ScheduleRuleManage.delete({id: id}, function(result) {
  261 + ScheduleRuleManage.postDelete({id: id}, function(result) {
261 262 if (result.msg) { // 暂时这样做，之后全局拦截
262 263 alert("失败：" + result.msg);
263 264 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/service.js
  View file @4dc6075
... ... @@ -35,6 +35,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
35 35 },
36 36 delete: {
37 37 method: 'DELETE'
  38 + },
  39 + postDelete: {
  40 + url : '/sr1fc/pd/:id',
  41 + method: 'POST',
  42 + params: {id: '@id'}
38 43 }
39 44 }
40 45 ),
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
  View file @4dc6075
... ... @@ -234,7 +234,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
234 234 var error_counts = 0; // 失败数
235 235 for (var n = 0; n < ttinfodetailIds.length; n++) {
236 236 (function(index) {
237   - queryClass.delete({id: ttinfodetailIds[index].ttdid}, function(value) {
  237 + queryClass.postDelete({id: ttinfodetailIds[index].ttdid}, function(value) {
238 238 if (value.status == 'ERROR') {
239 239 error_counts ++;
240 240 if (success_counts + error_counts == ttinfodetailIds.length) {
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
  View file @4dc6075
... ... @@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
26 26 {name: "xlDir", desc: "上下行"},
27 27 {name: "isEnableDisTemplate", desc: "是否启用"},
28 28 {name: "qyrq", desc: "启用日期"},
29   - {name: "isCancel", desc: "是否作废"}
  29 + {name: "isCancel", desc: "是否作废"},
  30 + {name: "createDate", desc: "创建时间"}
30 31 ];
31 32 // 排序字段
32 33 var orderColumns = {
... ... @@ -175,7 +176,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
175 176 });
176 177 };
177 178 self.toggleTtinfo = function(id) {
178   - TtInfo.delete({id: id}, function(result) {
  179 + TtInfo.postDelete({id: id}, function(result) {
179 180 if (result.message) { // 暂时这样做，之后全局拦截
180 181 alert("失败：" + result.message);
181 182 } else {
... ... @@ -344,4 +345,4 @@ angular.module(&#39;ScheduleApp&#39;).controller(
344 345 });
345 346 }
346 347 ]
347   -);
348 348 \ No newline at end of file
  349 +);
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/service.js
  View file @4dc6075
... ... @@ -33,6 +33,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
33 33 return dst;
34 34 }
35 35 }
  36 + },
  37 + postDelete: {
  38 + url : '/tic_ec/pd/:id',
  39 + method: 'POST',
  40 + params: {id: '@id'}
36 41 }
37 42 }
38 43 ),
... ... @@ -143,6 +148,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
143 148 return dst; // 业务错误留给控制器处理
144 149 }
145 150 }
  151 + },
  152 + postDelete: {
  153 + url : '/tidc/pd/:id',
  154 + method: 'POST',
  155 + params: {id: '@id'}
146 156 }
147 157 }
148 158 ),
... ...