修正计划调度模块，将HTTP DELETE方法调用改成POST，具体改动如下：

1、修改BController基类，添加POST请求的删除方法，具体查看相关代码 2、修改人员信息管理（删除功能），具体查看相关代码 3、修改车辆信息管理（删除功能），具体查看相关代码 4、修改车辆配置管理（作废/撤销功能），具体查看相关代码 5、修改人员配置管理（作废/撤销功能），具体查看相关代码 6、修改路牌管理（作废/撤销功能），具体查看相关代码 7、修改时刻表管理（作废/撤销功能），具体查看相关代码 8，修改时刻表明细管理（批量删除功能），具体查看相关代码 9、修改排班规则管理（删除功能），具体查看相关代码 10、修改套跑管理（作废/撤销功能），具体查看相关代码

修正计划调度模块，将HTTP DELETE方法调用改成POST，具体改动如下：
1、修改BController基类，添加POST请求的删除方法，具体查看相关代码 2、修改人员信息管理（删除功能），具体查看相关代码 3、修改车辆信息管理（删除功能），具体查看相关代码 4、修改车辆配置管理（作废/撤销功能），具体查看相关代码 5、修改人员配置管理（作废/撤销功能），具体查看相关代码 6、修改路牌管理（作废/撤销功能），具体查看相关代码 7、修改时刻表管理（作废/撤销功能），具体查看相关代码 8，修改时刻表明细管理（批量删除功能），具体查看相关代码 9、修改排班规则管理（删除功能），具体查看相关代码 10、修改套跑管理（作废/撤销功能），具体查看相关代码
徐烜
1 parent 24c866aa
Showing 20 changed files with 148 additions and 33 deletions
src/main/java/com/bsth/controller/schedule/BController.java
src/main/resources/datatools/config-test.properties
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/service.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/service.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/service.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/service.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/service.js
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/service.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/service.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/service.js
@@ -148,6 +148,21 @@ public class BController&lt;T, ID extends Serializable&gt; {
         return rtn;
     }
+    // HTTP DELETE方法改成 POST方法
+    @RequestMapping(value = "/pd/{id}", method = RequestMethod.POST)
+    public Map<String, Object> postDelete(@PathVariable("id") ID id) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            bService.delete(id);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     //---------------- 数据服务操作 ----------------//
     // 上传excel文件
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
@@ -15,13 +15,13 @@ datatools.kvars_dbdname=lg_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
-datatools.fileupload_dir=/home/bsth_control_u_d_files
+datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
-datatools.trans_errordir=/home/bsth_control_u_d_files/erroroutput
+datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
 # 临时输出文件目录
-datatools.trans_tempdir=/home/bsth_control_u_d_files/temp
+datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
 # 模版文件目录
-datatools.trans_templatedir=/home/bsth_control_u_d_files/template
+datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
 ##---------------------------- 导入数据ktr ----------------------------##
 # 车辆信息导入ktr转换
@@ -294,7 +294,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.deleteCar = function(id) {
-                Cars.delete({id: id}, function(result) {
+                Cars.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -36,6 +36,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         },
                         save: {
                             method: 'POST'
+                        },
+                        postDelete: {
+                            url : '/cars_sc/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -78,4 +83,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
 \ No newline at end of file
+);
@@ -34,7 +34,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "personnelType", desc: "性别"},
                 {name: "company", desc: "所在公司"},
                 {name: "brancheCompany", desc: "分公司"},
-                {name: "posts", desc: "工种"}
+                {name: "posts", desc: "工种"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -274,7 +275,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.deleteEmp = function(id) {
-                Employee.delete({id: id}, function(result) {
+                Employee.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -36,6 +36,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         },
                         save: {
                             method: 'POST'
+                        },
+                        postDelete: {
+                            url : '/ee/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -37,6 +37,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         },
                         save: {
                             method: 'POST'
+                        },
+                        postDelete: {
+                            url : '/cars_sc/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -79,7 +84,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
+
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
@@ -158,6 +164,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         },
                         save: {
                             method: 'POST'
+                        },
+                        postDelete: {
+                            url : '/ee/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -295,6 +306,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
                 },
                 save: {
                     method: 'POST'
+                },
+                postDelete: {
+                    url : '/cci/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -315,7 +331,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
             }
         )
     };
-}]);
+}]);
+
 // 线路运营统计service
 angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
     return $resource(
@@ -369,6 +386,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/eci/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -415,7 +437,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
             }
         )
     };
-}]);
+}]);
+
 // 路牌管理service
 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
     return {
@@ -450,8 +473,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
                 },
                 save: {
                     method: 'POST'
+                },
+                postDelete: {
+                    url : '/gic/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
-                // 内部还有默认的方法delete
             }
         ),
         lpno: $resource(
@@ -488,7 +515,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
             }
         )
     };
-}]);
+}]);
+
 // 套跑管理service
 angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
     return {
@@ -526,11 +554,17 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/rms/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         )
     };
-}]);
+}]);
+
 // 排班计划管理service
 angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
     return {
@@ -736,6 +770,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/sr1fc/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -793,6 +832,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst;
                                 }
                             }
+                        },
+                        postDelete: {
+                            url : '/tic_ec/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -903,6 +947,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst; // 业务错误留给控制器处理
                                 }
                             }
