Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 16a877b3 f10a219b
Showing 20 changed files with 158 additions and 25 deletions
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/EmployeeConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/GuideboardInfoRepository.java
src/main/java/com/bsth/repository/schedule/RerunRuleRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanRepository.java
src/main/java/com/bsth/repository/schedule/ScheduleRule1FlatRepository.java
src/main/java/com/bsth/repository/schedule/TTInfoRepository.java
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
src/main/resources/static/pages/scheduleApp/module/common/main.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.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/guideboardManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
 package com.bsth.entity;
  
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
 import org.springframework.format.annotation.DateTimeFormat;
  
 import javax.persistence.*;
@@ -69,6 +70,10 @@ public class Line implements Serializable {
 	/** 分公司  varchar length(50)*/
 	private String brancheCompany;
  
+    /** 组合公司分公司编码 */
+    @Formula(" concat(company, '_', branche_company) ")
+    private String cgsbm;
+
 	/** 性质(线路类型) varchar length(50) */
 	private String nature;
  
@@ -457,4 +462,12 @@ public class Line implements Serializable {
 	public Integer getInUse() { return inUse; }
  
 	public void setInUse(Integer inUse) { this.inUse = inUse; }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
 }
@@ -19,7 +19,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface CarConfigInfoRepository extends BaseRepository<CarConfigInfo, Long> {
  
-    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<CarConfigInfo> findAll(Specification<CarConfigInfo> spec, Pageable pageable);
  
@@ -27,7 +27,9 @@ public interface EmployeeConfigInfoRepository extends BaseRepository&lt;EmployeeCon
     @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
     List<EmployeeConfigInfo> findByXlId(Integer xlid);
  
-    @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<EmployeeConfigInfo> findAll(Specification<EmployeeConfigInfo> spec, Pageable pageable);
  
@@ -21,7 +21,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface GuideboardInfoRepository extends BaseRepository<GuideboardInfo, Long> {
  
-    @EntityGraph(value = "guideboardInfo_xl", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "guideboardInfo_xl", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<GuideboardInfo> findAll(Specification<GuideboardInfo> spec, Pageable pageable);
  
@@ -15,7 +15,9 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface RerunRuleRepository extends BaseRepository<RerunRule, Long> {
-    @EntityGraph(value = "dylp", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "dylp", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<RerunRule> findAll(Specification<RerunRule> spec, Pageable pageable);
  
@@ -5,7 +5,6 @@ import com.bsth.repository.BaseRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Repository;
  
 /**
@@ -13,7 +12,9 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SchedulePlanRepository extends BaseRepository<SchedulePlan, Long> {
-    @EntityGraph(value = "schedulePlan_xl", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "schedulePlan_xl", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<SchedulePlan> findAll(Specification<SchedulePlan> spec, Pageable pageable);
  
@@ -18,7 +18,9 @@ import java.util.List;
 @Repository
 public interface ScheduleRule1FlatRepository extends BaseRepository<ScheduleRule1Flat, Long> {
  
-    @EntityGraph(value = "scheduleRule1Flat_xl_carconfig", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "scheduleRule1Flat_xl_carconfig", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<ScheduleRule1Flat> findAll(Specification<ScheduleRule1Flat> spec, Pageable pageable);
  
@@ -19,7 +19,9 @@ import java.util.List;
 @Repository
 public interface TTInfoRepository extends BaseRepository<TTInfo, Long> {
  
-    @EntityGraph(value = "ttInfo_xl", type = EntityGraph.EntityGraphType.FETCH)
+//    @EntityGraph(value = "ttInfo_xl", type = EntityGraph.EntityGraphType.FETCH)
+    // 因为使用了in操作符，用 @EntityGraph会报错，升到hibernate 5.0.4就好了，暂时不用@EntityGraph
+    // Hibernate ORMHHH-9230
     @Override
     Page<TTInfo> findAll(Specification<TTInfo> spec, Pageable pageable);
  
@@ -19,7 +19,8 @@
 angular.module('ScheduleApp').directive('saSelect5', [
     '$timeout',
     '$$SearchInfoService_g',
-    function($timeout, $$searchInfoService_g) {
+    'UserPrincipal',
+    function($timeout, $$searchInfoService_g, UserPrincipal) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html',
@@ -281,6 +282,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 }
                             }
  
+                            // 添加线路查询用的公司分公司信息
+                            if (atype == 'xl') {
+                                if (UserPrincipal.getGsStrs().length > 0) {
+                                    ajaxparamobj["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                                }
+                            }
+
                             $$searchInfoService_g[atype].list(
                                 ajaxparamobj,
                                 function(result) {
@@ -9,6 +9,41 @@ var ScheduleApp = angular.module(&#39;ScheduleApp&#39;, [
     'ngHandsontable'
 ]);
  
+ScheduleApp.factory('UserPrincipal', [
+    '$http',
+    function($http) {
+        // 登录后获取用户公司信息
+
+        var gsinfos = []; // 原始返回的对象数据
+        var gsinfo_strs = []; // 拼装以后的
+
+        $http({
+            method: 'GET',
+            url: '/user/companyData'
+        }).then(function(result) {
+            if (angular.isArray(result.data)) {
+                gsinfos = result;
+                angular.forEach(result.data, function(obj) {
+                    var gsbm = obj.companyCode;
+                    angular.forEach(obj.children, function(obj2) {
+                        var fgsbm = obj2.code;
+                        gsinfo_strs.push(gsbm + "_" + fgsbm);
+                    });
+                });
+
+            }
+            console.log(gsinfos);
+            console.log(gsinfo_strs);
+        });
+
+        return {
+            getGsStrs: function() {
+                return gsinfo_strs;
+            }
+        };
+    }
+]);
+
 /**
  * 用于请求通知。
  */
@@ -154,8 +189,15 @@ ScheduleApp.factory(&#39;settings&#39;, [&#39;$rootScope&#39;, function($rootScope) {
 }]);
  
 /** Schedule App 主应用控制器 */
-ScheduleApp.controller('ScheduleAppController', ['$scope', function($scope) {
-    $scope.$on('$viewContentLoaded', function(event) {
-        console.log("子页面已载入：" + event);
-    });
-}]);
 \ No newline at end of file
+ScheduleApp.controller('ScheduleAppController', [
+    '$scope',
+    'UserPrincipal',
+    function($scope, UserPrincipal) {
+        $scope.$on('$viewContentLoaded', function(event) {
+            console.log("子页面已载入：" + event);
+        });
+
+        // 获取一次用户身份信息
+        UserPrincipal.getGsStrs();
+    }
+]);
 \ No newline at end of file
@@ -1324,7 +1324,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect4&#39;, [
 angular.module('ScheduleApp').directive('saSelect5', [
     '$timeout',
     '$$SearchInfoService_g',
-    function($timeout, $$searchInfoService_g) {
+    'UserPrincipal',
+    function($timeout, $$searchInfoService_g, UserPrincipal) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html',
@@ -1586,6 +1587,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 }
                             }
  
+                            // 添加线路查询用的公司分公司信息
+                            if (atype == 'xl') {
+                                if (UserPrincipal.getGsStrs().length > 0) {
+                                    ajaxparamobj["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                                }
+                            }
+
                             $$searchInfoService_g[atype].list(
                                 ajaxparamobj,
                                 function(result) {
@@ -185,7 +185,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
 );
  
 // 车辆配置service
-angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
+angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
         rest : $resource(
             '/cci/:id',
@@ -3,7 +3,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'BusConfigService',
     [
         'BusConfigService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
  
@@ -29,6 +30,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 /**
 // 车辆配置service
-angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
+angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
         rest : $resource(
             '/cci/:id',
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'EmployeeConfigService',
     [
         'EmployeeConfigService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
             // 当前查询返回的信息
@@ -29,6 +30,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 /**
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'GuideboardManageService',
     [
         'GuideboardManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
  
             /** 当前的查询条件信息 */
             var currentSearchCondition = {page: 0, 'isCancel_eq': false};
@@ -31,6 +32,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 /**
@@ -3,7 +3,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'RerunManageService',
     [
         'rerunManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {'isCancel_eq': false};
  
@@ -25,6 +26,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 },
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["rerunXl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 getPage: function(page) {
-// 车辆配置管理 service controller 等写在一起
+// 排班计划管理 service controller 等写在一起
 angular.module('ScheduleApp').factory(
     'SchedulePlanManageService',
     [
         'SchedulePlanManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {};
  
@@ -25,6 +26,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 },
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 getPage: function(page) {
@@ -3,7 +3,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'ScheduleRuleManageService',
     [
         'ScheduleRuleManageService_g',
-        function(service) {
+        'UserPrincipal',
+        function(service, UserPrincipal) {
             /** 当前的查询条件信息 */
             var currentSearchCondition = {};
  
@@ -30,6 +31,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  */
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 getPage: function(page) {
@@ -4,7 +4,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     [
         'TTInfoManageService_g',
         'TimeTableDetailManageService_g',
-        function(service, dservice) {
+        'UserPrincipal',
+        function(service, dservice, UserPrincipal) {
             // 当前查询的内容条件搜索对象
             var currentSearchCondition = {page: 0, 'isCancel_eq': false};
             // 当前查询返回的信息
@@ -25,6 +26,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 },
                 getSearchCondition: function() {
                     currentSearchCondition.page = currentPage.uiNumber - 1;
+
+                    // 加公司判定
+                    if (UserPrincipal.getGsStrs().length > 0) {
+                        currentSearchCondition["xl.cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
+                    }
+
                     return currentSearchCondition;
                 },
                 getPage: function(page) {