大客流预警,临加班次,优先选择最近完成班次的车辆

yiming
1 parent ffe9152e
Showing 2 changed files with 56 additions and 21 deletions
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/real_control_v2/zndd/type/dkl.html
@@ -169,43 +169,78 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
                 lines.add(map.get("xlbm").toString());
             }
         }
-        List<String> nbbms=new ArrayList<>();
-        List<String> jghs=new ArrayList<>();
-        List<String> jNames=new ArrayList<>();
+        List<Map<String,String>> schs=new ArrayList<>();
+        LocalTime localTime=LocalTime.now().plusHours(1);
+        LocalTime now=LocalTime.now();
+        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
         for (String lineCode : lines) {
             Set<String> set = dayOfSchedule.findCarByLineCode(lineCode);
-            LocalTime localTime=LocalTime.now().plusHours(1);
-            DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
             for (String nbbm : set) {
                 ScheduleRealInfo s=dayOfSchedule.executeCurr(nbbm);//当前执行班次
                 if(s==null){//当日班次执行完毕
                     List<ScheduleRealInfo> list=dayOfSchedule.findByNbbm(nbbm);
                     if(list.size()>0){
-                        ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次
-                        nbbms.add(s2.getClZbh());
-                        jghs.add(s2.getjGh());
-                        jNames.add(s2.getjName());
+                        ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次\
+                        if(s2.getZdsjActual()!=null && LocalTime.parse(s2.getZdsjActual(),dtf).isBefore(now)){
+                            Map<String,String> schMap = new HashMap<>();
+                            schMap.put("nbbm",s2.getClZbh());
+                            schMap.put("jgh",s2.getjGh());
+                            schMap.put("jName",s2.getjName());
+                            schMap.put("zdsjActual",s2.getZdsjActual());
+                            System.out.println(s2.getClZbh()+s2.getZdsjActual()+lineCode);
+                            schs.add(schMap);
+                        }
                     }
                 }else {//1小时内是否有待执行班次
                     LocalTime fcsj=LocalTime.parse(s.getFcsj(),dtf);
                     if(fcsj.isAfter(localTime)){
-                        nbbms.add(s.getClZbh());
-                        jghs.add(s.getjGh());
-                        jNames.add(s.getjName());
+                        //查询上一个班次
+                        ScheduleRealInfo s2=dayOfSchedule.prev(s);
+                        if(s.getZdsjActual()!=null && LocalTime.parse(s2.getZdsjActual(),dtf).isBefore(now)){
+                            Map<String,String> schMap = new HashMap<>();
+                            schMap.put("nbbm",s2.getClZbh());
+                            schMap.put("jgh",s2.getjGh());
+                            schMap.put("jName",s2.getjName());
+                            schMap.put("zdsjActual",s2.getZdsjActual());
+                            System.out.println(s2.getClZbh()+s2.getZdsjActual()+lineCode);
+                            schs.add(schMap);
+                        }
                     }
                 }
             }
         }
+        Collections.sort(schs, new Comparator<Map<String, String>>(){
+            public int compare(Map<String, String> o1, Map<String, String> o2) {
+                String zdsjActual1 = o1.get("zdsjActual");
+                String zdsjActual2 = o2.get("zdsjActual");
+                return zdsjActual2.compareTo(zdsjActual1);
+            }
+
+        });
         StringBuffer sb=new StringBuffer();
         String kscl="";
-        if(nbbms.size()>0){
-            sch.setClZbh(nbbms.get(0));
-            sch.setjGh(jghs.get(0));
-            sch.setjName(jNames.get(0));
-            int size =nbbms.size()>10?9:nbbms.size();
+        List<Map<String, String>> schs2 = new ArrayList<>();
+
+        // 创建用于去重的 Set<Map>
+        Set<Map<String, String>> set = new HashSet<>();
+        // 遍历原始的 List<Map>
+        for (Map<String, String> map : schs) {
+            // 创建一个新的 Map 用于存储合并去重后的结果
+            Map<String, String> newMap = new HashMap<>(map);
+            // 如果新的 Map 成功添加到 Set 中，说明是一个新的 Map，将其添加到结果 List<Map> 中
+            if (set.add(newMap)) {
+                schs2.add(newMap);
+            }
+        }
+        if(schs2.size()>0){
+            sch.setClZbh(schs2.get(0).get("nbbm"));
+            sch.setjGh(schs2.get(0).get("jgh"));
+            sch.setjName(schs2.get(0).get("jName"));
+            int size =schs2.size()>8?8:schs2.size();
             for (int i = 0; i < size; i++) {
-                sb.append(nbbms.get(i)+"/");
-                sb.append(jNames.get(i)+",");
+                sb.append(schs2.get(i).get("nbbm")+"/");
+                sb.append(schs2.get(i).get("jName")+"/");
+                sb.append(schs2.get(i).get("zdsjActual")+",");
             }
             kscl=sb.toString().substring(0,sb.length()-1);
         }
@@ -166,7 +166,7 @@
                         }
                         s+=arr[i]+",";
                         j++;
-                        if(j==4||i==arr.length-1){
+                        if(j==3||i==arr.length-1){
                             s=s.substring(0,s.length-1);
                             s+='</h3></label>';
                             j=1;
@@ -592,7 +592,7 @@
         <div class="uk-grid">
             <div class="uk-width-4-2">
                 <div class="uk-form-row">
-                    <label class="uk-form-labels" ><h3>空闲车辆/人员</h3></label>
+                    <label class="uk-form-labels" ><h3>空闲车辆/人员/班次结束时间</h3></label>
                     <div id="nbbms">
                     </div>
                 </div>