update

徐烜
1 parent 3ee4a802
Showing 8 changed files with 141 additions and 85 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/main.js
src/main/resources/static/pages/scheduleApp/module/other/truefalseRadioGroupTemplate.html
 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;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class Application{
-    @Bean
-    @Primary
-    public ObjectMapper objectMapper() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-
-        return objectMapper;
-    }
+//    @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);
@@ -73,12 +73,16 @@ public class SchedulePlanInfo {
     /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
     @Column(nullable = false)
     private Integer qdz;
+    /** 起点站code */
+    private String qdzCode;
     /** 起点站名字 */
     @Column(nullable = false)
     private String qdzName;
     /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
     @Column(nullable = false)
     private Integer zdz;
+    /** 终点站code */
+    private String zdzCode;
     /** 终点站名字 */
     @Column(nullable = false)
     private String zdzName;
@@ -365,4 +369,20 @@ public class SchedulePlanInfo {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
 }
@@ -218,48 +218,28 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否空调车：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="hvacCar" ng-value="true" ng-model="ctrl.busInfoForDetail.hvacCar" disabled/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="hvacCar" ng-value="false" ng-model="ctrl.busInfoForDetail.hvacCar" disabled/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForDetail.hvacCar" disabled="true" dicgroup="truefalseType" name="hvacCar"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">有无人售票：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="ticketType" ng-value="true" ng-model="ctrl.busInfoForDetail.ticketType" disabled/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="ticketType" ng-value="false" ng-model="ctrl.busInfoForDetail.ticketType" disabled/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForDetail.ticketType" disabled="true" dicgroup="truefalseType" name="ticketType"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有LED服务屏：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen" ng-value="true" ng-model="ctrl.busInfoForDetail.ledScreen" disabled/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen" ng-value="false" ng-model="ctrl.busInfoForDetail.ledScreen" disabled/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForDetail.ledScreen" disabled="true" dicgroup="truefalseType" name="ledScreen"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有TV视屏：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="tvVideoType" ng-value="true" ng-model="ctrl.busInfoForDetail.tvVideoType" disabled/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="tvVideoType" ng-value="false" ng-model="ctrl.busInfoForDetail.tvVideoType" disabled/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForDetail.tvVideoType" disabled="true" dicgroup="truefalseType" name="tvVideoType"></truefalse-Dic>
                     </div>
                 </div>
@@ -299,12 +279,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="sfdc" ng-value="true" ng-model="ctrl.busInfoForDetail.sfdc" disabled/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="sfdc" ng-value="true" ng-model="ctrl.busInfoForDetail.sfdc" disabled/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></truefalse-Dic>
                     </div>
                 </div>
@@ -320,56 +320,28 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否空调车：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="hvacCar"
-                                   ng-value="true" ng-model="ctrl.busInfoForSave.hvacCar"/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="hvacCar"
-                                   ng-value="false" ng-model="ctrl.busInfoForSave.hvacCar"/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForSave.hvacCar" dicgroup="truefalseType" name="hvacCar"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">有无人售票：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="ticketType"
-                                   ng-value="true" ng-model="ctrl.busInfoForSave.ticketType"/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="ticketType"
-                                   ng-value="false" ng-model="ctrl.busInfoForSave.ticketType"/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForSave.ticketType" dicgroup="truefalseType" name="ticketType"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有LED服务屏：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen"
-                                   ng-value="true" ng-model="ctrl.busInfoForSave.ledScreen"/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen"
-                                   ng-value="false" ng-model="ctrl.busInfoForSave.ledScreen"/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForSave.ledScreen" dicgroup="truefalseType" name="ledScreen"></truefalse-Dic>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有TV视屏：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="tvVideoType"
-                                   ng-value="true" ng-model="ctrl.busInfoForSave.tvVideoType"/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="tvVideoType"
-                                   ng-value="false" ng-model="ctrl.busInfoForSave.tvVideoType"/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForSave.tvVideoType" dicgroup="truefalseType" name="tvVideoType"></truefalse-Dic>
                     </div>
                 </div>
@@ -439,14 +411,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <label class="radio-inline">
-                            <input type="radio" name="sfdc"
-                                   ng-value="true" ng-model="ctrl.busInfoForSave.sfdc"/>是
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="sfdc"
-                                   ng-value="false" ng-model="ctrl.busInfoForSave.sfdc"/>否
-                        </label>
+                        <truefalse-Dic model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></truefalse-Dic>
                     </div>
                 </div>
@@ -45,7 +45,8 @@
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="insideCode" ng-model="ctrl.busInfoForSave.insideCode"
-                                required ng-maxlength="8" placeholder="请输入车辆内部编码"/>
+                                required ng-maxlength="8" remote-Validaton rvtype="zbh"
+                               placeholder="请输入车辆内部编码"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.required">
@@ -54,6 +55,9 @@
                     <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.maxlength">
                         内部编号长度不能超过8位
                     </div>
+                    <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.remote">
+                        内部编号不能重复
+                    </div>
                 </div>
                 <div class="form-group has-success has-feedback">
@@ -91,7 +91,7 @@
                 <span ng-bind="info.brancheCompany"></span>
             </td>
             <td>
-                <span ng-bind="info.sfdc"></span>
+                <span ng-bind="info.sfdc | dict:'truefalseType':'未知' "></span>
             </td>
             <td>
                 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
@@ -657,6 +657,10 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
         ;
 }]);
