临港路单上送新增字段

yiming
1 parent e237b179
Showing 3 changed files with 52 additions and 9 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/model/Waybill.java
src/main/java/com/example/demo/service/Contrast.java
@@ -6,6 +6,7 @@ package com.example.demo;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.example.demo.model.Waybill;
 import com.example.demo.service.Contrast;
 import com.example.demo.service.DriverCardService;
@@ -47,7 +48,14 @@ public class SaticScheduleTask {
             LocalDateTime now=LocalDate.now().atStartOfDay();
             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());
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject waybill=jsonArray.getJSONObject(i);
+                String result=HttpUtil.post("http://10.10.150.54:12602/api/waybillUpload",waybill.toJSONString());
+                JSONObject jsonObject=JSONObject.parseObject(result);
+                if(!"00".equals(jsonObject.getString("respCode"))){
+                    logger.info(">>>>>>>>>>>>>>路单信息发送失败"+waybill.toJSONString());
+                }
+            }
             logger.info(">>>>>>>>>>>>>>"+now.minusDays(1)+"路单信息发送完毕");
         } catch (Exception e) {
             e.printStackTrace();
@@ -8,6 +8,7 @@ public class Waybill {
     private String tripID;//上海市线路编码
     private String companyNO;//公司号
     private String driver;//司售卡卡内号
+    private String cardFace;//司售卡面号
     private String routeCode;//票务线路编码
     private String carPlate;//车牌
     private String upDownTrip;//上下行
@@ -18,13 +19,14 @@ public class Waybill {
     private String departureTime;//发车时间
     private String arrivalTime;//到达时间
  
-    private List<StopInfo> stopInfosList;//进出站信息
+
+    private List<StopInfo> stopInfos;//进出站信息
  
     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.setCompanyNO("198");
         waybill.setCarPlate(scheduling.getCar_plate()!=null?scheduling.getCar_plate().replace("沪",""):null);
         waybill.setUpDownTrip(scheduling.getXl_dir());
         waybill.setStartStation(scheduling.getQdz_name());
@@ -53,7 +55,7 @@ public class Waybill {
                 stopInfos.add(stopInfoOut);
             });
         }
-        waybill.setStopInfosList(stopInfos);
+        waybill.setStopInfos(stopInfos);
         return waybill;
     }
  
@@ -161,11 +163,40 @@ public class Waybill {
         this.arrivalTime = arrivalTime;
     }
  
-    public List<StopInfo> getStopInfosList() {
-        return stopInfosList;
+    public List<StopInfo> getStopInfos() {
+        return stopInfos;
+    }
+
+    public void setStopInfos(List<StopInfo> stopInfos) {
+        this.stopInfos = stopInfos;
+    }
+
+    public String getCardFace() {
+        return cardFace;
+    }
+
+    public void setCardFace(String cardFace) {
+        this.cardFace = cardFace;
     }
  
-    public void setStopInfosList(List<StopInfo> stopInfosList) {
-        this.stopInfosList = stopInfosList;
+    @Override
+    public String toString() {
+        return "Waybill{" +
+                "routeDate='" + routeDate + '\'' +
+                ", tripID='" + tripID + '\'' +
+                ", companyNO='" + companyNO + '\'' +
+                ", driver='" + driver + '\'' +
+                ", cardFace='" + cardFace + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", carPlate='" + carPlate + '\'' +
+                ", upDownTrip='" + upDownTrip + '\'' +
+                ", startStation='" + startStation + '\'' +
+                ", startStationCode='" + startStationCode + '\'' +
+                ", endStation='" + endStation + '\'' +
+                ", endStationCode='" + endStationCode + '\'' +
+                ", departureTime='" + departureTime + '\'' +
+                ", arrivalTime='" + arrivalTime + '\'' +
+                ", stopInfos=" + stopInfos +
+                '}';
     }
 }
@@ -47,9 +47,11 @@ public class Contrast {
         });
         List<CardDriver> cardDrivers = siteMapper1.getCardDriver();
         Map<String,String> cardDriverMap=new HashMap<>();
+        Map<String,String> faceNoMap=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());
+                cardDriverMap.put(cardDriver.getDriver_no().split("-")[1], cardDriver.getInside_no()==null?"00000000":cardDriver.getInside_no());
+                faceNoMap.put(cardDriver.getDriver_no().split("-")[1], cardDriver.getCard_no());
             }
         });
         //计算开始结束时间
@@ -177,8 +179,10 @@ public class Contrast {
             Waybill waybill= Waybill.getInstance(scheduling);
             if(cardDriverMap.get(scheduling.getJ_gh())!=null){
                 waybill.setDriver(cardDriverMap.get(scheduling.getJ_gh()));
+                waybill.setCardFace(faceNoMap.get(scheduling.getJ_gh()));
             }else{
                 waybill.setDriver(cardDriverMap.get(scheduling.getS_gh()));
+                waybill.setCardFace(faceNoMap.get(scheduling.getS_gh()));
             }
             if(waybill.getDriver()==null){
                 drivers.add(scheduling.getJ_gh());