+                        },
+                        postDelete: {
+                            url : '/tidc/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -27,7 +27,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "cl.insideCode", desc: "内部编号"},
                 {name: "equipmentCode", desc: "设备编号"},
                 {name: "qyrq", desc: "启用日期"},
-                {name: "isCancel", desc: "是否作废"}
+                {name: "isCancel", desc: "是否作废"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -244,7 +245,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
             self.toggleBusConfig = function(id) {
-                BusConfig.delete({id: id}, function(result) {
+                BusConfig.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -32,6 +32,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
                 },
                 save: {
                     method: 'POST'
+                },
+                postDelete: {
+                    url : '/cci/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -52,4 +57,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
             }
         )
     };
-}]);
 \ No newline at end of file
+}]);
@@ -27,7 +27,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "jsy.personnelName", desc: "驾驶员姓名"},
                 {name: "spy.jobCodeori", desc: "售票员工号"},
                 {name: "spy.personnelName", desc: "售票员姓名"},
-                {name: "isCancel", desc: "是否作废"}
+                {name: "isCancel", desc: "是否作废"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -259,7 +260,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.toggleEmpConfig = function(id) {
-                EmpConfig.delete({id: id}, function(result) {
+                EmpConfig.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -35,6 +35,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/eci/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -81,4 +86,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
             }
         )
     };
-}]);
 \ No newline at end of file
+}]);
@@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "lpNo", desc: "路牌编号"},
                 {name: "lpName", desc: "路牌名称"},
                 {name: "lpType", desc: "路牌类型"},
-                {name: "isCancel", desc: "是否作废"}
+                {name: "isCancel", desc: "是否作废"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -250,7 +251,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             // 作废切换
             self.toggleGuideboard = function(id) {
-                Gb.delete({id: id}, function(result) {
+                Gb.postDelete({id: id}, function(result) {
                     if (result.status == "ERROR") { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -32,8 +32,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
                 },
                 save: {
                     method: 'POST'
+                },
+                postDelete: {
+                    url : '/gic/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
-                // 内部还有默认的方法delete
             }
         ),
         lpno: $resource(
@@ -70,4 +74,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
             }
         )
     };
-}]);
 \ No newline at end of file
+}]);
@@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "rerunLp.lpName", desc: "套跑路牌"},
                 {name: "rerunType", desc: "套跑类型"},
                 {name: "useXl.name", desc: "线路"},
-                {name: "isCancel", desc: "是否作废"}
+                {name: "isCancel", desc: "是否作废"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -141,7 +142,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
             self.toggleRerun = function(id) {
-                RM.delete({id: id}, function(result) {
+                RM.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -35,8 +35,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/rms/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         )
     };
-}]);
 \ No newline at end of file
+}]);
@@ -24,7 +24,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "xl.name", desc: "线路名称"},
                 {name: "updateDate", desc: "修改时间"},
                 {name: "qyrq", desc: "启用日期"},
-                {name: "carConfigInfo.cl.insideCode", desc: "车辆"}
+                {name: "carConfigInfo.cl.insideCode", desc: "车辆"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -257,7 +258,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.deleteRule = function(id) {
-                ScheduleRuleManage.delete({id: id}, function(result) {
+                ScheduleRuleManage.postDelete({id: id}, function(result) {
                     if (result.msg) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
                     } else {
@@ -35,6 +35,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
                 },
                 delete: {
                     method: 'DELETE'
+                },
+                postDelete: {
+                    url : '/sr1fc/pd/:id',
+                    method: 'POST',
+                    params: {id: '@id'}
                 }
             }
         ),
@@ -234,7 +234,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     var error_counts = 0; // 失败数
                     for (var n = 0; n < ttinfodetailIds.length; n++) {
                         (function(index) {
-                            queryClass.delete({id: ttinfodetailIds[index].ttdid}, function(value) {
+                            queryClass.postDelete({id: ttinfodetailIds[index].ttdid}, function(value) {
                                 if (value.status == 'ERROR') {
                                     error_counts ++;
                                     if (success_counts + error_counts == ttinfodetailIds.length) {
@@ -26,7 +26,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 {name: "xlDir", desc: "上下行"},
                 {name: "isEnableDisTemplate", desc: "是否启用"},
                 {name: "qyrq", desc: "启用日期"},
-                {name: "isCancel", desc: "是否作废"}
+                {name: "isCancel", desc: "是否作废"},
+                {name: "createDate", desc: "创建时间"}
             ];
             // 排序字段
             var orderColumns = {
@@ -175,7 +176,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
             self.toggleTtinfo = function(id) {
-                TtInfo.delete({id: id}, function(result) {
+                TtInfo.postDelete({id: id}, function(result) {
                     if (result.message) { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.message);
                     } else {
@@ -344,4 +345,4 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             });
         }
     ]
-);
 \ No newline at end of file
+);
@@ -33,6 +33,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst;
                                 }
                             }
+                        },
+                        postDelete: {
+                            url : '/tic_ec/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),
@@ -143,6 +148,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                     return dst; // 业务错误留给控制器处理
                                 }
                             }
+                        },
+                        postDelete: {
+                            url : '/tidc/pd/:id',
+                            method: 'POST',
+                            params: {id: '@id'}
                         }
                     }
                 ),