司售卡匹配驾驶员或售票员

yiming
1 parent 2fdcc1f2
Showing 4 changed files with 31 additions and 7 deletions
src/main/java/com/example/demo/SaticScheduleTask.java
src/main/java/com/example/demo/model/Scheduling.java
src/main/java/com/example/demo/service/Contrast.java
src/main/resources/mapping/db1/Site-mapper1.xml
@@ -40,7 +40,7 @@ public class SaticScheduleTask implements InitializingBean {
     public Map<String,List<Scheduling>> getSchedulingS;
-
+    public Map<String,List<Scheduling>> getSchedulingSSell;
     public List<Map> data=new ArrayList<>();
     /**
@@ -87,7 +87,7 @@ public class SaticScheduleTask implements InitializingBean {
        /* DateTimeFormatter tdf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         now=LocalDateTime.parse("2021-07-11 00:00",tdf);*/
-        this.getSchedulingS=contrast.getSchedulingS(now,1);
+        contrast.getSchedulingS(now,1);
     }
@@ -104,7 +104,7 @@ public class SaticScheduleTask implements InitializingBean {
         LocalDateTime now=LocalDateTime.parse("2021-08-01 00:00",tdf);
         int day=1;
-        this.getSchedulingS=contrast.getSchedulingS(now,day);
+        contrast.getSchedulingS(now,day);
         Map<String,Object> map=new HashMap<>();
         map.put("table","pd_control."+"ftj20210806");
@@ -33,6 +33,24 @@ public class Scheduling implements Comparable&lt;Scheduling&gt; ,Cloneable{
     private String station_route_code;
     private String station_name;
     private String station_code;
+    private String s_gh;//售票员员工号
+    private String s_name;//售票员名字
+
+    public String getS_gh() {
+        return s_gh;
+    }
+
+    public void setS_gh(String s_gh) {
+        this.s_gh = s_gh;
+    }
+
+    public String getS_name() {
+        return s_name;
+    }
+
+    public void setS_name(String s_name) {
+        this.s_name = s_name;
+    }
     public String getGs_name() {
         return gs_name;
@@ -76,11 +76,10 @@ public class Contrast {
     /**
     * @Description:车辆、排班、进出站、路由的关联及预加载
     * @Param:  now加载的最终时间 day加载几天
-    * @return: 关联后的结果集
     * @Author: YM
     * @Date: 2021/10/12
     */
-    public  Map<String,List<Scheduling>> getSchedulingS(LocalDateTime now,int day)  {
+    public  void getSchedulingS(LocalDateTime now,int day)  {
         List<Scheduling> schedulingS=new ArrayList<>();
         long start = System.currentTimeMillis();
         Map map = new HashMap();
@@ -177,10 +176,10 @@ public class Contrast {
             }
         }
-        Map<String,List<Scheduling>> result= schedulingS.stream().collect(Collectors.groupingBy(s->s.getJ_name()));
+        saticScheduleTask.getSchedulingS= schedulingS.stream().collect(Collectors.groupingBy(s->s.getJ_name()));
+        saticScheduleTask.getSchedulingSSell=schedulingS.stream().collect(Collectors.groupingBy(s->s.getS_name()));
         logger.warn("======匹配"+arrivalInfoList.size()+"条======匹配成功 "+b+"条=====耗时=="+(System.currentTimeMillis() - start)/1000 + "秒");
-        return result;
     }
@@ -197,6 +196,7 @@ public class Contrast {
         long start = System.currentTimeMillis();
         List<Map> driverCardList = getDriverCardList();//获取司机信息
         Map<String,List<Scheduling>> schedulingS =saticScheduleTask.getSchedulingS;
+        Map<String,List<Scheduling>> schedulingSSell =saticScheduleTask.getSchedulingSSell;
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         int b=0;//用于计算匹配成功的数量
         for (int i = 0; i < allData.size(); i++) {
@@ -223,6 +223,10 @@ public class Contrast {
                     //通过司机姓名获得进出记录
                     List<Scheduling> schedulingList1=schedulingS.get(personalName);
+                    //没匹配到匹配售票员
+                    if(schedulingList1==null){
+                        schedulingList1=schedulingSSell.get(personalName);
+                    }
                     Scheduling scheduling = null;
@@ -34,6 +34,8 @@
                xl_bm,
                j_gh,
                j_name,
+               s_gh,
+               s_name,
                schedule_date_str,
                xl_dir,
                bc_type,