修改的定时器时间

yiming
1 parent dd63f6bb
Showing 2 changed files with 29 additions and 26 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/service/Contrast.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
  
 import javax.annotation.PostConstruct;
 import java.io.*;
@@ -25,6 +26,7 @@ import java.util.*;
  */
 @Configuration
 @EnableScheduling
+@Component
 public class SaticScheduleTask implements InitializingBean {
  
     private final static Logger logger = LoggerFactory.getLogger(SaticScheduleTask.class);
@@ -78,16 +80,19 @@ public class SaticScheduleTask implements InitializingBean {
         contrast.filterCardList(allFile,false);
     }
  
-    @Scheduled(cron = "0 0/10 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     @PostConstruct
     void getArrivalInfos()  {
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
         LocalDateTime now=LocalDateTime.now();
         //测试
-       /* DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        now=LocalDateTime.parse("2021-07-11 00:00",tdf);*/
-
-        contrast.getSchedulingS(now,1);
+        DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        now=LocalDateTime.parse("2021-08-01 00:00",tdf);
+        List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
+        getSchedulingS=result.get(0);
+        getSchedulingSSell=result.get(1);
+        System.out.println(getSchedulingS.size());
+        System.out.println(getSchedulingSSell.size());
     }
  
  
@@ -48,7 +48,7 @@ public class Contrast {
     private SaticScheduleTask saticScheduleTask;
  
     private final int TIME=5;
-    private final int TIME2=3;//刷卡的时间和到站实际允许误差值
+    private final int TIME2=0;//刷卡的时间和到站实际允许误差值
  
     public List<Map> getDriverCardList() {
         List<Map> list = new ArrayList<>();
@@ -79,7 +79,7 @@ public class Contrast {
     * @Author: YM
     * @Date: 2021/10/12
     */
-    public  void getSchedulingS(LocalDateTime now,int day)  {
+    public  List<Map<String,List<Scheduling>>>  getSchedulingS(LocalDateTime now,int day)  {
         List<Scheduling> schedulingS=new ArrayList<>();
         long start = System.currentTimeMillis();
         Map map = new HashMap();
@@ -175,11 +175,14 @@ public class Contrast {
                 }
             }
         }
-
-        saticScheduleTask.getSchedulingS= schedulingS.stream().collect(Collectors.groupingBy(s->s.getJ_name()));
-        saticScheduleTask.getSchedulingSSell=schedulingS.stream().collect(Collectors.groupingBy(s->s.getS_name()));
+        Map<String,List<Scheduling>> getSchedulingS=schedulingS.stream().collect(Collectors.groupingBy(s->s.getJ_name()));
+        Map<String,List<Scheduling>> getSchedulingSSell=schedulingS.stream().collect(Collectors.groupingBy(s->s.getS_name()));
+        List<Map<String,List<Scheduling>>> result=new ArrayList<>();
+        result.add(getSchedulingS);
+        result.add(getSchedulingSSell);
  
         logger.warn("======匹配"+arrivalInfoList.size()+"条======匹配成功 "+b+"条=====耗时=="+(System.currentTimeMillis() - start)/1000 + "秒");
+        return result;
     }
  
  
@@ -209,13 +212,14 @@ public class Contrast {
             List<Map> collect = driverCardList.stream().filter(map -> map.get("cardno").equals(carId)).collect(Collectors.toList());
  
             String mark="";
+            String jobCodes = "";
             Boolean flag=false;//用来判断是否没有匹配成功
             Long cardDate = null;
             if (!collect.isEmpty()) {
                 if (null != collect.get(0).get("jobCode") && null != collect.get(0).get("personalName")) {
                     String personalName = collect.get(0).get("personalName").toString();//姓名
                     String[] arr=collect.get(0).get("jobCode").toString().split("-");
-                    String jobCodes =arr.length==0?collect.get(0).get("jobCode").toString():arr[arr.length-1];//工号
+                    jobCodes =arr.length==0?collect.get(0).get("jobCode").toString():arr[arr.length-1];//工号
                     String time=String.valueOf(data.get("TJRLRTIME"));//时间
                     String date=String.valueOf(data.get("TJRLRDATE"));//日期
  
@@ -231,20 +235,14 @@ public class Contrast {
  
  
                     if(schedulingList1!=null){
-                        Collections.sort(schedulingList1);
-                        for (Scheduling s : schedulingList1) {
-                            if (jobCodes.contains(s.getJ_gh()) || s.getJ_gh().contains(jobCodes)){//防止同名 筛选工号 刷卡时间在进出站时间之间
-                                if((Long.parseLong(s.getTs())-TIME2*60*1000)<=cardDate && (Long.parseLong(s.getTs_out())+TIME2*60*1000)>=cardDate){
-                                    scheduling=s;
-                                    b++;
-                                    flag=true;
-                                    break;
-                                }/*else {
-                                    LocalDateTime card = LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
-                                    LocalDateTime in = LocalDateTime.ofEpochSecond(Long.parseLong(s.getTs())/1000, 0, ZoneOffset.ofHours(8));
-                                    LocalDateTime out = LocalDateTime.ofEpochSecond(Long.parseLong(s.getTs_out())/1000, 0, ZoneOffset.ofHours(8));
-                                    System.out.println("进站时间: "+in+"     出站时间："+out+"   刷卡时间："+card );
-                                }*/
+                        Collections.sort(schedulingList1, Comparator.comparing(Scheduling::getTs).reversed());
+                        for (int i1 = 0; i1 < schedulingList1.size(); i1++) {
+                            Scheduling s=schedulingList1.get(i1);
+                            if((Long.parseLong(s.getTs())-TIME2*60*1000)<=cardDate){
+                                scheduling=s;
+                                b++;
+                                flag=true;
+                                break;
                             }
                         }
                     }else {
@@ -285,7 +283,7 @@ public class Contrast {
                 data.put("STATION_FLAG", 0);
             }
             if(mark.length()==0 && !flag){
-                mark="未匹配到班次 刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
+                mark="未匹配到班次 "+jobCodes+"刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
             }
             data.put("MARK",mark);