Merge remote-tracking branch 'origin/lggj' into lggj

ljq
2 parents d7f18bb4 bba1d3e4
Showing 5 changed files with 104 additions and 8 deletions
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/real_control_v2/zndd/type/dkl.html
@@ -31,6 +31,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
  
 /**
  * 自动检测调度异常
@@ -465,4 +467,19 @@ public class AutomaticSch {
         }
         return null;
     }
+
+    public int getPenum(String type, String types){
+        int count =10;
+        String penum=penum(type,types);
+        if(penum!=null){
+            String regEx="[^0-9]";
+            Pattern p = Pattern.compile(regEx);
+            Matcher m = p.matcher(penum);
+            String result=m.replaceAll("").trim();
+            if(!result.equals("")){
+                count=Integer.parseInt(result);
+            }
+        }
+        return count;
+    }
 }
@@ -57,6 +57,9 @@ public class OutEntrance {
     @Autowired
     carMonitor carMonitor;
  
+    @Autowired
+    AutomaticSch automaticSch;
+
      //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
@@ -74,7 +77,8 @@ public class OutEntrance {
              m.put("dir",ssLogger.getDir());
              m.put("calleeId",ssLogger.getCalleeId());
              //线调页面推送
-             if(ssLogger.getNum()>15){
+             int count=automaticSch.getPenum("DKL","0");
+             if(ssLogger.getNum()>count){
                  sendUtils.stationcf(m);
              }
  
@@ -134,7 +138,8 @@ public class OutEntrance {
                 return rtn;
             }
             String num=jsonObject.getString("num");
-            if(Integer.parseInt(num)<15){
+            int count=automaticSch.getPenum("DKL","0");
+            if(Integer.parseInt(num)<count){
                 rtn.put("status",ResponseCode.SUCCESS);
                 return rtn;
             }
@@ -242,6 +242,8 @@ public class ScheduleRealInfo {
 	 * 起点站rfid状态
 	 */
 	private int firstRfidState;
+	@Transient
+	private String kxcl;
  
 	public Integer getLpChange() {
 		return lpChange;
@@ -1016,4 +1018,12 @@ public class ScheduleRealInfo {
 	public void setFirstRfidState(int firstRfidState) {
 		this.firstRfidState = firstRfidState;
 	}
+
+	public String getKxcl() {
+		return kxcl;
+	}
+
+	public void setKxcl(String kxcl) {
+		this.kxcl = kxcl;
+	}
 }
@@ -19,10 +19,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
  
 @Service
 public class LoggerZnddServiceImpl extends BaseServiceImpl<LoggerZndd, Integer> implements LoggerZnddService {
@@ -137,7 +136,46 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
  
  
     public  ScheduleRealInfo thissch(Integer ids){
-        return dayOfSchedule.next(dayOfSchedule.get(ids));
+        ScheduleRealInfo sch=dayOfSchedule.get(ids);
+        Set<String> set = dayOfSchedule.findCarByLineCode(sch.getXlBm());
+        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());
+                }
+            }
+        }
+        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));
+            for (int i = 0; i < nbbms.size(); i++) {
+                sb.append(nbbms.get(i)+"/");
+                sb.append(jNames.get(i)+",");
+            }
+            kscl=sb.toString().substring(0,sb.length()-1);
+        }
+        sch.setKxcl(kscl);
+        return sch;
     }
  
  
@@ -126,6 +126,23 @@
                     //normal
                     $('.normalCont', modal).html(st_doms.normal_dom)
                         .trigger('init', {sch: res, submitFun: submit_temp_schedule_form});
+                    var kxcl=res.kxcl;
+                    var arr=kxcl.split(',');
+                    var s='';
+                    var j=1;
+                    for(i=0;i<arr.length;i++){
+                        if(j==1){
+                            s+='<label className="uk-form-labels"><h3>';
+                        }
+                        s+=arr[i]+",";
+                        j++;
+                        if(j==4||i==arr.length-1){
+                            s=s.substring(0,s.length-1);
+                            s+='</h3></label>';
+                            j=1;
+                        }
+                    }
+                    document.getElementById("nbbms").innerHTML=s;
                 });
  
             });
@@ -499,7 +516,7 @@
         <div class="uk-grid">
             <div class="uk-width-2-2">
                 <div class="uk-form-row">
-                    <img src="{{image}}" width="100%">
+                    <img src="{{image}}"  width="100%">
                 </div>
             </div>
         </div>
@@ -510,6 +527,15 @@
                 </div>
             </div>
         </div>
+        <div class="uk-grid">
+            <div class="uk-width-4-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-labels" ><h3>空闲车辆/人员</h3></label>
+                    <div id="nbbms">
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </script>