Update

徐烜
1 parent cda7cc42
Showing 11 changed files with 337 additions and 270 deletions
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/entity/CarDevice.java
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/service.js
src/main/resources/static/pages/scheduleApp/module/common/main.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@RestController(value = "carDeviceController_sc")
+@RequestMapping("cde_sc")
+public class CarDeviceController extends BController<CarDevice, Long> {
+    @Autowired
+    private CarDeviceService carDeviceService;
+
+    @RequestMapping(value = "/validate_qyrq", method = RequestMethod.GET)
+    public Map<String, Object> validate_qyrq(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            // 启用日期验证
+            CarDevice carDevice = new CarDevice(
+                    param.get("id_eq"),
+                    param.get("xl_eq"),
+                    param.get("cl_eq"),
+                    param.get("qyrq_eq")
+            );
+            carDeviceService.validate_qyrq(carDevice);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+}
 package com.bsth.entity;
  
 import com.bsth.entity.schedule.BEntity;
+import org.joda.time.DateTime;
  
 import javax.persistence.*;
 import java.util.Date;
@@ -62,6 +63,27 @@ public class CarDevice extends BEntity {
     @Column(nullable = false)
     private Boolean isCancel = false;
  
+    public CarDevice() {}
+    public CarDevice(Object id, Object xlid, Object clid, Object qyrq) {
+        if (id != null) {
+            this.id = Long.valueOf(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = Integer.valueOf(xlid.toString());
+        }
+        if (clid != null) {
+            this.cl = Integer.valueOf(clid.toString());
+        }
+        if (qyrq != null) {
+            try {
+                this.qyrq = new Date();
+                this.qyrq.setTime(Long.parseLong(qyrq.toString()));
+            } catch (Exception exp) {
+                this.qyrq = new DateTime(qyrq.toString()).toDate();
+            }
+        }
+    }
+
     public Long getId() {
         return id;
     }
@@ -26,8 +26,8 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
     public CarDevice save(CarDevice carDevice) {
         // 查找对应的车辆基础信息，更新设备编号数据
         Cars cars = carsService.findById(carDevice.getCl());
-
-        return null;
+        cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        return super.save(carDevice);
     }
  
     @Transactional
@@ -45,9 +45,25 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
         }
         param.put("xl_eq", carDevice.getXl());
         param.put("cl_eq", carDevice.getCl());
-        param.put("qyrq_ne", carDevice.getQyrq());
+        param.put("qyrq_ge", carDevice.getQyrq());
         if (!CollectionUtils.isEmpty(list(param))) {
             throw new ScheduleException("启用日期必须比历史的启用日期大");
         }
     }
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    public void toggleCancel(Long id) throws ScheduleException {
+        CarDevice carDevice = findById(id);
+        if (carDevice.getIsCancel()) {
+            carDevice.setIsCancel(false);
+        } else {
+            carDevice.setIsCancel(true);
+        }
+    }
 }
@@ -147,7 +147,7 @@
                                    ng-model="ctrl.deviceInfoForSave.qyrq" readonly
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq, 'xl': ctrl.deviceInfoForSave.xl, 'cl': ctrl.deviceInfoForSave.cl} | json}}"/>
+                                   remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
                             <span class="input-group-btn">
                                 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
                                     <i class="glyphicon glyphicon-calendar"></i>
@@ -160,7 +160,7 @@
                         启用日期必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        启用日期必须比历史的启用日期大
+                        {{$remote_msg}}
                     </div>
                 </div>
  
@@ -147,7 +147,7 @@
                                    ng-model="ctrl.deviceInfoForSave.qyrq" readonly
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq, 'xl': ctrl.deviceInfoForSave.xl, 'cl': ctrl.deviceInfoForSave.cl} | json}}"/>
+                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
                             <span class="input-group-btn">
                                 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
                                     <i class="glyphicon glyphicon-calendar"></i>
@@ -160,7 +160,7 @@
                         启用日期必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        启用日期必须比历史的启用日期大
+                        {{$remote_msg}}
                     </div>
                 </div>
  
@@ -12,7 +12,8 @@
                 <th>新设备编号</th>
                 <th>旧SIM卡</th>
                 <th>新SIM卡</th>
-                <th style="width: 180px;">创建时间</th>
+                <th style="width: 180px;">更新时间</th>
+                <th style="width: 80px;" >状态</th>
                 <th style="width: 150pt;">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -41,19 +42,24 @@
                 <td></td>
                 <td></td>
                 <td>
