大客流空闲车辆人员从同车队筛选

yiming
1 parent 75c4c33d
Showing 1 changed file with 38 additions and 20 deletions
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
@@ -3,13 +3,16 @@ package com.bsth.service.zndd.impl;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.RealControAuthority;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.zndd.LoggerZnddRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.report.ReportService;
 import com.bsth.service.sys.RealControAuthorityService;
 import com.bsth.service.zndd.LoggerZnddService;
 import org.slf4j.Logger;
@@ -36,6 +39,10 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     ScheduleRealInfoService scheduleRealInfoService;
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
+    @Autowired
+    LineService lineService;
+    @Autowired
+    ReportService reportService;
     @Autowired
     RealControAuthorityService realControAuthorityService;
@@ -140,28 +147,38 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     public  ScheduleRealInfo thissch(Integer ids){
         ScheduleRealInfo sch=dayOfSchedule.get(ids);
-        Set<String> set = dayOfSchedule.findCarByLineCode(sch.getXlBm());
+        Line line = lineService.findByLineCode(sch.getXlBm());
+        List<Map<String, Object>> lineList=reportService.lineList();
+        Set<String> lines = new HashSet<>();
+        for (Map<String, Object> map : lineList) {
+            if(line.getBrancheCompany().equals(map.get("fgsbm").toString())){
+                lines.add(map.get("xlbm").toString());
+            }
+        }
         List<String> nbbms=new ArrayList<>();
         List<String> jghs=new ArrayList<>();
         List<String> jNames=new ArrayList<>();
-        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());
-                }
-            }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());
+        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());
+                    }
+                }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());
+                    }
                 }
             }
         }
@@ -171,7 +188,8 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
             sch.setClZbh(nbbms.get(0));
             sch.setjGh(jghs.get(0));
             sch.setjName(jNames.get(0));
-            for (int i = 0; i < nbbms.size(); i++) {
+            int size =nbbms.size()>10?9:nbbms.size();
+            for (int i = 0; i < size; i++) {
                 sb.append(nbbms.get(i)+"/");
                 sb.append(jNames.get(i)+",");
             }