+// 自定义的一些指令
+
+
+
 // 全局service放置在此处，
 // 一般这种服务会被其他模块调用的，所以干脆放到main.js里
@@ -875,6 +879,88 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusLineInfoStatService_g&#39;, [&#39;$resource&#39;, 
 }]);
+//--------------------------- 通用filter和directive -----------------------------//
+angular.module('ScheduleApp').filter("dict", [function() {
+    /**
+     * 字典过滤器，将后台的字典编码转换成文字说明。
+     * code，过滤的值，group，过滤的参数（字典group类型），dv没有匹配到的默认值
+     * 用例：sfdc | dict:'dctype'
+     */
+    return function(code, group, dv) {
+        if (code == null) {
+            return dv;
+        } else {
+            return dictionaryUtils.transformCode(group, code);
+        }
+    };
+}]);
+
+angular.module('ScheduleApp').directive("truefalseDic", [function() {
+    /**
+     * true，false组合的单元按钮组的指令。
+     * 指令名称：truefalse-Dic
+     */
+    return {
+        restrict: 'E',
+        templateUrl: '/pages/scheduleApp/module/other/truefalseRadioGroupTemplate.html',
+        scope: {
+            model: "="
+        },
+        /**
+         * model 是绑定外部值。
+         * disabled 说明是否不能修改
+         * dicgroup 字典组的类型
+         */
+        link: function(scope, element, attr) {
+            if (attr["name"]) {
+                scope["nv"] = attr["name"];
+            }
+
+            if (attr["disabled"]) {
+                element.find("input").attr("disabled", "");
+            }
+            if (attr["dicgroup"]) {
+                var obj = dictionaryUtils.getByGroup(attr['dicgroup']);
+                if (obj["true"])
+                    scope["trueDesc"] = obj["true"];
+                else
+                    scope["trueDesc"] = "未知true";
+
+                if (obj["false"])
+                    scope["falseDesc"] = obj["false"];
+                else
+                    scope["falseDesc"] = "未知false";
+            } else {
+                scope["trueDesc"] = "未知true";
+                scope["falseDesc"] = "未知false";
+            }
+        }
+    };
+}]);
+
+angular.module('ScheduleApp').directive("remoteValidaton", [function() {
+    /**
+     * 远端验证指令，依赖于ngModel
+     * 指令名称 remote-Validation
+     * 需要属性 rvtype 表示验证类型
+     */
+    return {
+        restrict: "A",
+        require: "ngModel",
+        link: function(scope, element, attr, ngModelCtrl) {
+            element.bind("keyup", function() {
+                if (attr["rvtype"]) {
+                    // 根据rvtype的值，确定使用那个远端验证的url，
+                    // 这个貌似没法通用，根据业务变换
+                    console.log(attr['rvtype']);
+                } else {
+                    // 没有rvtype，就不用远端验证了
+                    ngModelCtrl.$setValidity('remote', true);
+                }
+            });
+        }
+    };
+}]);
+<div>
+    <label class="radio-inline">
+        <input type="radio" name="{{nv}}"
+               ng-value="true" ng-model="model" {{disabled}}/>{{trueDesc}}
+    </label>
+    <label class="radio-inline">
+        <input type="radio" name="{{nv}}"
+               ng-value="false" ng-model="model" {{disabled}}/>{{falseDesc}}
+    </label>
+</div>
 \ No newline at end of file