临港客流

yiming
1 parent afdd1ef3
Showing 6 changed files with 209 additions and 546 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/model/CardDriver.java
src/main/java/com/example/demo/service/Analysis.java
src/main/java/com/example/demo/service/Contrast.java
src/main/resources/application.properties
src/main/resources/mapping/db1/Site-mapper1.xml
 package com.example.demo;
-import cn.hutool.core.io.FileUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.example.demo.model.Scheduling;
-import com.example.demo.model.TJRL;
 import com.example.demo.model.TJRLDB;
-import com.example.demo.service.Analysis;
 import com.example.demo.service.Contrast;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
-import java.nio.file.*;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -34,16 +29,12 @@ public class SaticScheduleTask {
     private final static Logger logger = LoggerFactory.getLogger(SaticScheduleTask.class);
-    @Value("${ftp.root}")
-    private String rootPath;
-    private WatchService watchService;
     @Autowired
     private Contrast contrast;
-    @Autowired
-    private Analysis analysis;
+
     private static DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -51,138 +42,62 @@ public class SaticScheduleTask {
     @Scheduled(cron = "0 0/5 * * * ?")
-    @PostConstruct
+    //@PostConstruct
     void getArrivalInfos(){
         logger.info("票务数据缓存加载: " + LocalDateTime.now());
         try {
             LocalDateTime now=LocalDateTime.now();
+            /*DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            now=LocalDateTime.parse("2025-03-14 00:00",tdf);*/
             List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
             contrast.getSchedulingS=result.get(0);
             contrast.getSchedulingSSell=result.get(1);
             logger.info("===============================数据存放结束,开始读取文件================================");
             DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyyMMdd");
-            String date=now.format(dtf);
-            System.out.println(rootPath+File.separator+date);
-            List<File> files = FileUtil.loopFiles(Paths.get(rootPath+File.separator+date),1,new wdbFileFilter());
-            System.out.println("文件数"+files.size());
-            logger.info("===============================文件数"+files.size()+",读取文件结束================================");
-            //先把处理上一次没匹配到的
-            logger.info("===============================处理上次未匹配到的数据"+contrast.oldData.size()+"================================");
-            if(!contrast.oldData.isEmpty()){
-                contrast.filterCardList(contrast.oldData,true);
-            }
-            logger.info("===============================文件解析开始================================");
-            List<TJRLDB> allFile = analysis.getAllFile(files);
-            logger.info("===============================交易数"+allFile.size()+"文件解析结束================================");
-            contrast.filterCardList(allFile,false);
+            String date=now.minusDays(1).format(dtf);
+            List<TJRLDB> tjrldbs=loadTJRL(date);
+            logger.info("===============================交易数"+tjrldbs.size()+",读取文件结束================================");
+            contrast.filterCardList(tjrldbs);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
-
-
-    void getArrivalInfos2(String date,String path) {
-        LocalDateTime now=LocalDateTime.parse(date,tdf);
-        logger.info("票务数据缓存加载: " + now);
+    //获取刷卡数据
+    public  List<TJRLDB> loadTJRL(String date){
+        List<TJRLDB> listMap = new ArrayList<>();
         try {
-            List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,1);
-            contrast.getSchedulingS=result.get(0);
-            contrast.getSchedulingSSell=result.get(1);
-            List<File> fl= FileUtil.loopFiles(path);
-            System.out.println(fl.size());
-            List<List<File>> subList=getSubList(100,fl);
-            if(!subList.isEmpty()){
-                subList.forEach(fs->{
-                    if (!fs.isEmpty()) {
-                        System.out.println("文件数"+fs.size());
-                        try {
-                            List<TJRLDB> allFile = analysis.getAllFile(fs);
-                            System.out.println("交易数"+allFile.size());
-                            contrast.filterCardList(allFile,true);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+            JSONObject params=new JSONObject();
+            params.put("cdate",date);
+            String sb = HttpUtil.post("http://10.10.150.53:8184/cardSys/data/act",params.toJSONString());
+            JSONObject jsonObject=JSONObject.parseObject(sb.toString());
+            if(jsonObject.getString("code").equals("0")){
+                String ja=jsonObject.getString("data");
+                List<Map> result= JSON.parseArray(ja,Map.class);
+                for (Map map : result) {
+                    TJRLDB tjrl=new TJRLDB();
+                    tjrl.setTJRLDRVCRDID(String.valueOf(map.get("DRIVER_CARD_ID")));//司售卡号
+                    tjrl.setTJRLCARDNO(String.valueOf(map.get("CARD_ID")));//消费卡的ID号
+                    tjrl.setTJRLCDKIND(String.valueOf(map.get("CARD_TYPE")));//消费卡卡型
+                    tjrl.setTJRLPOSID(String.valueOf(map.get("POS_ID")));//POS编号
+                    tjrl.setTJRLRDATE(String.valueOf(map.get("TXN_DATE")));//交易日期
+                    if(String.valueOf(map.get("TXN_TIME")).length()<6){
+                        tjrl.setTJRLRTIME("0"+map.get("TXN_TIME"));//交易时间
+                    }else {
+                        tjrl.setTJRLRTIME(String.valueOf(map.get("TXN_TIME")));//交易时间
                     }
-                });
+                    tjrl.setTJRLCDBAL(String.valueOf(map.get("BAL_BEF")));//消费卡交易前金额，单位：分
+                    tjrl.setTJRLAMT(String.valueOf(map.get("TXN_AMOUNT")));//消费交易金额，单位：分
+                    tjrl.setTJRLORGAMT(String.valueOf(map.get("ORIGNAL_TXN_AMOUNT")));//优惠前原始票价，单位：分
+                    tjrl.setTJRLTXFG(String.valueOf(map.get("CARD_SPEC")));//卡规范（01—建设部卡、02—交通部卡、03—二维码扫码）
+                    tjrl.setCOUNT(String.valueOf(map.get("COUNT")));//卡计数器
+                    listMap.add(tjrl);
+                }
             }
-        logger.info("==============================="+now.minusDays(1)+"数据处理完成================================");
         } catch (Exception e) {
             e.printStackTrace();
         }
-    }
-
-    //@PostConstruct
-    void processingHistory(){
-        getArrivalInfos2("2022-11-22 00:00","/home/oldFile/20221121");
-        //getArrivalInfos2("2022-11-23 00:00","/home/oldFile/20221122");
-    }
-
-    /**
-    * @Description:  用来计算数据库中的乘车记录
-    * @Param:
-    * @return:
-    * @Author: YM
-    * @Date: 2021/10/13
-    */
-    //@PostConstruct
-    private void filterCardListByDB() throws Exception {
-        DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        LocalDateTime now=LocalDateTime.parse("2021-08-07 00:00",tdf);
-
-        int day=1;
-        List<Map<String,List<Scheduling>>> result=contrast.getSchedulingS(now,day);
-        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);
-        String start=startDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        String end=now.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        map.put("start",start);
-        map.put("end",end);
-        contrast.filterCardListByDB(map);
-    }
-
-
-
-
-    public List<List<File>> getSubList(int length, List<File> list){
-        int size = list.size();
-        int temp = size / length + 1;
-        boolean result = size % length == 0;
-        List<List<File>> subList = new ArrayList<>();
-        for (int i = 0; i < temp; i++) {
-            if (i == temp - 1) {
-                if (result) {
-                    break;
-                }
-                subList.add(list.subList(length * i, size)) ;
-            } else {
-                subList.add(list.subList(length * i, length * (i + 1))) ;
-            }
-        }
-        return subList;
-    }
-
-
-    public static class wdbFileFilter implements FileFilter {
-        @Override
-        public boolean accept(File file) {
-            if(file.isDirectory())
-                return false;
-            String name = file.getName();
-            if(name.endsWith(".wdb")) //mp3则返回true
-                return true;
-            return false;
-        }
-    }
-
-    public static void main(String[] args) {
-        List<File> files = FileUtil.loopFiles(Paths.get("E:\\sftp\\home\\sftp\\20220725"),1,new wdbFileFilter());
-        files.forEach(file->{
-            System.out.println(file.getName());
-        });
+        return listMap;
     }
 }
 \ No newline at end of file
+package com.example.demo.model;
+
+import java.util.Map;
+
+public class CardDriver {
+    private String card_no;
+    private String inside_no;//司售卡号
+    private String driver_no;//工号
+    private String gh;//工号
+    private String name;
+
+    public static CardDriver getInstance(Map m){
+        CardDriver cardDriver = new CardDriver();
+        cardDriver.setCard_no(m.get("faceNo")!=null?m.get("faceNo").toString():null);
+        cardDriver.setInside_no(m.get("inlineNo")!=null?m.get("inlineNo").toString():null);
+        cardDriver.setDriver_no(m.get("bandUId")!=null?m.get("bandUId").toString():null);
+        cardDriver.setName(m.get("bandUName")!=null?m.get("bandUName").toString():null);
+        return cardDriver;
+    }
+
+    public String getCard_no() {
+        return card_no;
+    }
+
+    public void setCard_no(String card_no) {
+        this.card_no = card_no;
+    }
+
+    public String getInside_no() {
+        return inside_no;
+    }
+
+    public void setInside_no(String inside_no) {
+        this.inside_no = inside_no;
+    }
+
+    public String getDriver_no() {
+        return driver_no;
+    }
+
+    public void setDriver_no(String driver_no) {
+        this.driver_no = driver_no;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGh() {
+        String ghStr=null;
+        if(this.driver_no!=null && this.driver_no.split("-").length==2){
+            ghStr=this.driver_no.split("-")[1];
+        }
+        return ghStr;
+    }
+
+    public void setGh(String gh) {
+        this.gh = gh;
+    }
+}
-package com.example.demo.service;
-
-import com.example.demo.SaticScheduleTask;
-import com.example.demo.model.TJRL;
-import com.example.demo.model.TJRLDB;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Component
-public class Analysis {
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private static Date startDate = subtractTime(new Date(), -300000);
-
-
-    @Value("${ftp.oldFile}")
-    private  String oldFile;
-
-
-    /**
-     * 获取路径下的所有文件/文件夹  /读取文件 返回时间和carid
-     *
-     * @param files 需要遍历的文件夹路径
-     * @return
-     */
-    public  List<TJRLDB> getAllFile(List<File> files) throws Exception {
-        List<TJRLDB> listMap = new ArrayList<>();
-        List<String> list = new ArrayList<String>();
-        for (File file : files) {
-            if (!file.isDirectory()) {
-                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;
-                try {
-                    nowTime = new SimpleDateFormat("yyyyMMddHHmmss").parse(time);
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-                //if (belongCalendar(nowTime)) { //判断是否在对应时间内
-                    list.add(file.getAbsolutePath());
-                    List<String> strings = txt2String(new File(file.getAbsolutePath()));//读取文件
-                    for (int i = 0; i < strings.size(); i++) {
-                        String text = strings.get(i);
-                        Map<String, Object> map = new HashMap<>();
-                        TJRLDB tjrl=new TJRLDB();
-                        String POSID=text.substring(0,8);
-                        tjrl.setTJRLPOSID(POSID);
-                        Long val = Long.parseLong(text.substring(30, 40));
-                        String cardId = Long.toHexString(val).toUpperCase();
-                        tjrl.setTJRLDRVCRDID(cardId);//司售卡号 DriverCardId签到卡片ID号，BCD编码，司售卡卡号
-                        //map.put("DriverCardType", text.substring(40, 42));//DriverCardType HEX格式，签到卡的卡型，BCD编码
-                        //map.put("CHECKINDATE", text.substring(42, 54));//签到时间YYYYMMDDhhmm，BCD编码
-                        //map.put("CHECKOUTCOUNT", text.substring(54, 60));//签到总次数，BCD编码
-                        tjrl.setTJRLTXFG(text.substring(60, 62));//交易类型  Txn Flag HEX格式，交易标志，其中88为正常交易，99为锁卡交易，BCD编码，定义见附录1交易类型对照表
-                        String POSSEQID=text.substring(62, 68);//HEX格式，消费交易流水号，BCD编码
-                        //map.put("CITYCODE", text.substring(68, 72));    //城市代码号，BCD编码
-                        tjrl.setTJRLCARDNO(text.substring(72, 82));//CARDID消费卡的ID号，BCD编码
-                        tjrl.setTJRLCDKIND(text.substring(82, 84));//Card Type HEX格式，消费卡卡型，BCD编码
-                        tjrl.setTJRLCDBAL(text.substring(84, 92));//交易前余额 BalBef消费卡交易前金额，BCD编码 BCD编码之前最高位1表示负数，0表示正数
-                        tjrl.setTJRLAMT(text.substring(92, 100));//交易金额 TxnAmount本次消费交易金额，BCD编码
-                        String TJRLRDATE=text.substring(100, 108);
-                        try {
-                            tjrl.setTJRLRDATE(new SimpleDateFormat("yyyy-MM-dd").
-                                    format(new SimpleDateFormat("yyyyMMdd").parse(text.substring(100, 108))));
-                            //交易日期 本次消费交易日期，BCD编码YYYYMMDD
-                        } catch (ParseException e) {
-                            e.printStackTrace();
-                        }
-                        String TJRLRTIME=text.substring(108, 114);
-                        try {
-                            tjrl.setTJRLRTIME(new SimpleDateFormat("HH:mm:ss").
-                                    format(new SimpleDateFormat("HHmmss").parse(text.substring(108, 114))));
-                            //交易时间 Txn Time本次消费交易时间，BCD编码hhmmss
-                        } catch (ParseException e) {
-                            e.printStackTrace();
-                        }
-                        tjrl.setCOUNT(text.substring(114, 120));//交易计数器，BCD编码
-                        tjrl.setTJRLORGAMT(text.substring(120, 124));//交易原始金额Orignal Txn Amount
-                        //map.put("CARDSPEC", text.substring(124, 126));   //卡规范，BCD编码 01—建设部卡 02—交通部卡 03-交通部二维码
-                        String TAC=text.substring(126, 134);//HEX格式，交易认证码，BCD编码
-                        String TRAD_ID=TAC+POSSEQID+TJRLRDATE+TJRLRTIME;
-                        tjrl.setTRAD_ID(TRAD_ID);////pos交易数据需要加上 trad_id 用tac+pos流水+交易日期+交易时间
-
-                        listMap.add(tjrl);
-                    }
-                //}
-              /*  Analysis analysis=new Analysis();
-                analysis.setOldFile(oldFile);*/
-                File f2=new File(oldFile+File.separator+name);
-                if(!f2.exists()&&!f2.isDirectory()){
-                    f2.mkdir();
-                }
-                File f=new File(oldFile+File.separator+name+File.separator+file.getName());
-                file.renameTo(f);
-            }
-        }
-        return listMap;
-    }
-
-
-    /**
-     * 读取文件内容
-     */
-    public static List<String> txt2String(File file) {
-        List<String> list = new ArrayList<>();
-        StringBuilder result = new StringBuilder();
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(file));//构造一个BufferedReader类来读取文件
-            String s = null;
-            while ((s = br.readLine()) != null) {//使用readLine方法，一次读一行
-                list.add(s);
-            }
-            br.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-
-    /**
-     * 加减对应时间后的日期
-     *
-     * @param date   需要加减时间的日期
-     * @param amount 加减的时间(毫秒)
-     * @return 加减对应时间后的日期
-     */
-
-    private static Date subtractTime(Date date, int amount) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String strTime = sdf.format(date.getTime() + amount);
-            Date time = sdf.parse(strTime);
-            return time;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 判断时间是否在时间段内
-     *
-     * @param nowTime
-     * @return
-     */
-    public static boolean belongCalendar(Date nowTime) {
-        Calendar date = Calendar.getInstance();
-        date.setTime(nowTime);
-
-        Calendar begin = Calendar.getInstance();
-        begin.setTime(startDate);
-
-        Calendar end = Calendar.getInstance();
-        end.setTime(new Date());
-
-        if (date.after(begin) && date.before(end)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-   /* @Value("${ftp.oldFile}")
-    public  void setOldFile(String oldFile) {
-        Analysis.oldFile = oldFile;
-    }*/
-
-
-    public static boolean containsWords(String inputString, String[] items) {
-        boolean found = false;
-        for (String item : items) {
-            if (inputString.contains(item)) {
-                found = true;
-                break;
-            }
-
-        }
-        return found;
-    }
-
-    public static void main(String[] args) {
-        String s="A123";
-        String[] arr={"A","B","C","D","E","F"};
-        if(containsWords(s,arr)){
-            System.out.println(s);
-        }
-    }
-}
-
 package com.example.demo.service;
-import cn.hutool.json.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.HttpUtils;
-import com.example.demo.SaticScheduleTask;
+import cn.hutool.http.HttpUtil;
 import com.example.demo.mapper.db1.SiteMapper1;
 import com.example.demo.mapper.db2.SiteMapper2;
 import com.example.demo.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.SendResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
@@ -35,11 +26,7 @@ public class Contrast {
     @Autowired
     private SiteMapper2 siteMapper2;
-    @Autowired
-    private KafkaTemplate kafkaTemplate;
-    @Autowired
-    private SaticScheduleTask saticScheduleTask;
     public Map<String,List<Scheduling>> getSchedulingS;
     public Map<String,List<Scheduling>> getSchedulingSSell;
@@ -48,26 +35,24 @@ public class Contrast {
     private final int TIME=5;
     private final int TIME2=0;//刷卡的时间和到站实际允许误差值
-    public List<Map> getDriverCardList() throws Exception{
-        List<Map> list = new ArrayList<>();
-        String drivercard = HttpUtils.sendPost("http://112.64.187.3:1080/gjService/gjService/drivercard", null);
-        JSONObject obj = JSONObject.parseObject(drivercard);
-        String errorCode = obj.get("errorCode").toString();
-        if (errorCode.equals("1")) {
-            JSONArray dateBeans = obj.getJSONArray("dateBean");
-            for (int i = 0; i < dateBeans.size(); i++) {
-                Map dataList = new HashMap();
-                JSONObject o = (JSONObject) dateBeans.get(i);
-                dataList.put("outcardno", o.get("outcardno"));
-                dataList.put("cardno", o.get("cardno"));
-                dataList.put("jobCode", o.get("jobCode"));
-                dataList.put("companyNo", o.get("companyNo"));
-                dataList.put("brancheCompanyNo", o.get("brancheCompanyNo"));
-                dataList.put("personalName", o.get("personalName"));
-                list.add(dataList);
+
+    //获取司售卡数据
+    public Map<String,CardDriver> getDriverCardList(){
+        Map<String,CardDriver> cardDrivers = new HashMap<>();
+        try {
+            String sb = HttpUtil.post("http://10.10.150.53:18080/demoserver/business/findDriverSaleCardList",new HashMap<>());
+            List<Map> result= com.alibaba.fastjson.JSON.parseArray(sb,Map.class);
+            if(result!=null && result.size()>0){
+                for (Map map : result) {
+                    if(map.get("inlineNo")!=null &&!"".equals(map.get("inlineNo").toString())){
+                        cardDrivers.put(map.get("inlineNo").toString(),CardDriver.getInstance(map));
+                    }
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        return list;
+        return cardDrivers;
     }
@@ -185,8 +170,8 @@ public class Contrast {
                 }
             }
         }
-        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()));
+        Map<String,List<Scheduling>> getSchedulingS=schedulingS.stream().collect(Collectors.groupingBy(s->s.getJ_gh()));
+        Map<String,List<Scheduling>> getSchedulingSSell=schedulingS.stream().collect(Collectors.groupingBy(s->s.getS_gh()));
         List<Map<String,List<Scheduling>>> result=new ArrayList<>();
         result.add(getSchedulingS);
         result.add(getSchedulingSSell);
@@ -202,108 +187,98 @@ public class Contrast {
      * @Author: YM
      * @Date: 2021/10/13
      */
-    public void filterCardList(List<TJRLDB> allData, Boolean isOld) throws Exception {
+    public void filterCardList(List<TJRLDB> tjrldbs) throws Exception {
         logger.info("===============================票务数据匹配开始================================");
         long start = System.currentTimeMillis();
-        List<Map> driverCardList = getDriverCardList();//获取司机信息
+        Map<String,CardDriver> driverCards = getDriverCardList();//获取司机信息
         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");
+        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyyMMdd HHmmss");
         int b=0;//用于计算匹配成功的数量
-        for (int i = 0; i < allData.size(); i++) {
-            TJRLDB data = allData.get(i);
+        for (int i = 0; i < tjrldbs.size(); i++) {
+            TJRLDB data = tjrldbs.get(i);
             //通过司售卡找到司机
-            String carId = data.getTJRLDRVCRDID().length()>8?
-                    data.getTJRLDRVCRDID().substring( data.getTJRLDRVCRDID().length()-8):
-                    data.getTJRLDRVCRDID();
-            List<Map> collect = driverCardList.stream().filter(map -> map.get("cardno").equals(carId)).collect(Collectors.toList());
+            String carId = data.getTJRLDRVCRDID();
+            CardDriver driver =driverCards.get(carId);
             String mark="";
-            String jobCodes = "";
+            String gh = "";
             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("-");
-                    jobCodes =arr.length==0?collect.get(0).get("jobCode").toString():arr[arr.length-1];//工号
-                    String time=String.valueOf(data.getTJRLRTIME());//时间
-                    String date=String.valueOf(data.getTJRLRDATE());//日期
-                    cardDate = LocalDateTime.parse(date+" "+time,dtf).toInstant(ZoneOffset.of("+8")).toEpochMilli(); //刷卡时间(时间戳)
-
-                    //通过司机姓名获得进出记录
-                    List<Scheduling> schedulingList1=schedulingS.get(personalName);
-                    //没匹配到匹配售票员
-                    if(schedulingList1==null){
-                        schedulingList1=schedulingSSell.get(personalName);
-                    }
-                    Scheduling scheduling = null;
-
-                    if(schedulingList1!=null){
-                        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;
-                            }
+            if (driver!=null) {
+                String personalName = driver.getName();//司机姓名
+                gh=driver.getGh();
+                String time=String.valueOf(data.getTJRLRTIME());//时间
+                String date=String.valueOf(data.getTJRLRDATE());//日期
+                cardDate = LocalDateTime.parse(date+" "+time,dtf).toInstant(ZoneOffset.of("+8")).toEpochMilli(); //刷卡时间(时间戳)
+
+                //通过司机姓名获得进出记录
+                List<Scheduling> schedulingList1=schedulingS.get(gh);
+                //没匹配到匹配售票员
+                if(schedulingList1==null){
+                    schedulingList1=schedulingSSell.get(gh);
+                }
+                Scheduling scheduling = null;
+
+                if(schedulingList1!=null){
+                    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 {
-                        mark="没有匹配的进站记录："+personalName+" 工号："+jobCodes;
                     }
+                }else {
+                    mark="没有匹配的进站记录："+personalName+" 工号："+gh;
+                    System.out.println(mark);
+                }
-                    if (scheduling!=null) {
-                        data.setLineId(scheduling.getXl_bm());
-                        data.setSTATION_FLAG("1");
-                        data.setTJRLUNITID(scheduling.getGs_name());
-                        data.setTJRLSTATID(scheduling.getXl_name());
-                        data.setROAD_FORM_TYPE(scheduling.getBc_type());
-                        data.setUPDOWN(scheduling.getXl_dir());
-                        data.setBUS_CODE(scheduling.getCl_zbh());
-                        data.setBUS_PLATE(scheduling.getCar_plate());
-                        data.setROAD_CODE(scheduling.getLp_name());
-                        data.setDEPART_NAME(scheduling.getQdz_name());
-                        data.setDEPART_CODE(scheduling.getQdz_code());
-                        data.setDEPART_ACTUAL_TIME(scheduling.getFcsj_actual());
-                        data.setREACH_NAME(scheduling.getZdz_name());
-                        data.setREACH_CODE(scheduling.getZdz_code());
-                        data.setREACH_ACTUAL_TIME(scheduling.getZdsj_actual());
-                        if(scheduling.getStation_name()!=null){
-                            data.setLEVELS_FLAG("1");
-                            data.setLEVELS1(scheduling.getStation_route_code());//站点路由序号
-                            data.setLEVELS_NAME1(scheduling.getStation_name());//站点名
-                            data.setLEVELS1_CODE(scheduling.getStop_no());//站点编号
-                        }else {
-                            data.setLEVELS_FLAG("0");
-                        }
-                    } else {
-                        data.setSTATION_FLAG("0");
+                if (scheduling!=null) {
+                    data.setLineId(scheduling.getXl_bm());
+                    data.setSTATION_FLAG("1");
+                    data.setTJRLUNITID(scheduling.getGs_name());
+                    data.setTJRLSTATID(scheduling.getXl_name());
+                    data.setROAD_FORM_TYPE(scheduling.getBc_type());
+                    data.setUPDOWN(scheduling.getXl_dir());
+                    data.setBUS_CODE(scheduling.getCl_zbh());
+                    data.setBUS_PLATE(scheduling.getCar_plate());
+                    data.setROAD_CODE(scheduling.getLp_name());
+                    data.setDEPART_NAME(scheduling.getQdz_name());
+                    data.setDEPART_CODE(scheduling.getQdz_code());
+                    data.setDEPART_ACTUAL_TIME(scheduling.getFcsj_actual());
+                    data.setREACH_NAME(scheduling.getZdz_name());
+                    data.setREACH_CODE(scheduling.getZdz_code());
+                    data.setREACH_ACTUAL_TIME(scheduling.getZdsj_actual());
+                    if(scheduling.getStation_name()!=null){
+                        data.setLEVELS_FLAG("1");
+                        data.setLEVELS1(scheduling.getStation_route_code());//站点路由序号
+                        data.setLEVELS_NAME1(scheduling.getStation_name());//站点名
+                        data.setLEVELS1_CODE(scheduling.getStop_no());//站点编号
+                    }else {
+                        data.setLEVELS_FLAG("0");
                     }
+                } else {
+                    data.setSTATION_FLAG("0");
                 }
             }else {
-                mark="未查工号："+carId;
+                mark="未查到工号："+carId;
                 data.setSTATION_FLAG("0");
+                System.out.println(mark);
             }
             if(mark.length()==0 && !flag){
-                mark="没有匹配的班次 "+jobCodes+"刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
+                mark="没有匹配的班次 "+gh+"刷卡时间为:"+LocalDateTime.ofEpochSecond(cardDate/1000, 0, ZoneOffset.ofHours(8));
+                System.out.println(mark);
             }
             data.setMARK(mark);
-            //如果是新数据 没匹配到 去除这条记录 并放入缓存等到下次继续匹配
-            if(!isOld && !flag){
-                List<TJRLDB> m =oldData;
-                m.add(data);
-                allData.set(i,null);
-
-            }
         }
-        int size=allData.size();
-        allData.removeIf(Objects::isNull);
+        int size=tjrldbs.size();
         //防止数据过多 分批插入
-        List<List<TJRLDB>> subList = getSubList(2000, allData);
+        List<List<TJRLDB>> subList = getSubList(2000, tjrldbs);
         if(!subList.isEmpty()){
             subList.forEach(data->{
                 if (!data.isEmpty()) {
@@ -311,91 +286,10 @@ public class Contrast {
                 }
             });
         }
-
-        List<List<TJRLDB>> subList2 = getSubList(500, allData);
-        if(!subList2.isEmpty()){
-            subList2.forEach(data->{
-                if (!data.isEmpty()) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("datatype", "passengerflow");
-                    List<TJRL> data2 =new ArrayList<>();
-                    for (TJRLDB tjrldb : data) {
-                        TJRL tjrl= new TJRL(tjrldb);
-                        data2.add(tjrl);
-                    }
-                    map.put("datas", data2);
-                    JSON j=new cn.hutool.json.JSONObject(map);
-                    String json =j.toString();
-                    ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("PDGJ", json);
-                    future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-                        @Override
-                        public void onSuccess(SendResult<String, String> result) {
-                            logger.info("kafka发送票务数据成功条数:"+data.size());
-                        }
-                        @Override
-                        public void onFailure(Throwable ex) {
-                            logger.error("kafka发送票务数据异常", ex);
-                        }
-                    });
-                }
-            });
-        }
-        //如果是上次遗留的数据不管这是是否匹配到都清空
-        if(isOld){
-            oldData.clear();
-        }
         logger.warn("======匹配"+size+"条======匹配到"+b+"条=====耗时=="+(System.currentTimeMillis() - start)/1000 + "秒");
         logger.info("===============================票务数据匹配结束================================");
     }
-
-
-
-
-
-
-    public static int getWeek(String today)throws Exception{
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = null;
-        try {
-            date = format.parse(today);
-        } catch (ParseException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.setFirstDayOfWeek(Calendar.MONDAY);
-        calendar.setTime(date);
-        return  calendar.get(Calendar.WEEK_OF_YEAR);
-    }
-
-    public static String upperHeadChar(String in) {
-        String head = in.substring(0, 1);
-        String out = head.toUpperCase() + in.substring(1, in.length());
-        return out;
-    }
-
-    public static String getTransTime(String timeStr) throws Exception{
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd HHmmss");
-        LocalDateTime date = LocalDateTime.parse(timeStr, df);
-        DateTimeFormatter f2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String transTime = f2.format(date);
-        return transTime;
-    }
-
-
-    public void filterCardListByDB(Map<String,Object> params) throws Exception{
-        List<TJRLDB> records=siteMapper1.getRecords(params);
-        for (TJRL record : records) {
-            String date=record.getTJRLRDATE()+" "+String.format("%06d", Integer.parseInt(record.getTJRLRTIME()));
-            String s=this.getTransTime(date);
-            record.setTJRLRDATE(s.split(" ")[0]);
-            record.setTJRLRTIME(s.split(" ")[1]);
-        }
-        filterCardList(records,false);
-    }
-
     public List<List<TJRLDB>> getSubList(int length, List<TJRLDB> list)throws Exception{
         int size = list.size();
         int temp = size / length + 1;
@@ -414,13 +308,4 @@ public class Contrast {
         return subList;
     }
-    public static void main(String[] args) throws Exception{
-        String carId="B140C906";
-        Contrast contrast=new Contrast();
-        List<Map> driverCardList = contrast.getDriverCardList();
-        List<Map> collect = driverCardList.stream().filter(map -> map.get("cardno").equals(carId)).collect(Collectors.toList());
-        System.out.println(collect);
-    }
-
-
 }
-server.port=8088
+server.port=8090
-spring.datasource.db1.jdbc-url=jdbc:mysql://192.170.100.132:3306/control?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-spring.datasource.db1.username=ym
-spring.datasource.db1.password=Ym(12345678)
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+spring.datasource.db1.username=root
+spring.datasource.db1.password=fsodlgjiuigAQF2$9fs9
 spring.datasource.db1.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.db1.druid.test-on-borrow=true
 spring.datasource.db1.druid.test-while-idle=true
-spring.datasource.db2.jdbc-url=jdbc:mysql://192.170.100.63:3306/ms?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-spring.datasource.db2.username=ym
-spring.datasource.db2.password=Ym(12345678)
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.10.150.103:3306/ms?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+spring.datasource.db2.username=root
+spring.datasource.db2.password=fsodlgjiuigAQF2$9fs9
 spring.datasource.db2.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.db2.druid.test-on-borrow=true
 spring.datasource.db2.druid.test-while-idle=true
@@ -22,16 +22,16 @@ logging.level.com.example.demo.mapper=info
 #ftp
-ftp.root= /home/sftp
-ftp.oldFile= /home/oldFile
-
-
-spring.kafka.bootstrap-servers=192.170.100.129:9092
-spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
-spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
-spring.kafka.producer.buffer-memory=33554432
-spring.kafka.producer.acks=all
-spring.kafka.producer.properties.max.request.size=20971520
+#ftp.root= /home/sftp
+#ftp.oldFile= /home/oldFile
+#
+#
+#spring.kafka.bootstrap-servers=192.170.100.129:9092
+#spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
+#spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
+#spring.kafka.producer.buffer-memory=33554432
+#spring.kafka.producer.acks=all
+#spring.kafka.producer.properties.max.request.size=20971520
 #
@@ -55,7 +55,7 @@
                cars.car_plate
         FROM control.bsth_c_s_sp_info_real
                  LEFT JOIN control.bsth_c_cars cars ON cars.inside_code = cl_zbh
-        WHERE schedule_date_str in ('${startTime}','${endTime}')
+        WHERE schedule_date_str ='${startTime}' and bc_type in ('normal','region')
         order by equipment_code,fcsj_actual
     </select>