潘钊 / bsth_control · Commits

Commit 8994f2edcbe632fea5f6d6e0262c6368a3a868c6

Authored by yiming
1 parent 75c4c33d
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 38 additions and 20 deletions
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
  View file @8994f2e
... ... @@ -3,13 +3,16 @@ package com.bsth.service.zndd.impl;
3 3 import com.bsth.controller.realcontrol.dto.DfsjChange;
4 4 import com.bsth.data.schedule.DayOfSchedule;
5 5 import com.bsth.data.schedule.ScheduleComparator;
  6 +import com.bsth.entity.Line;
6 7 import com.bsth.entity.realcontrol.ScheduleRealInfo;
7 8 import com.bsth.entity.sys.RealControAuthority;
8 9 import com.bsth.entity.zndd.LoggerZndd;
9 10 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
10 11 import com.bsth.repository.zndd.LoggerZnddRepository;
  12 +import com.bsth.service.LineService;
11 13 import com.bsth.service.impl.BaseServiceImpl;
12 14 import com.bsth.service.realcontrol.ScheduleRealInfoService;
  15 +import com.bsth.service.report.ReportService;
13 16 import com.bsth.service.sys.RealControAuthorityService;
14 17 import com.bsth.service.zndd.LoggerZnddService;
15 18 import org.slf4j.Logger;
... ... @@ -36,6 +39,10 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl<LoggerZndd, Integer>
36 39 ScheduleRealInfoService scheduleRealInfoService;
37 40 @Autowired
38 41 ScheduleRealInfoRepository scheduleRealInfoRepository;
  42 + @Autowired
  43 + LineService lineService;
  44 + @Autowired
  45 + ReportService reportService;
39 46  
40 47 @Autowired
41 48 RealControAuthorityService realControAuthorityService;
... ... @@ -140,28 +147,38 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl<LoggerZndd, Integer>
140 147  
141 148 public ScheduleRealInfo thissch(Integer ids){
142 149 ScheduleRealInfo sch=dayOfSchedule.get(ids);
143   - Set<String> set = dayOfSchedule.findCarByLineCode(sch.getXlBm());
  150 + Line line = lineService.findByLineCode(sch.getXlBm());
  151 + List<Map<String, Object>> lineList=reportService.lineList();
  152 + Set<String> lines = new HashSet<>();
  153 + for (Map<String, Object> map : lineList) {
  154 + if(line.getBrancheCompany().equals(map.get("fgsbm").toString())){
  155 + lines.add(map.get("xlbm").toString());
  156 + }
  157 + }
144 158 List<String> nbbms=new ArrayList<>();
145 159 List<String> jghs=new ArrayList<>();
146 160 List<String> jNames=new ArrayList<>();
147   - LocalTime localTime=LocalTime.now().plusHours(1);
148   - DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
149   - for (String nbbm : set) {
150   - ScheduleRealInfo s=dayOfSchedule.executeCurr(nbbm);//当前执行班次
151   - if(s==null){//当日班次执行完毕
152   - List<ScheduleRealInfo> list=dayOfSchedule.findByNbbm(nbbm);
153   - if(list.size()>0){
154   - ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次
155   - nbbms.add(s2.getClZbh());
156   - jghs.add(s2.getjGh());
157   - jNames.add(s2.getjName());
158   - }
159   - }else {//1小时内是否有待执行班次
160   - LocalTime fcsj=LocalTime.parse(s.getFcsj(),dtf);
161   - if(fcsj.isAfter(localTime)){
162   - nbbms.add(s.getClZbh());
163   - jghs.add(s.getjGh());
164   - jNames.add(s.getjName());
  161 + for (String lineCode : lines) {
  162 + Set<String> set = dayOfSchedule.findCarByLineCode(lineCode);
  163 + LocalTime localTime=LocalTime.now().plusHours(1);
  164 + DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
  165 + for (String nbbm : set) {
  166 + ScheduleRealInfo s=dayOfSchedule.executeCurr(nbbm);//当前执行班次
  167 + if(s==null){//当日班次执行完毕
  168 + List<ScheduleRealInfo> list=dayOfSchedule.findByNbbm(nbbm);
  169 + if(list.size()>0){
  170 + ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次
  171 + nbbms.add(s2.getClZbh());
  172 + jghs.add(s2.getjGh());
  173 + jNames.add(s2.getjName());
  174 + }
  175 + }else {//1小时内是否有待执行班次
  176 + LocalTime fcsj=LocalTime.parse(s.getFcsj(),dtf);
  177 + if(fcsj.isAfter(localTime)){
  178 + nbbms.add(s.getClZbh());
  179 + jghs.add(s.getjGh());
  180 + jNames.add(s.getjName());
  181 + }
165 182 }
166 183 }
167 184 }
... ... @@ -171,7 +188,8 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt;
171 188 sch.setClZbh(nbbms.get(0));
172 189 sch.setjGh(jghs.get(0));
173 190 sch.setjName(jNames.get(0));
174   - for (int i = 0; i < nbbms.size(); i++) {
  191 + int size =nbbms.size()>10?9:nbbms.size();
  192 + for (int i = 0; i < size; i++) {
175 193 sb.append(nbbms.get(i)+"/");
176 194 sb.append(jNames.get(i)+",");
177 195 }
... ...