+                    <label class="checkbox-inline input">
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />已作废
+                    </label>
+                </td>
+                <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                            ng-click="ctrl.pageChanaged()">
+                            ng-click="ctrl.doPage()">
                         <i class="fa fa-search"></i> 搜索</button>
  
                     <button class="btn btn-sm red btn-outline filter-cancel"
-                            ng-click="ctrl.resetSearchCondition()">
+                            ng-click="ctrl.reset()">
                         <i class="fa fa-times"></i> 重置</button>
                 </td>
  
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
+            <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -79,15 +85,19 @@
                     <span ng-bind="info.newSimNo"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.createDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                    <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                </td>
+                <td>
+                    <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
+                    <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
                     <a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
-                    <a ng-click="ctrl.toggleCde(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
-                    <a ng-click="ctrl.toggleCde(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
+                    <a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>
@@ -96,9 +106,9 @@
     </div>
  
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.pageInfo.totalItems"
-                        ng-model="ctrl.pageInfo.currentPage"
-                        ng-change="ctrl.pageChanaged()"
+        <uib-pagination total-items="ctrl.page()['totalElements']"
+                        ng-model="ctrl.page()['uiNumber']"
+                        ng-change="ctrl.doPage()"
                         rotate="false"
                         max-size="10"
                         boundary-links="true"
 // 设备信息维护 service controller 等写在一起
  
