update...

panzhaov5
1 parent 607b0f31
Showing 6 changed files with 58 additions and 49 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/schedule/e_state_check/ScheduleStationCodeChecker.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -30,7 +30,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	DayOfSchedule dayOfSchedule;
 	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
-	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId,@RequestParam String jGh, String sGh,@RequestParam String nbbm){
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
 		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
 	}
@@ -103,7 +103,7 @@ public class ScheduleStationCodeChecker {
                 rs.add(sci);
                 continue;
             }
-            else if(null != sci && !sci.getRealStationCode().equals(getCode(sch, qdOrZd))){//名称一致的站点，编码不一致
+            else if(null != sci && !codeEq(sci, getCode(sch, qdOrZd))){//名称一致的站点，编码不一致
                 sci.setStationCode(getCode(sch, qdOrZd));
                 rs.add(sci);
                 continue;
@@ -112,6 +112,10 @@ public class ScheduleStationCodeChecker {
         return rs;
     }
+    private boolean codeEq(SCodeInfo sci, String code){
+        return sci.getRealStationCode().equals(code) || sci.getRealStationCode().indexOf(code + "^") != -1;
+    }
+
     private String getName(ScheduleRealInfo sch, String qdOrZd) {
         return qdOrZd.equals("qd")?sch.getQdzName():sch.getZdzName();
     }
@@ -126,8 +130,19 @@ public class ScheduleStationCodeChecker {
         List<SCodeInfo> realList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SCodeInfo.class));
         Map<String, SCodeInfo> realMap = new HashMap<>();
+        String kName;
+        SCodeInfo old;
         for (SCodeInfo sci : realList) {
-            realMap.put(sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getStationName(), sci);
+            kName = sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getStationName();
+
+            if(realMap.containsKey(kName)){
+                //环线可能存在同名的站点
+                old = realMap.get(kName);
+                old.setRealStationCode(old.getRealStationCode() + "^" + sci.getRealStationCode() + "^");
+                continue;
+            }
+
+            realMap.put(kName, sci);
             realMap.put(sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getRealStationCode(), sci);
         }
@@ -190,66 +190,57 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo sch = dayOfSchedule.get(schId);
             String gsbm = sch.getGsBm(), fgsbm = sch.getFgsBm();
-            if(StringUtils.isBlank(jGh) || "/".equals(StringUtils.trim(jGh))){
-                rs.put("msg", "无效的参数【驾驶员】");
-                rs.put("status", ResponseCode.ERROR);
-                return rs;
-            }
-            //校验运营公司
-            Personnel jsy = BasicData.perMap.get(gsbm + "-" + jGh);
-            if (null == jsy) {
-                msg = "【驾驶员】:" + sch.getGsName() + "暂无工号为" + "【" + jGh + "】的人员";
-                rs.put("msg", msg);
-                return rs;
-            }
-
-            if (!carExist(gsbm, nbbm)) {
+            if (nbbm != null && !carExist(gsbm, nbbm)) {
                 msg = sch.getGsName() + "没有自编号为" + "[" + nbbm + "]的车辆";
                 rs.put("msg", msg);
                 return rs;
             }
-            if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(nbbm))) {
+            if (nbbm != null && !sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(nbbm))) {
                 rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + nbbm + "】的车辆");
                 return rs;
             }
-            Personnel spy = null;
-            if (StringUtils.isNotEmpty(sGh)) {
-                spy = BasicData.perMap.get(gsbm + "-" + sGh);
-                if (null == spy) {
-                    msg = "【售票员】: " + sch.getGsName() + "暂无工号为" + "【" + sGh + "】的人员";
-                    rs.put("msg", msg);
-                    return rs;
-                }
-            }
+            if (nbbm != null && !(fgsbm + "_" + gsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))) {
+                String clFgsName = BasicData.businessFgsCodeNameMap.get(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm));
-            //校验分公司
-            if (null != jsy && !fgsbm.equals(jsy.getBrancheCompanyCode())) {
-                msg = ("【驾驶员】:" + jGh + "/" + jsy.getPersonnelName() + "是" + jsy.getBrancheCompany() + "的人员");
+                msg = ("【" + nbbm + "】" + "是" + clFgsName + "的车辆！");
                 rs.put("msg", msg);
                 rs.put("checkStatus", -1);
                 return rs;
             }
