早晚班类型，和人车配置

潘钊
1 parent d4dbb074
Showing 4 changed files with 243 additions and 3 deletions
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleCcInfoConfig.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/java/com/bsth/server_ws/attendance/entity/Jsy_attendance.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
+package com.bsth.server_rs.schedule.dto;
+
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.util.ConvertUtil;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 实际排班的人车配置信息
+ * Created by panzhao on 2017/11/8.
+ */
+public class ScheduleCcInfoConfig {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public static List<ScheduleCcInfoConfig> getMultiInstance(List<ScheduleRealInfo> list) {
+        List<ScheduleCcInfoConfig> rs = new ArrayList<>();
+        //按人车分组
+        Class clazz = ScheduleRealInfo.class;
+        try {
+            ArrayListMultimap<String, ScheduleRealInfo> multimap =
+                    new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, ",", clazz.getDeclaredField("jGh"), clazz.getDeclaredField("clZbh"));
+
+            ScheduleCcInfoConfig cc ;
+            Set<String> ks = multimap.keySet();
+            ScheduleRealInfo sch;
+            for(String k : ks){
+                sch = multimap.get(k).get(0);
+
+                cc = new ScheduleCcInfoConfig();
+                cc.setJsy(sch.getjGh() + "/" + sch.getjName());
+                cc.setClZhb(sch.getClZbh());
+                cc.setLineCode(sch.getXlBm());
+                cc.setLineName(sch.getXlName());
+                cc.setGsBm(sch.getGsBm());
+                cc.setFgsBm(sch.getFgsBm());
+
+                rs.add(cc);
+            }
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        return rs;
+    }
+
+    private String jsy;
+
+    private String clZhb;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String fgsBm;
+
+    private String gsBm;
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public String getClZhb() {
+        return clZhb;
+    }
+
+    public void setClZhb(String clZhb) {
+        this.clZhb = clZhb;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+}
@@ -4,6 +4,7 @@ import com.bsth.common.BasicData;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
 import org.slf4j.Logger;
@@ -54,6 +55,24 @@ public class ScheduleRealService {
     }
  
     /**
+     * 获取指定日期，指定公司的人员车辆配置情况（实际排班）
+     * @param code
+     * @param rq
+     * @return
+     */
+    @GET
+    @Path("/ccConfig/{code}/{rq}")
+    public List<ScheduleCcInfoConfig> ccInfoConfig(@PathParam("code") String code, @PathParam("rq") String rq){
+        Set<String> lineArray = BasicData.lineDateMap.keySet();
+
+        List<ScheduleCcInfoConfig> all = new ArrayList<>();
+        for (String lineCode : lineArray) {
+            all.addAll(ScheduleCcInfoConfig.getMultiInstance(redisService.read(rq, lineCode)));
+        }
+        return all;
+    }
+
+    /**
      * 获取当天指定停车场的进出场排班数据（潘钊场站VIP特供版 -高实时）
      *
      * @return
 package com.bsth.server_ws.attendance.entity;
  
+import com.bsth.entity.ScheduleRealInfo;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 /**
  * 南汇驾驶员考勤
  * Created by panzhao on 2017/3/27.
@@ -44,6 +50,63 @@ public class Jsy_attendance {
      */
     private String status;
  
+    /**
+     * 路牌
+     */
+    private String lpNames;
+
+    /** 车辆 */
+    private String cls;
+
+    /**
+     * 早夜班类型
+     *
+     *  早班：上班时间五点之前；
+     *  中班：下班时间为22点之后到24点之间；
+     *  晚班：下班时间24点之后为深夜班
+     *
+     *  1、早班
+        2、中班
+        3、晚班
+        4、早中班
+        5、早晚班
+     */
+    private int zybType;
+
+
+    public void calcZybType(List<ScheduleRealInfo> list){
+        ScheduleRealInfo s,e;
+        Collections.sort(list, new Comparator<ScheduleRealInfo>() {
+            @Override
+            public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+                return (int) (o1.getFcsjT() - o2.getFcsjT());
+            }
+        });
+
+        s = list.get(0);
+        e = list.get(list.size() - 1);
+
+        if(s.getFcsj().compareTo("05:00") <= 0)
+            this.zybType=1;//早班
+        else if(e.getZdsj().compareTo("05:00") > 0)
+            this.zybType=2;//中班
+        else if(e.getZdsj().compareTo("05:00") < 0)
+            this.zybType=3;//晚班
+
+        //早中班
+        if(this.zybType==1 && e.getZdsj().compareTo("22:00") >=0 && e.getZdsj().compareTo("23:59") <= 0){
+            this.zybType = 4;
+        }
+
+        //早晚班
+        if(this.zybType==1 && e.getZdsj().compareTo(s.getFcsj()) < 0){
+            this.zybType = 5;
+        }
+    }
+
+    public Jsy_attendance() {
+    }
+
     public String getRq() {
         return rq;
     }
@@ -131,4 +194,45 @@ public class Jsy_attendance {
     public void setFgsCompany(String fgsCompany) {
         this.fgsCompany = fgsCompany;
     }
+
+    public String getLpNames() {
+        return lpNames;
+    }
+
+    public void setLpNames(String lpNames) {
+        this.lpNames = lpNames;
+    }
+
+    public String getCls() {
+        return cls;
+    }
+
+    public void setCls(String cls) {
+        this.cls = cls;
+    }
+
+    public void addLpName(String name){
+        if(null==this.lpNames)
+            this.lpNames="";
+        else
+            this.lpNames+=",";
+        this.lpNames+=name;
+    }
+
+    public void addCl(String nbbm){
+        if(null==this.cls)
+            this.cls="";
+        else
+            this.cls+=",";
+
+        this.cls+=nbbm;
+    }
+
+    public int getZybType() {
+        return zybType;
+    }
+
+    public void setZybType(int zybType) {
+        this.zybType = zybType;
+    }
 }
@@ -548,9 +548,6 @@ public class WSDataConver {
  
         int i = 0;
         for(String jGh : jsySet){
-        //for(int i = 0; i < ghArray.size(); i ++){
-            //jGh = ghArray.get(i);
-
             attendance = new Jsy_attendance();
             attendance.setRq(rq);
             //计划
@@ -563,7 +560,10 @@ public class WSDataConver {
             attendance.setPlanType(types.get(jGh)==null?"1":types.get(jGh));
             //驾驶员工号
             attendance.setjGh(jGh);
+            //早晚班类型
+            attendance.calcZybType(reals);
  
+            //实际计划
             if(real != null){
                 attendance.setXlBm(real.getXlBm());
                 attendance.setXlName(real.getXlName());
@@ -572,7 +572,10 @@ public class WSDataConver {
                 attendance.setsName(real.getsName());
                 attendance.setCompany(real.getGsBm());
                 attendance.setFgsCompany(real.getFgsBm());
+                attendance.addLpName(real.getLpName());
+                attendance.addCl(real.getClZbh());
             }
+            //计划
             else if(plan != null){
                 attendance.setXlBm(plan.getXlBm());
                 attendance.setXlName(plan.getXlName());
@@ -581,6 +584,8 @@ public class WSDataConver {
                 attendance.setsName(plan.getsName());
                 attendance.setCompany(plan.getGsBm());
                 attendance.setFgsCompany(plan.getFgsBm());
+                attendance.addLpName(plan.getLpName());
+                attendance.addCl(plan.getClZbh());
             }
  
             rs[i] = attendance;
@@ -614,4 +619,6 @@ public class WSDataConver {
             return o1.getJcsx() - o2.getJcsx();
         }
     }
+
+
 }