调度值勤日报，修改车辆1，车辆2配置，添加remotevalidate验证，判定是否在当前线路中配置

徐烜
1 parent ef0e2354
Showing 6 changed files with 73 additions and 0 deletions
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/service/schedule/CarConfigInfoService.java
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
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
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
@@ -58,4 +58,25 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_cars_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 车辆重复配置验证
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_config(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
 }
@@ -8,5 +8,6 @@ import com.bsth.service.schedule.exception.ScheduleException;
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
     void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
 }
@@ -73,6 +73,17 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     }
+    @Override
+    public void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", carConfigInfo.getXl().getId());
+        param.put("cl.id_eq", carConfigInfo.getCl().getId());
+        List<CarConfigInfo> carConfigInfos = list(param);
+        if (CollectionUtils.isEmpty(carConfigInfos)) {
+            throw new ScheduleException("当前车辆没有配置在当前线路中，不属于当前线路！");
+        }
+    }
+
     @Transactional
     @Override
     public void delete(Long aLong) throws ScheduleException {
@@ -441,6 +441,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            cc_cars_config: { // 车辆是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cci/validate_cars_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             ec_jsy: { // 驾驶员不能重复配置
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -1319,6 +1319,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            cc_cars_config: { // 车辆是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cci/validate_cars_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             ec_jsy: { // 驾驶员不能重复配置
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -89,6 +89,14 @@
                             <div class="alert alert-danger well-sm" ng-show="myForm.cl1.$error.required">
                                 车辆1必须选择
                             </div>
+
+                            <input type="hidden" name="cl1_h" ng-model="ctrl.formData.cl1.id"
+                                   remote-Validation
+                                   remotevtype="cc_cars_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'cl.id_eq': ctrl.formData.cl1.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.cl1_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
                             <label class="col-md-5 control-label">车辆2：</label>
@@ -106,6 +114,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="cl2_h" ng-model="ctrl.formData.cl1.id"
+                                   remote-Validation
+                                   remotevtype="cc_cars_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'cl.id_eq': ctrl.formData.cl2.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.cl2_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group has-success has-feedback">