-angular.module('ScheduleApp').factory('DeviceInfoManageService', ['DeviceInfoManageService_g', function(service) {
-    /** 当前的查询条件信息 */
-    var currentSearchCondition = {};
-
-    /** 当前第几页 */
-    var currentPageNo = 1;
-
-    return {
-        /**
-         * 获取查询条件信息，
-         * 用于给controller用来和页面数据绑定。
-         */
-        getSearchCondition: function() {
-            return currentSearchCondition;
-        },
-        /**
-         * 重置查询条件信息。
-         */
-        resetSearchCondition: function() {
-            var key;
-            for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
-            }
-        },
-        /**
-         * 设置当前页码。
-         * @param cpn 从1开始，后台是从0开始的
-         */
-        setCurrentPageNo: function(cpn) {
-            currentPageNo = cpn;
-        },
-        /**
-         * 组装查询参数，返回一个promise查询结果。
-         * @param params 查询参数
-         * @return 返回一个 promise
-         */
-        getPage: function() {
-            var params = currentSearchCondition; // 查询条件
-            params.page = currentPageNo - 1; // 服务端页码从0开始
-            return service.list(params).$promise;
-        },
-        /**
-         * 获取明细信息。
-         * @param id 车辆id
-         * @return 返回一个 promise
-         */
-        getDetail: function(id) {
-            var params = {id: id};
-            return service.get(params).$promise;
-        },
-        /**
-         * 保存信息。
-         * @param obj 车辆详细信息
-         * @return 返回一个 promise
-         */
-        saveDetail: function(obj) {
-            return service.save(obj).$promise;
-        },
-        /**
-         * 删除信息。
-         * @param id 主键id
-         * @returns {*|Function|promise|n}
-         */
-        deleteDetail: function(id) {
-            return service.delete({id: id}).$promise;
+angular.module('ScheduleApp').factory(
+    'DeviceInfoManageService',
+    [
+        'DeviceInfoManageService_g',
+        function(service) {
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {'isCancel_eq': false};
+
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
+
+                uiNumber: 1 // 页面绑定的页码
+            };
+
+            // 查询对象
+            var queryClass = service;
+
+            return {
+                getQueryClass: function() {
+                    return queryClass;
+                },
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+                    return currentSearchCondition;
+                },
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+                    }
+                    return currentPage;
+                },
+                resetStatus: function() {
+                    currentSearchCondition = {page: 0, 'isCancel_eq': false};
+                    currentPage = {
+                        totalElements: 0,
+                        number: 0,
+                        content: [],
+                        uiNumber: 1
+                    };
+                }
+
+            };
+
         }
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageCtrl', ['DeviceInfoManageService', '$state', function(deviceInfoManageService, $state) {
-    var self = this;
-
-    // 切换到form状态
-    self.goForm = function() {
-        //alert("切换");
-        $state.go("deviceInfoManage_form");
-    }
-
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageListCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
-    var self = this;
-    self.pageInfo = {
-        totalItems : 0,
-        currentPage : 1,
-        infos: []
-    };
-
-    // 初始创建的时候，获取一次列表数据
-    deviceInfoManageService.getPage().then(
-        function(result) {
-            self.pageInfo.totalItems = result.totalElements;
-            self.pageInfo.currentPage = result.number + 1;
-            self.pageInfo.infos = result.content;
-            deviceInfoManageService.setCurrentPageNo(result.number + 1);
-        },
-        function(result) {
-            alert("出错啦！");
+    ]
+);
+
+// index.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageCtrl',
+    [
+        'DeviceInfoManageService',
+        '$state',
+        function(service, $state) {
+            var self = this;
+
+            // 切换到form状态
+            self.goForm = function() {
+                //alert("切换");
+                $state.go("deviceInfoManage_form");
+            };
+
         }
-    );
-
-    // 翻页的时候调用
-    self.pageChanaged = function() {
-        deviceInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
-        deviceInfoManageService.getPage().then(
-            function(result) {
-                self.pageInfo.totalItems = result.totalElements;
-                self.pageInfo.currentPage = result.number + 1;
-                self.pageInfo.infos = result.content;
-                deviceInfoManageService.setCurrentPageNo(result.number + 1);
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    };
-    // 获取查询条件数据
-    self.searchCondition = function() {
-        return deviceInfoManageService.getSearchCondition();
-    };
-    // 重置查询条件
-    self.resetSearchCondition = function() {
-        deviceInfoManageService.resetSearchCondition();
-        self.pageInfo.currentPage = 1;
-        self.pageChanaged();
-    };
-
-    // 作废/撤销
-    self.toggleCde = function(id) {
-        // TODO:
-        deviceInfoManageService.deleteDetail(id).then(
-            function(result) {
-                if (result.message) { // 暂时这样做，之后全局拦截
-                    alert("失败：" + result.message);
-                } else {
-                    alert("成功！");
-
-                    deviceInfoManageService.getPage().then(
-                        function(result) {
-                            self.pageInfo.totalItems = result.totalElements;
-                            self.pageInfo.currentPage = result.number + 1;
-                            self.pageInfo.infos = result.content;
-                            deviceInfoManageService.setCurrentPageNo(result.number + 1);
-                        },
-                        function(result) {
-                            alert("出错啦！");
-                        }
-                    );
-                }
+    ]
+);
+
+// list.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageListCtrl',
+    [
+        'DeviceInfoManageService',
+        function(service) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+
+            self.page = function() {
+                return service.getPage();
+            };
+
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.doPage = function() {
+                var page = CarDevice.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+            self.reset = function() {
+                service.resetStatus();
+                var page = CarDevice.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+            self.toggleCarDevice = function(id) {
+                CarDevice.delete({id: id}, function(result) {
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
+                    } else {
+                        self.doPage();
+                    }
+                });
+            };
+
+            self.doPage();
  
-            },
-            function(result) {
-                alert("出错啦！" + result);
-            }
-        );
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageFormCtrl', ['DeviceInfoManageService', '$stateParams', '$state', function(deviceInfoManageService, $stateParams, $state) {
-    var self = this;
-
-    // 启用日期 日期控件开关
-    self.qyrqOpen = false;
-    self.qyrq_open = function() {
-        self.qyrqOpen = true;
-    };
-
-    // 欲保存的busInfo信息，绑定
-    self.deviceInfoForSave = {};
-
-    // 获取传过来的id，有的话就是修改，获取一遍数据
-    var id = $stateParams.id;
-    if (id) {
-        self.deviceInfoForSave.id = id;
-        deviceInfoManageService.getDetail(id).then(
-            function(result) {
-                var key;
-                for (key in result) {
-                    self.deviceInfoForSave[key] = result[key];
-                }
-                // 填写所有的 select 控件选中框数据
-                // 公司字典
-                if (self.deviceInfoForSave.gsName) {
-                    angular.forEach(self.gses, function(data) {
-                        if (self.deviceInfoForSave.gsName == data.gsmc) {
-                            self.deviceInfoForSave.gs_selected = data;
-                        }
-                    });
-                }
-            },
-            function(result) {
-                alert("出错啦！");
+
+        }
+    ]
+);
+
+// form.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageFormCtrl',
+    [
+        'DeviceInfoManageService',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+
+            // 启用日期 日期控件开关
+            self.qyrqOpen = false;
+            self.qyrq_open = function() {
+                self.qyrqOpen = true;
+            };
+
+            // 欲保存的busInfo信息，绑定
+            self.deviceInfoForSave = new CarDevice;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            var id = $stateParams.id;
+            if (id) {
+                CarDevice.get({id: id}, function(value) {
+                    self.deviceInfoForSave = value;
+                });
             }
-        );
-    }
-
-    // 提交方法
-    self.submit = function() {
-        console.log(self.deviceInfoForSave);
-        deviceInfoManageService.saveDetail(self.deviceInfoForSave).then(
-            function(result) {
-                // TODO：弹出框方式以后改
-                if (result.status == 'SUCCESS') {
-                    alert("保存成功！");
+
+            // 提交方法
+            self.submit = function() {
+                console.log(self.deviceInfoForSave);
+
+                // 保存或者更新
+                self.deviceInfoForSave.$save(function() {
                     $state.go("deviceInfoManage");
-                } else {
-                    alert("保存异常！");
-                }
-            },
-            function(result) {
-                // TODO：弹出框方式以后改
-                alert("出错啦！");
-            }
-        );
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageDetailCtrl', ['DeviceInfoManageService', '$stateParams', function(deviceInfoManageService, $stateParams) {
-    var self = this;
-    self.title = "";
-    self.deviceInfoForDetail = {};
-    self.deviceInfoForDetail.id = $stateParams.id;
-
-    // 当转向到此页面时，就获取明细信息并绑定
-    deviceInfoManageService.getDetail($stateParams.id).then(
-        function(result) {
-            var key;
-            for (key in result) {
-                self.deviceInfoForDetail[key] = result[key];
-            }
+                });
+            };
+
+        }
+    ]
+);
+
+// detail.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageDetailCtrl',
+    [
+        'DeviceInfoManageService',
+        '$stateParams',
+        function(service, $stateParams) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+            var id = $stateParams.id;
+
+            self.title = "";
+            self.deviceInfoForDetail = {};
+
+            // 当转向到此页面时，就获取明细信息并绑定
+            CarDevice.get({id: id}, function(value) {
+                self.deviceInfoForDetail = value;
+                self.title = "车辆 " +
+                    self.deviceInfoForDetail.clZbh +
+                    "设备信息";
+            });
  
-            self.title = "车辆 " + self.deviceInfoForDetail.clZbh + "设备信息";
-        },
-        function(result) {
-            // TODO：弹出框方式以后改
-            alert("出错啦！");
         }
-    );
-}]);
 \ No newline at end of file