-            if (StringUtils.isNotEmpty(sGh)) {
-                if (null != spy && !fgsbm.equals(spy.getBrancheCompanyCode())) {
-                    msg = ("【售票员】: " + jGh + "/" + spy.getPersonnelName() + "是" + spy.getBrancheCompany() + "的人员");
+            if(null != jGh && !"/".equals(StringUtils.trim(jGh))){
+                Personnel jsy = BasicData.perMap.get(gsbm + "-" + jGh);
+
+                if (null == jsy) {
+                    msg = "【驾驶员】:" + sch.getGsName() + "暂无工号为" + "【" + jGh + "】的人员";
+                    rs.put("msg", msg);
+                    return rs;
+                }
+                else if (!fgsbm.equals(jsy.getBrancheCompanyCode())) {
+                    //校验分公司
+                    msg = ("【驾驶员】:" + jGh + "/" + jsy.getPersonnelName() + "是" + jsy.getBrancheCompany() + "的人员");
                     rs.put("msg", msg);
                     rs.put("checkStatus", -1);
                     return rs;
                 }
             }
-            if (!(fgsbm + "_" + gsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))) {
-
-                String clFgsName = BasicData.businessFgsCodeNameMap.get(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm));
-
-                msg = ("【" + nbbm + "】" + "是" + clFgsName + "的车辆！");
-                rs.put("msg", msg);
-                rs.put("checkStatus", -1);
-                return rs;
+            if (null != sGh && !"/".equals(StringUtils.trim(sGh))) {
+                Personnel spy = BasicData.perMap.get(gsbm + "-" + sGh);
+                if (null == spy) {
+                    msg = "【售票员】: " + sch.getGsName() + "暂无工号为" + "【" + sGh + "】的人员";
+                    rs.put("msg", msg);
+                    return rs;
+                }
+                else if (!fgsbm.equals(spy.getBrancheCompanyCode())) {
+                    msg = ("【售票员】: " + jGh + "/" + spy.getPersonnelName() + "是" + spy.getBrancheCompany() + "的人员");
+                    rs.put("msg", msg);
+                    rs.put("checkStatus", -1);
+                    return rs;
+                }
             }
             rs.put("checkStatus", 1);
@@ -3318,11 +3309,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Set<ScheduleRealInfo> set = new HashSet<>();
         ScheduleRealInfo sch;
-        //StringBuilder sb = new StringBuilder();
         String jGh = null, jName, sGh, sName;
         for (ChangePersonCar cpc : cpcs) {
-            //sb = new StringBuilder();
             sch = dayOfSchedule.get(cpc.getSchId());
             if (sch == null)
@@ -285,11 +285,11 @@
             });
             function check_fgs_ascription(data, cb) {
-                var jGh = data.jsy.split('/')[0]
-                        ,sGh
-                        ,nbbm = data.clZbh;
+                var jGh,sGh,nbbm = data.clZbh;
                 if(data.spy)
                     sGh = data.spy.split('/')[0];
+                if(data.jsy)
+                    jGh = data.jsy.split('/')[0];
                 gb_common.$post('/realSchedule/check_fgs_ascription',{
                             schId: data.schId,
@@ -48,11 +48,12 @@
             <ul class="uk-list uk-list-line" style="margin-bottom: 0;">
                 {{each list as obj i}}
                     {{if obj.realStationCode!=null}}
-                        <li>【{{obj.stationName}}】班次编码 <span style="color: red;">{{obj.stationCode}}</span> -实际：{{obj.realStationCode}}</li>
+                        <li>【{{obj.stationName}}】班次用的站点 <span style="color: red;">{{obj.stationCode}}</span> -实际：{{obj.realStationCode}}</li>
                     {{else}}
-                        <li>【{{obj.stationName}}】班次编码 <span style="color: red;">{{obj.stationCode}}</span> -在当前线路站点中不存在</li>
+                        <li>【{{obj.stationName}}】班次用的站点 <span style="color: red;">{{obj.stationCode}}</span> -在站点路由中不存在的</li>
                     {{/if}}
                 {{/each}}
+
             </ul>
         </div>
     </script>
@@ -825,6 +825,10 @@ var gb_schedule_table = (function () {
         var k;
         for(var i=0,obj;obj=list[i++];){
             k = obj.lineCode+'_'+obj.upDown;
+
+            if(obj.realStationCode && obj.realStationCode.indexOf('^') != -1)
+                obj.realStationCode = obj.realStationCode.split('^')[0];
+
             if(!data[k])
                 data[k] = [];
             data[k].push(obj);
@@ -837,7 +841,7 @@ var gb_schedule_table = (function () {
                 continue;
             $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap)
-                .html('o(*￣▽￣*)o 班次站点编码有点问题！！').show();
+                .html('o(*￣▽￣*)o 班次和站点关联有点问题！！').show();
         }
         errorCodeData = data;