临港路单推送

yiming
1 parent e77a52f9
Showing 14 changed files with 448 additions and 386 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/control/ScheduleController.java
src/main/java/com/example/demo/mapper/db1/SiteMapper1.java
src/main/java/com/example/demo/model/CardDriver.java
src/main/java/com/example/demo/model/LinePW.java
src/main/java/com/example/demo/model/Scheduling.java
src/main/java/com/example/demo/model/SchedulingData.java
src/main/java/com/example/demo/model/StationRouteData.java
src/main/java/com/example/demo/model/StopInfo.java
src/main/java/com/example/demo/model/Waybill.java
src/main/java/com/example/demo/service/Contrast.java
src/main/java/com/example/demo/service/DriverCardService.java
src/main/resources/application.properties
src/main/resources/mapping/db1/Site-mapper1.xml
@@ -2,10 +2,13 @@ package com.example.demo;
-import com.example.demo.model.Scheduling;
-import com.example.demo.model.SchedulingData;
-import com.example.demo.model.StationRouteData;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.example.demo.model.Waybill;
 import com.example.demo.service.Contrast;
+import com.example.demo.service.DriverCardService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,42 +36,27 @@ public class SaticScheduleTask {
     @Autowired
     private Contrast contrast;
-    public static Map<String,List<SchedulingData>>  SchedulingDataMap=new HashMap<>();
+    @Autowired
+    private DriverCardService driverCardService;
-    public static List<List<StationRouteData>>  StationRouteData=new ArrayList<>();
     @Scheduled(cron = "0 0 12 * * ?")
     @PostConstruct
     void getArrivalInfos(){
         try {
             LocalDateTime now=LocalDate.now().atStartOfDay();
-            DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-/*            DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-            now=LocalDateTime.parse("2024-08-26 00:00",tdf);*/
-            if(SchedulingDataMap.size()==0){
-                List<SchedulingData> dataList1=contrast.getSchedulingS(now,1);
-                SchedulingDataMap.put(now.minusDays(1).format(dtf),dataList1);
-                logger.info(">>>>>>>>>>>>>>"+now.minusDays(1)+"路单信息加载完毕");
-
-                List<SchedulingData> dataList2=contrast.getSchedulingS(now,2);
-                SchedulingDataMap.put(now.minusDays(2).format(dtf),dataList2);
-                logger.info(">>>>>>>>>>>>>>"+now.minusDays(2)+"路单信息加载完毕");
-
-                List<SchedulingData> dataList3=contrast.getSchedulingS(now,3);
-                SchedulingDataMap.put(now.minusDays(3).format(dtf),dataList3);
-                logger.info(">>>>>>>>>>>>>>"+now.minusDays(3)+"路单信息加载完毕");
-            }else {
-                List<SchedulingData> dataList1=contrast.getSchedulingS(now,1);
-                SchedulingDataMap.put(now.minusDays(1).format(dtf),dataList1);
-                logger.info(">>>>>>>>>>>>>>"+now.minusDays(1)+"路单信息加载完毕");
-                SchedulingDataMap.remove(now.minusDays(4));
-                logger.info(">>>>>>>>>>>>>>"+now.minusDays(4)+"路单信息删除完毕");
-            }
-
-            StationRouteData=contrast.getStationRoutes();
-            logger.info(">>>>>>>>>>>>>>站点路由信息加载完毕");
+            List<Waybill> dataList=contrast.getSchedulingS(now,1);
+            JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(dataList));
+            HttpUtil.post("https://160.10.6.50:12602/api/waybillUpload",jsonArray.toString());
+            logger.info(">>>>>>>>>>>>>>"+now.minusDays(1)+"路单信息发送完毕");
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    @Scheduled(cron = "0 0 1 * * ?")
+    @PostConstruct
+    void loadDriverCar(){
+        driverCardService.loadDriverCar();
+    }
 }
 \ No newline at end of file
 package com.example.demo.control;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
-import com.example.demo.SaticScheduleTask;
-import com.example.demo.model.Scheduling;
-import com.example.demo.model.SchedulingData;
-import com.example.demo.model.StationRoute;
-import com.example.demo.model.StationRouteData;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.example.demo.model.Waybill;
 import com.example.demo.service.Contrast;
-import com.example.demo.util.IPWhiteUtil;
-import com.example.demo.util.IpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -31,21 +27,17 @@ public class ScheduleController {
     private Contrast contrast;
-    private String ipWhite = "58.40.5.18;61.169.120.202;127.0.0.1;localhost;192.168.20.150";
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @RequestMapping("getSchedules")
-    public JSONArray getSchedules(@RequestParam String date, HttpServletRequest request){
+    public JSONArray getSchedules(@RequestParam String date){
         JSONArray jsonArray= new JSONArray();
         try {
-            String ip=IpUtils.getIpAddr(request);
-            if (!IPWhiteUtil.checkRequestIP(ip, ipWhite)) {
-                logger.info("拦截的IP为：" + ip);
-                return null;
-            }
-            List<SchedulingData> list= SaticScheduleTask.SchedulingDataMap.get(date);
-            jsonArray = JSONUtil.parseArray(list);
+            DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate= LocalDate.parse(date,dtf);
+            List<Waybill> dataList=contrast.getSchedulingS(localDate.atStartOfDay(),0);
+            jsonArray= JSON.parseArray(JSON.toJSONString(dataList));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -53,23 +45,20 @@ public class ScheduleController {
         return jsonArray;
     }
-    @RequestMapping("getStationRoutes")
-    public JSONArray getStationRoutes(HttpServletRequest request){
+    @RequestMapping("sendSchedules")
+    public JSONArray sendSchedules(@RequestParam String date){
         JSONArray jsonArray= new JSONArray();
         try {
-            String ip=IpUtils.getIpAddr(request);
-            if (!IPWhiteUtil.checkRequestIP(ip, ipWhite)) {
-                logger.info("拦截的IP为：" + ip);
-                return null;
-            }
-            List<List<StationRouteData>> list= SaticScheduleTask.StationRouteData;
-            jsonArray = JSONUtil.parseArray(list);
+            DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate= LocalDate.parse(date,dtf);
+            List<Waybill> dataList=contrast.getSchedulingS(localDate.atStartOfDay(),0);
+            jsonArray= JSON.parseArray(JSON.toJSONString(dataList));
+            HttpUtil.post("https://160.10.6.50:12602/api/waybillUpload",jsonArray.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
-        logger.info(">>>>>>>>>>>>>>>>站点路由信息返回："+jsonArray.size());
+        logger.info(">>>>>>>>>>>>>>>>路单信息手动推送："+jsonArray.size());
         return jsonArray;
     }
-
 }
@@ -24,4 +24,16 @@ public interface SiteMapper1 {
     @DS("db1")
     String getMaxTime(String date);
+
+    @DS("db1")
+    List<LinePW> getLinePW();
+
+    @DS("db1")
+    List<CardDriver> getCardDriver();
+
+    @DS("db1")
+    void insertCardDriver(List<CardDriver> cardDrivers);
+
+    @DS("db1")
+    void deleteCardDriver();
 }
 \ 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 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;
+    }
+}
+package com.example.demo.model;
+
+public class LinePW {
+    private String line_code;
+    private String line_name;
+    private String line_id;
+
+    public String getLine_code() {
+        return line_code;
+    }
+
+    public void setLine_code(String line_code) {
+        this.line_code = line_code;
+    }
+
+    public String getLine_name() {
+        return line_name;
+    }
+
+    public void setLine_name(String line_name) {
+        this.line_name = line_name;
+    }
+
+    public String getLine_id() {
+        return line_id;
+    }
+
+    public void setLine_id(String line_id) {
+        this.line_id = line_id;
+    }
+}
@@ -21,6 +21,16 @@ public class Scheduling implements Comparable&lt;Scheduling&gt; ,Cloneable{
     private String zdsj_actual;//实际到达时间
     private String shanghai_linecode;
+    public String getS_gh() {
+        return s_gh;
+    }
+
+    public void setS_gh(String s_gh) {
+        this.s_gh = s_gh;
+    }
+
+    private String s_gh;//驾驶员工号
+
     private List<InOutStation> inOutStations;
-package com.example.demo.model;
-
-import java.util.List;
-
-public class SchedulingData {
-    private String date;//日期YYYYMMDD
-    private String nbbm;//车辆内部编码
-    private String deviceID;//车辆内部编码
-    private String company;//公司号
-    private String driver;//驾驶员工号
-    private String lineCode;//上海市线路编码
-    private String carPlate;//车牌 例如D12345不带中文
-    private String upDown;//上下行 0上行,1下行
-    private String qdzName;//起点站名称
-    private String qdzCode;//起点站编码
-    private String zdzName;//终点站名称
-    private String zdzCode;//终点站编码
-    private String fcsj;//实际发车时间hhmmss
-    private String zdsj;//实际到达时间hhmmss
-
-    private List<InOutStation> inOutStations;//进出站信息
-
-
-    public static SchedulingData getInstance(Scheduling scheduling){
-        SchedulingData schedulingKFK=new SchedulingData();
-        schedulingKFK.setDate(scheduling.getSchedule_date_str()!=null?scheduling.getSchedule_date_str().replace("-",""):null);
-        schedulingKFK.setNbbm(scheduling.getCl_zbh());
-        schedulingKFK.setDeviceID(scheduling.getEquipment_code());
-        schedulingKFK.setCompany(scheduling.getGs_bm());
-        schedulingKFK.setDriver(scheduling.getJ_gh());
-        schedulingKFK.setLineCode(scheduling.getShanghai_linecode());
-        schedulingKFK.setCarPlate(scheduling.getCar_plate()!=null?scheduling.getCar_plate().replace("沪",""):null);
-        schedulingKFK.setUpDown(scheduling.getXl_dir());
-        schedulingKFK.setQdzName(scheduling.getQdz_name());
-        schedulingKFK.setQdzCode(scheduling.getQdz_code());
-        schedulingKFK.setZdzName(scheduling.getZdz_name());
-        schedulingKFK.setZdzCode(scheduling.getZdz_code());
-        schedulingKFK.setFcsj(scheduling.getFcsj_actual()!=null?scheduling.getFcsj_actual().replace(":","")+"00":null);
-        schedulingKFK.setZdsj(scheduling.getZdsj_actual()!=null?scheduling.getZdsj_actual().replace(":","")+"00":null);
-        schedulingKFK.setInOutStations(scheduling.getInOutStations());
-        return schedulingKFK;
-    }
-
-    public String getDeviceID() {
-        return deviceID;
-    }
-
-    public void setDeviceID(String deviceID) {
-        this.deviceID = deviceID;
-    }
-
-    public String getDate() {
-        return date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getDriver() {
-        return driver;
-    }
-
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getCarPlate() {
-        return carPlate;
-    }
-
-    public void setCarPlate(String carPlate) {
-        this.carPlate = carPlate;
-    }
-
-    public String getUpDown() {
-        return upDown;
-    }
-
-    public void setUpDown(String upDown) {
-        this.upDown = upDown;
-    }
-
-    public String getQdzName() {
-        return qdzName;
-    }
-
-    public void setQdzName(String qdzName) {
-        this.qdzName = qdzName;
-    }
-
-    public String getQdzCode() {
-        return qdzCode;
-    }
-
-    public void setQdzCode(String qdzCode) {
-        this.qdzCode = qdzCode;
-    }
-
-    public String getZdzName() {
-        return zdzName;
-    }
-
-    public void setZdzName(String zdzName) {
-        this.zdzName = zdzName;
-    }
-
-    public String getZdzCode() {
-        return zdzCode;
-    }
-
-    public void setZdzCode(String zdzCode) {
-        this.zdzCode = zdzCode;
-    }
-
-    public String getFcsj() {
-        return fcsj;
-    }
-
-    public void setFcsj(String fcsj) {
-        this.fcsj = fcsj;
-    }
-
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
-    public List<InOutStation> getInOutStations() {
-        return inOutStations;
-    }
-
-    public void setInOutStations(List<InOutStation> inOutStations) {
-        this.inOutStations = inOutStations;
-    }
-
-}
-package com.example.demo.model;
-
-public class StationRouteData {
-    private String stationRouteCode;
-    private String directions;
-    private String lineCode;
-    private String stationName;
-    private String stationCode;
-
-
-
-    public static StationRouteData getInstance(StationRoute stationRoute){
-        StationRouteData stationRouteKFK=new StationRouteData();
-        stationRouteKFK.setStationRouteCode(stationRoute.getStation_route_code());
-        stationRouteKFK.setDirections(stationRoute.getDirections());
-        stationRouteKFK.setLineCode(stationRoute.getShanghai_linecode());
-        stationRouteKFK.setStationName(stationRoute.getStation_name());
-        stationRouteKFK.setStationCode(stationRoute.getStation_code());
-        return stationRouteKFK;
-    }
-
-    public String getStationRouteCode() {
-        return stationRouteCode;
-    }
-
-    public void setStationRouteCode(String stationRouteCode) {
-        this.stationRouteCode = stationRouteCode;
-    }
-
-    public String getDirections() {
-        return directions;
-    }
-
-    public void setDirections(String directions) {
-        this.directions = directions;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-}
+package com.example.demo.model;
+
+public class StopInfo {
+
+    private String stopInfoID;//内部编码
+    private String stopSeq;//站点序号
+    private String stopTime;//时间
+    private String inOutStation;//进出站
+
+
+    public String getStopInfoID() {
+        return stopInfoID;
+    }
+
+    public void setStopInfoID(String stopInfoID) {
+        this.stopInfoID = stopInfoID;
+    }
+
+    public String getStopSeq() {
+        return stopSeq;
+    }
+
+    public void setStopSeq(String stopSeq) {
+        this.stopSeq = stopSeq;
+    }
+
+    public String getStopTime() {
+        return stopTime;
+    }
+
+    public void setStopTime(String stopTime) {
+        this.stopTime = stopTime;
+    }
+
+    public String getInOutStation() {
+        return inOutStation;
+    }
+
+    public void setInOutStation(String inOutStation) {
+        this.inOutStation = inOutStation;
+    }
+}
+package com.example.demo.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Waybill {
+    private String routeDate;//日期YYYYMMDD
+    private String tripID;//上海市线路编码
+    private String companyNO;//公司号
+    private String driver;//司售卡卡内号
+    private String routeCode;//票务线路编码
+    private String carPlate;//车牌
+    private String upDownTrip;//上下行
+    private String startStation;//起点站
+    private String startStationCode;//起点站编码
+    private String endStation;//终点站
+    private String endStationCode;//终点站编码
+    private String departureTime;//发车时间
+    private String arrivalTime;//到达时间
+
+    private List<StopInfo> stopInfosList;//进出站信息
+
+    public static Waybill getInstance(Scheduling scheduling){
+        Waybill waybill=new Waybill();
+        waybill.setRouteDate(scheduling.getSchedule_date_str()!=null?scheduling.getSchedule_date_str().replace("-",""):null);
+        waybill.setTripID(scheduling.getShanghai_linecode());
+        waybill.setCompanyNO("");
+        waybill.setCarPlate(scheduling.getCar_plate()!=null?scheduling.getCar_plate().replace("沪",""):null);
+        waybill.setUpDownTrip(scheduling.getXl_dir());
+        waybill.setStartStation(scheduling.getQdz_name());
+        waybill.setStartStationCode(scheduling.getQdz_code());
+        waybill.setEndStation(scheduling.getZdz_name());
+        waybill.setEndStationCode(scheduling.getZdz_code());
+        waybill.setDepartureTime(scheduling.getFcsj_actual()!=null?scheduling.getFcsj_actual().replace(":","")+"00":null);
+        waybill.setArrivalTime(scheduling.getZdsj_actual()!=null?scheduling.getZdsj_actual().replace(":","")+"00":null);
+
+        List<StopInfo> stopInfos=new ArrayList<>();
+        List<InOutStation> inOutStations=scheduling.getInOutStations();
+        if(inOutStations!=null){
+            inOutStations.forEach(station -> {
+                StopInfo stopInfoIn=new StopInfo();
+                stopInfoIn.setStopInfoID(station.getStop_no());
+                stopInfoIn.setStopSeq(station.getStationRouteCode());
+                stopInfoIn.setInOutStation("0");
+                stopInfoIn.setStopTime(station.getInTimeStr());
+
+                StopInfo stopInfoOut=new StopInfo();
+                stopInfoOut.setStopInfoID(station.getStop_no());
+                stopInfoOut.setStopSeq(station.getStationRouteCode());
+                stopInfoOut.setInOutStation("1");
+                stopInfoOut.setStopTime(station.getOutTimeStr());
+                stopInfos.add(stopInfoIn);
+                stopInfos.add(stopInfoOut);
+            });
+        }
+        waybill.setStopInfosList(stopInfos);
+        return waybill;
+    }
+
+    public String getCompanyNO() {
+        return companyNO;
+    }
+
+    public void setCompanyNO(String companyNO) {
+        this.companyNO = companyNO;
+    }
+
+    public String getRouteDate() {
+        return routeDate;
+    }
+
+    public void setRouteDate(String routeDate) {
+        this.routeDate = routeDate;
+    }
+
+    public String getTripID() {
+        return tripID;
+    }
+
+    public void setTripID(String tripID) {
+        this.tripID = tripID;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public void setDriver(String driver) {
+        this.driver = driver;
+    }
+
+    public String getRouteCode() {
+        return routeCode;
+    }
+
+    public void setRouteCode(String routeCode) {
+        this.routeCode = routeCode;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getUpDownTrip() {
+        return upDownTrip;
+    }
+
+    public void setUpDownTrip(String upDownTrip) {
+        this.upDownTrip = upDownTrip;
+    }
+
+    public String getStartStation() {
+        return startStation;
+    }
+
+    public void setStartStation(String startStation) {
+        this.startStation = startStation;
+    }
+
+    public String getStartStationCode() {
+        return startStationCode;
+    }
+
+    public void setStartStationCode(String startStationCode) {
+        this.startStationCode = startStationCode;
+    }
+
+    public String getEndStation() {
+        return endStation;
+    }
+
+    public void setEndStation(String endStation) {
+        this.endStation = endStation;
+    }
+
+    public String getEndStationCode() {
+        return endStationCode;
+    }
+
+    public void setEndStationCode(String endStationCode) {
+        this.endStationCode = endStationCode;
+    }
+
+    public String getDepartureTime() {
+        return departureTime;
+    }
+
+    public void setDepartureTime(String departureTime) {
+        this.departureTime = departureTime;
+    }
+
+    public String getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(String arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public List<StopInfo> getStopInfosList() {
+        return stopInfosList;
+    }
+
+    public void setStopInfosList(List<StopInfo> stopInfosList) {
+        this.stopInfosList = stopInfosList;
+    }
+}
@@ -27,29 +27,38 @@ public class Contrast {
     @Autowired
     private SiteMapper2 siteMapper2;
-    @Autowired
-    private KafkaTemplate kafkaTemplate;
-
     /**
     * @Description:车辆、排班、进出站、路由的关联及预加载
     * @Param:  now加载的最终时间 day加载几天
     * @Author: YM
-    * @Date: 2021/10/12
+    * @Date: 2024/09/19
     */
-    public  List<SchedulingData>  getSchedulingS(LocalDateTime now,int day)  throws Exception{
-        List<SchedulingData> schedulingDataList=new ArrayList<>();
+    public  List<Waybill>  getSchedulingS(LocalDateTime now, int day)  throws Exception{
+        List<Waybill> waybillList=new ArrayList<>();
         List<Scheduling> schedulingS=new ArrayList<>();
         Map map = new HashMap();
-
+        Set<String> drivers=new HashSet<>();
+        List<LinePW> linePWS = siteMapper1.getLinePW();
+        Map<String,String> linePWMap=new HashMap<>();
+        linePWS.forEach(linePW -> {
+            linePWMap.put(linePW.getLine_code(), linePW.getLine_id());
+        });
+        List<CardDriver> cardDrivers = siteMapper1.getCardDriver();
+        Map<String,String> cardDriverMap=new HashMap<>();
+        cardDrivers.forEach(cardDriver -> {
+            if(cardDriver.getDriver_no()!=null && cardDriver.getDriver_no().split("-").length==2){
+                cardDriverMap.put(cardDriver.getDriver_no().split("-")[1], cardDriver.getCard_no());
+            }
+        });
         //计算开始结束时间
         LocalDateTime localDateTimeStart=now.minusDays(day);
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         String dateTime = siteMapper1.getMaxTime(localDateTimeStart.format(df));
         if(dateTime==null){
-            return schedulingDataList;
+            return waybillList;
         }
         LocalDateTime  localDateTimeEnd=LocalDateTime.parse(dateTime,dtf).plusMinutes(5);
@@ -165,92 +174,24 @@ public class Contrast {
         }
         for (Scheduling scheduling : schedulings) {
-            SchedulingData schedulingData= SchedulingData.getInstance(scheduling);
-            schedulingDataList.add(schedulingData);
-        }
-        logger.info("共"+schedulingDataList.size()+"个班次,未匹配进出站班次"+schedulings2.size());
-
-        /*
-
-        List<List<SchedulingKFK>> subList = getSubList(100, schedulingKFKS);
-        if(!subList.isEmpty()){
-            subList.forEach(data->{
-                if (!data.isEmpty()) {
-                    Map<String, Object> map2 = new HashMap<>();
-                    map2.put("datatype", "scheduling");
-                    map2.put("datas", data);
-                    JSON j=new JSONObject(map2);
-                    String json =j.toString();
-                    ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("QPGJ", json);
-                    future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-                        @Override
-                        public void onSuccess(SendResult<String, String> result) {
-                            logger.info("kafka发送路单数据成功");
-                        }
-                        @Override
-                        public void onFailure(Throwable ex) {
-                            logger.error("kafka发送单数数据异常", ex);
-                        }
-                    });
-                }
-            });
-        }*/
-        return schedulingDataList;
-    }
-
-    public List<List<StationRouteData>> getStationRoutes(){
-        List<List<StationRouteData>> list = new ArrayList<>();
-        List<StationRoute> StationRouteList=siteMapper1.getStationRoute();
-
-        List<StationRouteData> routeData=new ArrayList<>();
-        for (StationRoute stationRoute : StationRouteList) {
-            StationRouteData stationRouteData= StationRouteData.getInstance(stationRoute);
-            routeData.add(stationRouteData);
-        }
-
-        Map<String, List<StationRouteData>> StationRoutes = routeData.stream().collect(Collectors.groupingBy(s->s.getLineCode()+"_"+s.getDirections()));
-        StationRoutes.forEach((k,v)->{
-            list.add(v);
-        });
-
-
-        /*if(!list.isEmpty()){
-            Map<String, Object> map = new HashMap<>();
-            map.put("datatype", "stationRoute");
-            map.put("datas", list);
-            JSON j=new JSONObject(map);
-            String json =j.toString();
-            ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("QPGJ", json);
-            future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-                @Override
-                public void onSuccess(SendResult<String, String> result) {
-                    logger.info("kafka站点路由数据成功");
-                }
-                @Override
-                public void onFailure(Throwable ex) {
-                    logger.error("kafka发送站点路由数据异常", ex);
-                }
-            });
-        }*/
-        return list;
-    }
-
-    public List<List<SchedulingData>> getSubList(int length, List<SchedulingData> list){
-        int size = list.size();
-        int temp = size / length + 1;
-        boolean result = size % length == 0;
-        List<List<SchedulingData>> 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))) ;
+            Waybill waybill= Waybill.getInstance(scheduling);
+            if(cardDriverMap.get(scheduling.getJ_gh())!=null){
+                waybill.setDriver(cardDriverMap.get(scheduling.getJ_gh()));
+            }else{
+                waybill.setDriver(cardDriverMap.get(scheduling.getS_gh()));
+            }
+            if(waybill.getDriver()==null){
+                drivers.add(scheduling.getJ_gh());
             }
+            waybill.setRouteCode(linePWMap.get(scheduling.getXl_bm()));
+            waybillList.add(waybill);
         }
-        return subList;
+        drivers.forEach(s -> {
+            logger.info(s);
+        });
+        logger.info("共"+waybillList.size()+"个班次,未匹配进出站班次"+schedulings2.size());
+        logger.info("未匹配司售卡"+drivers.size());
+        return waybillList;
     }
+package com.example.demo.service;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.example.demo.mapper.db1.SiteMapper1;
+import com.example.demo.model.CardDriver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class DriverCardService {
+
+    @Autowired
+    private SiteMapper1 siteMapper1;
+
+    public void loadDriverCar(){
+        try {
+            String sb = HttpUtil.post("http://10.10.150.53:18080/demoserver/business/findDriverSaleCardList",new HashMap<>());
+            List<Map> result= JSON.parseArray(sb,Map.class);
+            List<CardDriver> cardDrivers = new ArrayList<>();
+            if(result!=null && result.size()>0){
+                for (Map map : result) {
+                    cardDrivers.add(CardDriver.getInstance(map));
+                }
+                siteMapper1.deleteCardDriver();
+                siteMapper1.insertCardDriver(cardDrivers);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
 server.port=19092
-spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.50.213:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.db1.username=root
-spring.datasource.db1.password=root2jsp
+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.168.50.213:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.10.150.103:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.db2.username=root
-spring.datasource.db2.password=root2jsp
+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
@@ -20,12 +20,6 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 logging.level.com.example.demo.mapper=info
 #logging.level.org.mybatis = debug
-spring.kafka.bootstrap-servers=192.168.40.82: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
@@ -50,5 +50,27 @@
         where (bc_type ='normal' or bc_type ='venting') and schedule_date_str='${date}'
     </select>
+    <select id="getLinePW" resultType="com.example.demo.model.LinePW">
+        SELECT *  FROM `bsth_c_line_pw`
+    </select>
+
+    <select id="getCardDriver" resultType="com.example.demo.model.CardDriver">
+        SELECT *  FROM `card_driver`
+    </select>
+
+    <insert id="insertCardDriver" parameterType="com.example.demo.model.CardDriver">
+        INSERT INTO `card_driver` (
+        `card_no`, `inside_no`, `driver_no`, `name`
+        )
+        VALUES
+        <foreach collection="list" item="card" index="index" separator=",">
+            ( #{card.card_no}, #{card.inside_no}, #{card.driver_no}, #{card.name})
+        </foreach>
+    </insert>
+
+    <delete id="deleteCardDriver">
+        delete from `card_driver`
+    </delete>
+
 </mapper>
 \ No newline at end of file