+    ]
+);
 \ No newline at end of file
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
-        '/cde/:id',
-        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},
+        '/cde_sc/:id',
+        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id'},
         {
             list: {
                 method: 'GET',
                 params: {
                     page: 0
+                },
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst; // 业务错误留给控制器处理
+                    }
                 }
             },
             get: {
-                method: 'GET'
+                method: 'GET',
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst;
+                    }
+                }
             },
             save: {
                 method: 'POST'
@@ -104,18 +104,17 @@ ScheduleApp.factory(
                     // 如：{"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
  
                     var output = [];
-                    if (!status) {
+                    if (!rejection.status) {
                         alert("我擦，后台返回连个状态码都没返回，见鬼了，服务器可能重启了");
-                    } else if (status == -1) {
+                    } else if (rejection.status == -1) {
                         // 服务器断开了
                         alert("貌似服务端连接不上");
                     } else {
-                        output.push("状态编码：" + status);
-                        output.push("访问路径：" + rejection.path);
-                        output.push("错误消息：" + rejection.message);
-                        if (status == 500) {
+                        output.push("状态编码：" + rejection.status);
+                        output.push("错误内容：" + angular.toJson(rejection.data));
+                        if (rejection.status == 500) {
                             alert("服务端错误：" + "\n" + output.join("\n"));
-                        } else if (status == 407) {
+                        } else if (rejection.status == 407) {
                             alert("请重新登录：" + "\n" + output.join("\n"));
                         } else {
                             alert("其他错误：" + "\n" + output.join("\n"));
@@ -388,9 +388,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             },
  
             cde1: { // 车辆设备启用日期验证
-                template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
+                template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
                 remote: $resource( // $resource封装对象
-                    '/cde//validate/qyrq',
+                    '/cde_sc/validate_qyrq',
                     {},
                     {
                         do: {
@@ -83,17 +83,33 @@ angular.module(&#39;ScheduleApp&#39;).factory(
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
-        '/cde/:id',
-        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},
+        '/cde_sc/:id',
+        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id'},
         {
             list: {
                 method: 'GET',
                 params: {
                     page: 0
+                },
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst; // 业务错误留给控制器处理
+                    }
                 }
             },
             get: {
-                method: 'GET'
+                method: 'GET',
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst;
+                    }
+                }
             },
             save: {
                 method: 'POST'
@@ -926,9 +942,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             },
  
             cde1: { // 车辆设备启用日期验证
-                template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
+                template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
                 remote: $resource( // $resource封装对象
-                    '/cde//validate/qyrq',
+                    '/cde_sc/validate_qyrq',
                     {},
                     {
                         do: {