修改的定时器时间

yiming
1 parent 1c63703f
Showing 5 changed files with 452 additions and 79 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/model/TJRL.java
src/main/java/com/example/demo/model/TJRLDB.java
src/main/java/com/example/demo/service/Analysis.java
src/main/java/com/example/demo/service/Contrast.java
@@ -45,65 +45,17 @@ public class SaticScheduleTask implements InitializingBean {
     @Autowired
     private Analysis analysis;
-    public Map<String,List<Scheduling>> getSchedulingS;
-    public Map<String,List<Scheduling>> getSchedulingSSell;
-    public List<TJRLDB> data=new ArrayList<>();
-    /**
-     * 定时任务
-     */
-    /*@Scheduled(cron = "0 0/10 * * * ?")
-    private void configureTasks() throws Exception{
-        logger.info("执行静态定时任务时间: " + LocalDateTime.now());
-        WatchKey watchKey = null;
-        List<File> files = new ArrayList<>();
-        while ((watchKey = watchService.poll()) != null) {
-            for (WatchEvent watchEvent : watchKey.pollEvents()) {
-                Path path = (Path)watchEvent.context();
-                if(path!=null){
-                    files.add(new File(rootPath + File.separator + path));
-                }
-            }
-            watchKey.reset();
-        }
-        System.out.println("文件数"+files);
-        //先把处理上一次没匹配到的
-        if(!data.isEmpty()){
-            contrast.filterCardList(data,true);
-        }
-        List<TJRLDB> allFile = Analysis.getAllFile(files);
-        System.out.println("交易数"+allFile);
-        contrast.filterCardList(allFile,false);
-    }*/
-
-
-   /* @Scheduled(cron = "0 0/9 * * * ?")
-    @PostConstruct
-    void getArrivalInfos()  {
-        logger.info("票务数据缓存加载: " + LocalDateTime.now());
-        LocalDateTime now=LocalDateTime.now();
-        //测试
-       *//* 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);
-    }*/
-   /* @Scheduled(cron = "0 0/10 * * * ?")
-    @PostConstruct*/
+    @Scheduled(cron = "0 0/10 * * * ?")
     void getArrivalInfos() throws Exception {
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
-        if(watchService==null){
-            afterPropertiesSet();
-        }
         LocalDateTime now=LocalDateTime.now();
         List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
-        getSchedulingS=result.get(0);
-        getSchedulingSSell=result.get(1);
-
+        contrast.getSchedulingS=result.get(0);
+        contrast.getSchedulingSSell=result.get(1);
         WatchKey watchKey = null;
         List<File> files = new ArrayList<>();
         while ((watchKey = watchService.poll()) != null) {
@@ -118,8 +70,8 @@ public class SaticScheduleTask implements InitializingBean {
         }
         System.out.println("文件数"+files.size());
         //先把处理上一次没匹配到的
-        if(!data.isEmpty()){
-            contrast.filterCardList(data,true);
+        if(!contrast.oldData.isEmpty()){
+            contrast.filterCardList(contrast.oldData,true);
         }
         List<TJRLDB> allFile = analysis.getAllFile(files);
         System.out.println("交易数"+allFile.size());
@@ -127,20 +79,18 @@ public class SaticScheduleTask implements InitializingBean {
     }
-    @PostConstruct
-    void getArrivalInfos2() throws Exception {
+
+    void getArrivalInfos2() {
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
-        if(watchService==null){
-            afterPropertiesSet();
-        }
         LocalDateTime now=LocalDateTime.now();
         //测试
         DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        now=LocalDateTime.parse("2021-08-01 00:00",tdf);
+        now=LocalDateTime.parse("2021-11-19 00:00",tdf);
         List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
-        getSchedulingS=result.get(0);
-        getSchedulingSSell=result.get(1);
-        List<File> fl= FileUtil.loopFiles("E:\\data");
+        contrast.getSchedulingS=result.get(0);
+        contrast.getSchedulingSSell=result.get(1);
+        List<File> fl= FileUtil.loopFiles("/home/sftp/20211118");
+        System.out.println(fl.size());
         List<List<File>> subList=getSubList(100,fl);
         if(!subList.isEmpty()){
             subList.forEach(fs->{
@@ -153,6 +103,8 @@ public class SaticScheduleTask implements InitializingBean {
             });
         }
     }
+
+
     /**
     * @Description:  用来计算数据库中的乘车记录
     * @Param:
@@ -167,8 +119,8 @@ public class SaticScheduleTask implements InitializingBean {
         int day=1;
         List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,day);
-        getSchedulingS=result.get(0);
-        getSchedulingSSell=result.get(1);
+        contrast.getSchedulingS=result.get(0);
+        contrast.getSchedulingSSell=result.get(1);
         Map<String,Object> map=new HashMap<>();
         map.put("table","pd_control."+"fhtxnjrltb_jtb_copy1");
         LocalDateTime startDate=now.minusDays(day);
@@ -186,6 +138,7 @@ public class SaticScheduleTask implements InitializingBean {
         watchService = FileSystems.getDefault().newWatchService();
         Path path = Paths.get(rootPath);
         path.register(watchService, StandardWatchEventKinds.ENTRY_CREATE);
+        this.getArrivalInfos();
     }
     public List<List<File>> getSubList(int length, List<File> list){
+package com.example.demo.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class TJRL implements Cloneable {
+    //@JsonProperty
+    private String TJRLCARDNO;//         NUMBER        Y                交通卡号
+    private String TJRLINSID; //         NUMBER        Y                行业
+    private String TJRLCDKIND;//         NUMBER        Y                卡类型
+    private String TJRLPOSID;//          NUMBER(10)                     POS机号
+    private String TJRLRDATE;//          CHAR(8)       Y                交易日期
+    private String TJRLRTIME;//          CHAR(6)       Y                交易时间
+    private String TJRLCDBAL;//          NUMBER(10)    Y                交易前余额
+    private String TJRLAMT;//            NUMBER(10)    Y                交易金额
+    private String TJRLORGAMT;//         NUMBER(10)    Y                交易原始金额
+    private String TJRLSTATID;//         VARCHAR2(100) Y                公交线路
+    private String TJRLUNITID;//         VARCHAR2(100) Y                运营单位
+    private String TJRLTXFG;//           NUMBER        Y                交易类型
+    private String STATION_FLAG;//       VARCHAR2(100) Y                匹配上电子路单:1;匹配不上:0
+    private String ROAD_FORM_TYPE;//     VARCHAR2(100) Y                路单类型
+    private String UPDOWN;//             VARCHAR2(100) Y                上下行:0上1下
+    private String BUS_CODE;//           VARCHAR2(100) Y                车辆自编号
+    private String BUS_PLATE;//          VARCHAR2(100) Y                车牌号
+    private String ROAD_CODE;//          VARCHAR2(100) Y                路牌编号
+    private String DEPART_NAME;//        VARCHAR2(100) Y                发车站点名称
+    private String DEPART_CODE;//        VARCHAR2(100) Y                发车站点编码
+    private String DEPART_ACTUAL_TIME;// VARCHAR2(100) Y                实际发车时间
+    private String REACH_NAME;//         VARCHAR2(100) Y                到达站点名称
+    private String REACH_CODE;//         VARCHAR2(100) Y                到达站点编码
+    private String REACH_ACTUAL_TIME;//  VARCHAR2(100) Y                实际到达时间
+    private String LEVELS_FLAG;//        VARCHAR2(100) Y                匹配上到离站:1;匹配不上:0
+    private String LEVELS1;//            VARCHAR2(100) Y                站序1
+    private String LEVELS_NAME1;//       VARCHAR2(100) Y                站序1名称
+    private String LEVELS1_CODE;//       VARCHAR2(100) Y                站序1编码
+    private String LEVELS2;//            VARCHAR2(100) Y                站序2
+    private String LEVELS_NAME2;//       VARCHAR2(100) Y                站序2名称
+    private String LEVELS2_CODE;//       VARCHAR2(100) Y                站序2编码
+    private String GPS_DATE_TIME1;//     VARCHAR2(100) Y                站序1到站时间
+    private String GPS_DATE_TIME2;//     VARCHAR2(100) Y                站序2到站时间
+    private String B_STATION_ID;//       VARCHAR2(100) Y                电子路单id
+    private String PLAN_START_TIME;//    VARCHAR2(100) Y                计划发车时间
+    private String PLAN_ARRIVE_TIME;//   VARCHAR2(100) Y                计划到达时间
+    private String ACTUAL_START_TIME;//  VARCHAR2(100) Y                实际发车时间
+    private String ACTUAL_ARRIVE_TIME;// VARCHAR2(100) Y                实际到达时间实际到达时间
+    private String TRAD_ID;
+
+    public TJRL(){
+
+    }
+    public TJRL(TJRLDB tjrldb) {
+        try {
+            Field[] fields=TJRL.class.getDeclaredFields();
+            for(Field f : fields) {
+                PropertyDescriptor pd = new PropertyDescriptor(f.getName(), TJRLDB.class);
+                Method rM = pd.getReadMethod();//获得读方法
+                String v = rM.invoke(tjrldb)==null?"":rM.invoke(tjrldb).toString();
+                pd = new PropertyDescriptor(f.getName(), TJRL.class);
+                Method wM = pd.getWriteMethod();//获得写方法
+                wM.invoke(this, v);
+               }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getTJRLCARDNO() {
+        return TJRLCARDNO;
+    }
+
+    public void setTJRLCARDNO(String TJRLCARDNO) {
+        this.TJRLCARDNO = TJRLCARDNO;
+    }
+
+    public String getTJRLINSID() {
+        return TJRLINSID;
+    }
+
+    public void setTJRLINSID(String TJRLINSID) {
+        this.TJRLINSID = TJRLINSID;
+    }
+
+    public String getTJRLCDKIND() {
+        return TJRLCDKIND;
+    }
+
+    public void setTJRLCDKIND(String TJRLCDKIND) {
+        this.TJRLCDKIND = TJRLCDKIND;
+    }
+
+    public String getTJRLPOSID() {
+        return TJRLPOSID;
+    }
+
+    public void setTJRLPOSID(String TJRLPOSID) {
+        this.TJRLPOSID = TJRLPOSID;
+    }
+
+    public String getTJRLRDATE() {
+        return TJRLRDATE;
+    }
+
+    public void setTJRLRDATE(String TJRLRDATE) {
+        this.TJRLRDATE = TJRLRDATE;
+    }
+
+    public String getTJRLRTIME() {
+        return TJRLRTIME;
+    }
+
+    public void setTJRLRTIME(String TJRLRTIME) {
+        this.TJRLRTIME = TJRLRTIME;
+    }
+
+    public String getTJRLCDBAL() {
+        return TJRLCDBAL;
+    }
+
+    public void setTJRLCDBAL(String TJRLCDBAL) {
+        this.TJRLCDBAL = TJRLCDBAL;
+    }
+
+    public String getTJRLAMT() {
+        return TJRLAMT;
+    }
+
+    public void setTJRLAMT(String TJRLAMT) {
+        this.TJRLAMT = TJRLAMT;
+    }
+
+    public String getTJRLORGAMT() {
+        return TJRLORGAMT;
+    }
+
+    public void setTJRLORGAMT(String TJRLORGAMT) {
+        this.TJRLORGAMT = TJRLORGAMT;
+    }
+
+    public String getTJRLSTATID() {
+        return TJRLSTATID;
+    }
+
+    public void setTJRLSTATID(String TJRLSTATID) {
+        this.TJRLSTATID = TJRLSTATID;
+    }
+
+    public String getTJRLUNITID() {
+        return TJRLUNITID;
+    }
+
+    public void setTJRLUNITID(String TJRLUNITID) {
+        this.TJRLUNITID = TJRLUNITID;
+    }
+
+    public String getTJRLTXFG() {
+        return TJRLTXFG;
+    }
+
+    public void setTJRLTXFG(String TJRLTXFG) {
+        this.TJRLTXFG = TJRLTXFG;
+    }
+
+    public String getSTATION_FLAG() {
+        return STATION_FLAG;
+    }
+
+    public void setSTATION_FLAG(String STATION_FLAG) {
+        this.STATION_FLAG = STATION_FLAG;
+    }
+
+    public String getROAD_FORM_TYPE() {
+        return ROAD_FORM_TYPE;
+    }
+
+    public void setROAD_FORM_TYPE(String ROAD_FORM_TYPE) {
+        this.ROAD_FORM_TYPE = ROAD_FORM_TYPE;
+    }
+
+    public String getUPDOWN() {
+        return UPDOWN;
+    }
+
+    public void setUPDOWN(String UPDOWN) {
+        this.UPDOWN = UPDOWN;
+    }
+
+    public String getBUS_CODE() {
+        return BUS_CODE;
+    }
+
+    public void setBUS_CODE(String BUS_CODE) {
+        this.BUS_CODE = BUS_CODE;
+    }
+
+    public String getBUS_PLATE() {
+        return BUS_PLATE;
+    }
+
+    public void setBUS_PLATE(String BUS_PLATE) {
+        this.BUS_PLATE = BUS_PLATE;
+    }
+
+    public String getROAD_CODE() {
+        return ROAD_CODE;
+    }
+
+    public void setROAD_CODE(String ROAD_CODE) {
+        this.ROAD_CODE = ROAD_CODE;
+    }
+
+    public String getDEPART_NAME() {
+        return DEPART_NAME;
+    }
+
+    public void setDEPART_NAME(String DEPART_NAME) {
+        this.DEPART_NAME = DEPART_NAME;
+    }
+
+    public String getDEPART_CODE() {
+        return DEPART_CODE;
+    }
+
+    public void setDEPART_CODE(String DEPART_CODE) {
+        this.DEPART_CODE = DEPART_CODE;
+    }
+
+    public String getDEPART_ACTUAL_TIME() {
+        return DEPART_ACTUAL_TIME;
+    }
+
+    public void setDEPART_ACTUAL_TIME(String DEPART_ACTUAL_TIME) {
+        this.DEPART_ACTUAL_TIME = DEPART_ACTUAL_TIME;
+    }
+
+    public String getREACH_NAME() {
+        return REACH_NAME;
+    }
+
+    public void setREACH_NAME(String REACH_NAME) {
+        this.REACH_NAME = REACH_NAME;
+    }
+
+    public String getREACH_CODE() {
+        return REACH_CODE;
+    }
+
+    public void setREACH_CODE(String REACH_CODE) {
+        this.REACH_CODE = REACH_CODE;
+    }
+
+    public String getREACH_ACTUAL_TIME() {
+        return REACH_ACTUAL_TIME;
+    }
+
+    public void setREACH_ACTUAL_TIME(String REACH_ACTUAL_TIME) {
+        this.REACH_ACTUAL_TIME = REACH_ACTUAL_TIME;
+    }
+
+    public String getLEVELS_FLAG() {
+        return LEVELS_FLAG;
+    }
+
+    public void setLEVELS_FLAG(String LEVELS_FLAG) {
+        this.LEVELS_FLAG = LEVELS_FLAG;
+    }
+
+    public String getLEVELS1() {
+        return LEVELS1;
+    }
+
+    public void setLEVELS1(String LEVELS1) {
+        this.LEVELS1 = LEVELS1;
+    }
+
+    public String getLEVELS_NAME1() {
+        return LEVELS_NAME1;
+    }
+
+    public void setLEVELS_NAME1(String LEVELS_NAME1) {
+        this.LEVELS_NAME1 = LEVELS_NAME1;
+    }
+
+    public String getLEVELS1_CODE() {
+        return LEVELS1_CODE;
+    }
+
+    public void setLEVELS1_CODE(String LEVELS1_CODE) {
+        this.LEVELS1_CODE = LEVELS1_CODE;
+    }
+
+    public String getLEVELS2() {
+        return LEVELS2;
+    }
+
+    public void setLEVELS2(String LEVELS2) {
+        this.LEVELS2 = LEVELS2;
+    }
+
+    public String getLEVELS_NAME2() {
+        return LEVELS_NAME2;
+    }
+
+    public void setLEVELS_NAME2(String LEVELS_NAME2) {
+        this.LEVELS_NAME2 = LEVELS_NAME2;
+    }
+
+    public String getLEVELS2_CODE() {
+        return LEVELS2_CODE;
+    }
+
+    public void setLEVELS2_CODE(String LEVELS2_CODE) {
+        this.LEVELS2_CODE = LEVELS2_CODE;
+    }
+
+    public String getGPS_DATE_TIME1() {
+        return GPS_DATE_TIME1;
+    }
+
+    public void setGPS_DATE_TIME1(String GPS_DATE_TIME1) {
+        this.GPS_DATE_TIME1 = GPS_DATE_TIME1;
+    }
+
+    public String getGPS_DATE_TIME2() {
+        return GPS_DATE_TIME2;
+    }
+
+    public void setGPS_DATE_TIME2(String GPS_DATE_TIME2) {
+        this.GPS_DATE_TIME2 = GPS_DATE_TIME2;
+    }
+
+    public String getB_STATION_ID() {
+        return B_STATION_ID;
+    }
+
+    public void setB_STATION_ID(String b_STATION_ID) {
+        B_STATION_ID = b_STATION_ID;
+    }
+
+    public String getPLAN_START_TIME() {
+        return PLAN_START_TIME;
+    }
+
+    public void setPLAN_START_TIME(String PLAN_START_TIME) {
+        this.PLAN_START_TIME = PLAN_START_TIME;
+    }
+
+    public String getPLAN_ARRIVE_TIME() {
+        return PLAN_ARRIVE_TIME;
+    }
+
+    public void setPLAN_ARRIVE_TIME(String PLAN_ARRIVE_TIME) {
+        this.PLAN_ARRIVE_TIME = PLAN_ARRIVE_TIME;
+    }
+
+    public String getACTUAL_START_TIME() {
+        return ACTUAL_START_TIME;
+    }
+
+    public void setACTUAL_START_TIME(String ACTUAL_START_TIME) {
+        this.ACTUAL_START_TIME = ACTUAL_START_TIME;
+    }
+
+    public String getACTUAL_ARRIVE_TIME() {
+        return ACTUAL_ARRIVE_TIME;
+    }
+
+    public void setACTUAL_ARRIVE_TIME(String ACTUAL_ARRIVE_TIME) {
+        this.ACTUAL_ARRIVE_TIME = ACTUAL_ARRIVE_TIME;
+    }
+
+    public String getTRAD_ID() {
+        return TRAD_ID;
+    }
+
+    public void setTRAD_ID(String TRAD_ID) {
+        this.TRAD_ID = TRAD_ID;
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}
+package com.example.demo.model;
+
+public class TJRLDB extends TJRL{
+    private String TJRLDRVCRDID;
+    private String MARK;
+
+    public TJRLDB(){
+        super();
+    }
+    public TJRLDB(TJRLDB tjrldb) throws Exception {
+        super(tjrldb);
+    }
+
+    public String getTJRLDRVCRDID() {
+        return TJRLDRVCRDID;
+    }
+
+    public void setTJRLDRVCRDID(String TJRLDRVCRDID) {
+        this.TJRLDRVCRDID = TJRLDRVCRDID;
+    }
+
+    public String getMARK() {
+        return MARK;
+    }
+
+    public void setMARK(String MARK) {
+        this.MARK = MARK;
+    }
+}
@@ -39,7 +39,7 @@ public class Analysis {
         List<String> list = new ArrayList<String>();
         for (File file : files) {
             if (!file.isDirectory()) {
-                String name=file.getName().substring(0,10);
+                String name=file.getName().substring(2,10);
                 String absolutePath = file.getAbsolutePath();
                 String time = (absolutePath.substring(absolutePath.indexOf("GJ"), absolutePath.indexOf("GJ") + 16)).replace("GJ", "");
                 Date nowTime = null;
@@ -171,7 +171,6 @@ public class Analysis {
             return false;
         }
     }
-
    /* @Value("${ftp.oldFile}")
     public  void setOldFile(String oldFile) {
         Analysis.oldFile = oldFile;
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
+import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -40,11 +41,13 @@ public class Contrast {
     @Autowired
     private KafkaTemplate kafkaTemplate;
-
-
     @Autowired
     private SaticScheduleTask saticScheduleTask;
+    public Map<String,List<Scheduling>> getSchedulingS;
+    public Map<String,List<Scheduling>> getSchedulingSSell;
+    public List<TJRLDB> oldData=new ArrayList<>();
+
     private final int TIME=5;
     private final int TIME2=0;//刷卡的时间和到站实际允许误差值
@@ -193,8 +196,10 @@ public class Contrast {
     public void filterCardList(List<TJRLDB> allData, Boolean isOld)  {
         long start = System.currentTimeMillis();
         List<Map> driverCardList = getDriverCardList();//获取司机信息
-        Map<String,List<Scheduling>> schedulingS =saticScheduleTask.getSchedulingS;
-        Map<String,List<Scheduling>> schedulingSSell =saticScheduleTask.getSchedulingSSell;
+        Map<String,List<Scheduling>> schedulingS =getSchedulingS;
+        Map<String,List<Scheduling>> schedulingSSell =getSchedulingSSell;
+        System.out.println(schedulingS.size());
+        System.out.println(schedulingSSell.size());
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         int b=0;//用于计算匹配成功的数量
         for (int i = 0; i < allData.size(); i++) {
@@ -229,6 +234,7 @@ public class Contrast {
                         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++;
@@ -237,7 +243,7 @@ public class Contrast {
                             }
                         }
                     }else {
-                        mark="未查到驾驶员排班："+personalName+" 工号："+jobCodes;
+                        mark="没有匹配的进站记录："+personalName+" 工号："+jobCodes;
                     }
                     if (scheduling!=null) {
@@ -268,16 +274,16 @@ public class Contrast {
                     }
                 }
             }else {
-                mark="未查到驾驶员 卡号："+carId;
+                mark="未查工号："+carId;
                 data.setSTATION_FLAG("0");
             }
             if(mark.length()==0 && !flag){
-                mark="未匹配到班次 "+jobCodes+"刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
+                mark="没有匹配的班次 "+jobCodes+"刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
             }
             data.setMARK(mark);
             //如果是新数据 没匹配到 去除这条记录 并放入缓存等到下次继续匹配
             if(!isOld && !flag){
-                List<TJRLDB> m =saticScheduleTask.data;
+                List<TJRLDB> m =oldData;
                 m.add(data);
                 allData.set(i,null);
@@ -331,7 +337,7 @@ public class Contrast {
         }
         //如果是上次遗留的数据不管这是是否匹配到都清空
         if(isOld){
-            saticScheduleTask.data.clear();
+            oldData.clear();
         }
         logger.warn("======匹配"+size+"条======匹配到"+b+"条=====耗时=="+(System.currentTimeMillis() - start)/1000 + "秒");
     }
@@ -347,8 +353,8 @@ public class Contrast {
     public void filterCardListByDB(List<TJRLDB> allData,Boolean isOld) {
         long start = System.currentTimeMillis();
         List<Map> driverCardList = getDriverCardList();//获取司机信息
-        Map<String,List<Scheduling>> schedulingS =saticScheduleTask.getSchedulingS;
-        Map<String,List<Scheduling>> schedulingSSell =saticScheduleTask.getSchedulingSSell;
+        Map<String,List<Scheduling>> schedulingS =getSchedulingS;
+        Map<String,List<Scheduling>> schedulingSSell =getSchedulingSSell;
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         int b=0;//用于计算匹配成功的数量
         for (int i = 0; i < allData.size(); i++) {
@@ -431,7 +437,7 @@ public class Contrast {
             data.setMARK(mark);
             //如果是新数据 没匹配到 去除这条记录 并放入缓存等到下次继续匹配
             if(!isOld && !flag){
-                List<TJRLDB> m =saticScheduleTask.data;
+                List<TJRLDB> m =oldData;
                 m.add(data);
                 allData.set(i,null);
@@ -481,7 +487,7 @@ public class Contrast {
         }
         //如果是上次遗留的数据不管这是是否匹配到都清空
         if(isOld){
-            saticScheduleTask.data.clear();
+            oldData.clear();
         }
         logger.warn("======匹配"+size+"条======匹配到"+b+"条=====耗时=="+(System.currentTimeMillis() - start)/1000 + "秒");
     }