Merge branch 'master' of git@192.168.168.201:panzhaov5/bsth_control.git

李强
2 parents 72e5c26f ecf87ecb
Showing 10 changed files with 291 additions and 61 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/index.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/main.js
 package com.bsth;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 @SpringBootApplication
 public class Application{
+
+    @Bean
+    @Primary
+    public ObjectMapper objectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+
+        return objectMapper;
+    }
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(Application.class, args);
@@ -3,6 +3,7 @@ package com.bsth.entity;
 import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.Date;
 /**
@@ -21,7 +22,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_cars")
-public class Cars {
+public class Cars implements Serializable {
 	/** 主键Id */
 	@Id
 package com.bsth.entity;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
 import org.springframework.format.annotation.DateTimeFormat;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 
@@ -30,7 +23,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Entity
 @Table(name = "bsth_c_line")
-public class Line {
+public class Line implements Serializable {
 	// 线路ID
 	@Id
@@ -5,6 +5,7 @@ import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.Date;
 /**
@@ -12,7 +13,13 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_c_s_ccinfo")
-public class CarConfigInfo {
+@NamedEntityGraphs({
+        @NamedEntityGraph(name = "carConfigInfo_xl_cl", attributeNodes = {
+                @NamedAttributeNode("xl"),
+                @NamedAttributeNode("cl")
+        })
+})
+public class CarConfigInfo implements Serializable {
     /** 主健Id */
     @Id
@@ -2,6 +2,9 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.BaseRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Repository;
 /**
@@ -9,4 +12,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface CarConfigInfoRepository extends BaseRepository<CarConfigInfo, Long> {
+
+    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    Page<CarConfigInfo> findAll(Pageable pageable);
 }
 // 车辆配置管理 service controller 等写在一起
-angular.module('ScheduleApp').factory('BusConfigService', ['$resource', function($resource) {
-    // TODO：测试
-    return $resource(
-        '/cci',
-        {},
-        {
-            list: {
-                method: 'GET'
+angular.module('ScheduleApp').factory('BusConfigService', ['BusConfigService_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;
         }
-    );
+    };
+
 }]);
-angular.module('ScheduleApp').controller('BusConfigCtrl', ['BusConfigService', function(busConfigService) {
+angular.module('ScheduleApp').controller('BusConfigCtrl', ['BusConfigService', '$state', function(busConfigService, $state) {
+    var self = this;
+    // 切换到form状态
+    self.goForm = function() {
+        //alert("切换");
+        $state.go("busConfig_form");
+    }
 }]);
 angular.module('ScheduleApp').controller('BusConfigListCtrl', ['BusConfigService', function(busConfigService) {
-    // TODO：模拟数据
     var self = this;
-    self.totalItems = 64;
-    self.currentPage = 4;
-    self.infos = {};
-    self.pageChanaged = function() {
-        console.log("页面跳转到：" + currentPage.currentPage);
-    }
-}]);
+    self.pageInfo = {
+        totalItems : 0,
+        currentPage : 1,
+        infos: []
+    };
+
+    // 初始创建的时候，获取一次列表数据
+    busConfigService.getPage().then(
+        function(result) {
+            self.pageInfo.totalItems = result.totalElements;
+            self.pageInfo.currentPage = result.number + 1;
+            self.pageInfo.infos = result.content;
+            busConfigService.setCurrentPageNo(result.number + 1);
+        },
+        function(result) {
+            alert("出错啦！");
+        }
+    );
-angular.module('ScheduleApp').controller('BusConfigFormCtrl', ['BusConfigService', function(busConfigService) {
+    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
+    //    alert("dfdfdf");
+    //});
+
+    // 翻页的时候调用
+    self.pageChanaged = function() {
+        busConfigService.setCurrentPageNo(self.pageInfo.currentPage);
+        busConfigService.getPage().then(
+            function(result) {
+                self.pageInfo.totalItems = result.totalElements;
+                self.pageInfo.currentPage = result.number + 1;
+                self.pageInfo.infos = result.content;
+                busConfigService.setCurrentPageNo(result.number + 1);
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
+    };
+    // 获取查询条件数据
+    self.searchCondition = function() {
+        return busConfigService.getSearchCondition();
+    };
+    // 重置查询条件
+    self.resetSearchCondition = function() {
+        return busConfigService.resetSearchCondition();
+    };
 }]);
-angular.module('ScheduleApp').controller('BusConfigDetailCtrl', ['BusConfigService', function(busConfigService) {
+angular.module('ScheduleApp').controller('BusConfigFormCtrl', ['BusConfigService', '$stateParams', '$state', function(busConfigService, $stateParams, $state) {
+    // TODO：
+}]);
+angular.module('ScheduleApp').controller('BusConfigDetailCtrl', ['BusConfigService', '$stateParams', function(busConfigService, $stateParams) {
+    // TODO：
 }]);
 <div class="page-head">
     <div class="page-title">
-        <h1>车辆配置</h1>
+        <h1>车辆配置管理</h1>
     </div>
 </div>
@@ -14,7 +14,7 @@
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">车俩配置</span>
+        <span class="active">车俩配置管理</span>
     </li>
 </ul>
@@ -27,7 +27,7 @@
                     <span class="caption-subject bold uppercase">配置表</span>
                 </div>
                 <div class="actions">
-                    <a href="javascirpt:" class="btn btn-circle blue">
+                    <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.goForm()">
                         <i class="fa fa-plus"></i>
                         添加配置
                     </a>
@@ -58,7 +58,7 @@
             </div>
             <div class="portlet-body">
-                <div ui-view="list"></div>
+                <div ui-view="busConfig_list"></div>
             </div>
         </div>
     </div>
@@ -2,7 +2,7 @@
 <div ng-controller="BusConfigListCtrl as ctrl">
     <table class="table table-striped table-bordered table-hover table-checkable order-column">
         <thead>
-        <tr>
+        <tr role="row" class="heading">
             <th>
                 <input type="checkbox" class="group-checkable"/>
             </th>
@@ -16,28 +16,49 @@
             <th>是否切换</th>
             <th>操作</th>
         </tr>
+        <tr role="row" class="filter">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+                <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().tcd_like"/>
+            </td>
+            <td></td>
+            <td>
+                <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
+                        ng-click="ctrl.pageChanaged()">
+                    <i class="fa fa-search"></i> 搜索</button>
+
+                <button class="btn btn-sm red btn-outline filter-cancel"
+                        ng-click="ctrl.resetSearchCondition()">
+                    <i class="fa fa-times"></i> 重置</button>
+            </td>
+
+        </tr>
+
         </thead>
         <tbody>
-        <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
+        <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
             <td>
                 <input type="checkbox"/>
             </td>
             <td>
-                <span>TODO</span>
+                <span ng-bind="$index + 1"></span>
             </td>
             <td>
                 <span ng-bind="info.xl.name"></span>
             </td>
             <td>
-                <span ng-bind="info.cl.carCode"></span>
+                <span ng-bind="info.cl.insideCode"></span>
             </td>
             <td>
                 <span ng-bind="info.cl.equipmentCode"></span>
             </td>
             <td>
-                <span ng-bind="info.personnelType"></span>
-            </td>
-            <td>
                 <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
             </td>
             <td>
@@ -50,18 +71,26 @@
                 <span ng-bind="info.isSwitch"></span>
             </td>
             <td>
-                <span>TODO</span>
+                <!--<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="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
+                <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
             </td>
         </tr>
         </tbody>
     </table>
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.totalItems"
-                        ng-model="ctrl.currentPage"
-                        ng-change="ctrl.pageChanged()"
+        <uib-pagination total-items="ctrl.pageInfo.totalItems"
+                        ng-model="ctrl.pageInfo.currentPage"
+                        ng-change="ctrl.pageChanaged()"
+                        rotate="false"
+                        max-size="10"
+                        boundary-links="true"
+                        first-text="首页"
                         previous-text="上一页"
-                        next-text="下一页">
+                        next-text="下一页"
+                        last-text="尾页">
         </uib-pagination>
     </div>
 </div>
 \ No newline at end of file
@@ -114,7 +114,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             resolve: {
                 deps: ['$ocLazyLoad', function($ocLazyLoad) {
                     return $ocLazyLoad.load({
-                        name: 'busInfoManage_module',
+                        name: 'busInfoManage_detail_module',
                         insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
                         files: [
                             "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
@@ -194,7 +194,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             resolve: {
                 deps: ['$ocLazyLoad', function($ocLazyLoad) {
                     return $ocLazyLoad.load({
-                        name: 'employeeInfoManage_module',
+                        name: 'employeeInfoManage_detail_module',
                         insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
                         files: [
                             "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"
@@ -274,7 +274,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             resolve: {
                 deps: ['$ocLazyLoad', function($ocLazyLoad) {
                     return $ocLazyLoad.load({
-                        name: 'deviceInfoManage_module',
+                        name: 'deviceInfoManage_detail_module',
                         insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
                         files: [
                             "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"
@@ -284,13 +284,6 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             }
         })
-
-
-
-
-
-
-
         // 车辆配置模块
         .state("busConfig", {
             url: '/busConfig',
@@ -298,7 +291,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                 "": {
                     templateUrl: 'pages/scheduleApp/module/core/busConfig/index.html'
                 },
-                "list@busConfig": {
+                "busConfig_list@busConfig": {
                     templateUrl: 'pages/scheduleApp/module/core/busConfig/list.html'
                 }
             },
@@ -315,6 +308,76 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                 }]
             }
         })
+        .state("busConfig_form", {
+            url: '/busConfig_form',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/form.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'busConfig_form_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "assets/bower_components/angular-ui-select/dist/select.min.css",
+                            "assets/bower_components/angular-ui-select/dist/select.min.js",
+                            "pages/scheduleApp/module/core/busConfig/busConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("busConfig_edit", {
+            url: '/busConfig_edit/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/edit.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'busConfig_edit_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "assets/bower_components/angular-ui-select/dist/select.min.css",
+                            "assets/bower_components/angular-ui-select/dist/select.min.js",
+                            "pages/scheduleApp/module/core/busConfig/busConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("busConfig_detail", {
+            url: '/busConfig_detail/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/detail.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'busConfig_detail_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "pages/scheduleApp/module/core/busConfig/busConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         // 人员配置模块
         .state("employeeConfig", {
@@ -433,6 +496,28 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;DeviceInfoManageService_g&#39;, [&#39;$resource&#39;,
     );
 }]);
+// 车辆配置service
+angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
+    return $resource(
+        '/cci/:id',
+        {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
+        {
+            list: {
+                method: 'GET',
+                params: {
+                    page: 0
+                }
+            },
+            get: {
+                method: 'GET'
+            },
+            save: {
+                method: 'POST'
+            }
+        }
+    );
+}]);
+