1.青浦和浦东有差异，修正

王通
1 parent ab560d75
Showing 4 changed files with 393 additions and 382 deletions
src/main/java/com/bsth/server_ws/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/server_ws/attendance/entity/Jsy_attendance.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
src/main/java/com/bsth/service/impl/DDYAuthorityServiceImpl.java
 package com.bsth.server_ws.attendance;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
 import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.PlanScheduleRedisService;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
-import com.bsth.server_ws.attendance.entity.Ssry_attendance;
 import com.bsth.server_ws.attendance.entity.Jsy_attendance;
+import com.bsth.server_ws.attendance.entity.Ssry_attendance;
 import com.bsth.server_ws.util.WSDataConver;
 import com.bsth.service.DDYAuthorityService;
 import com.bsth.service.UserService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Created by panzhao on 2017/3/27.
  */
@@ -62,7 +64,8 @@ public class AttendanceServiceSoap implements AttendanceService, ApplicationCont
             //从计划和实际里提取出驾驶员
             Set<String> jsySet = extractJsy(plans, reals);
             //驾驶员班型对照
-            Map<String, String> types = ddyAuthorityService.findMultiType(jsySet);
+            //Map<String, String> types = ddyAuthorityService.findMultiType(jsySet);
+            Map<String, String> types = new HashMap<String, String>();
             //转换成工资系统想要的数据
             result.value = WSDataConver.to_jsyAttendanceNH(plans, reals, jsySet, types, rq);
-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.
- */
-public class Jsy_attendance {
-
-    /** 日期 */
-    private String rq;
-
-    /** 公司编码 */
-    private String company;
-
-    /** 分公司编码 */
-    private String fgsCompany;
-
-    /** 线路编码 */
-    private String xlBm;
-
-    /** 线路名称 */
-    private String xlName;
-
-    /** 驾驶员工号 */
-    private String jGh;
-
-    /** 驾驶员名称 */
-    private String jName;
-
-    /** 售票员工号 */
-    private String sGh;
-
-    /** 售票员名称 */
-    private String sName;
-
-    /** 班型 */
-    private String planType;
-
-    /**
-     * 出勤状态 应出,实出
-     * 1,0 应出未出
-     * 1,1 应出实出
-     * 0,1 无计划，临加出勤
-     */
-    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;
-    }
-
-    public void setRq(String rq) {
-        this.rq = rq;
-    }
-
-    public String getXlBm() {
-        return xlBm;
-    }
-
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getjGh() {
-        return jGh;
-    }
-
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
-    }
-
-    public String getjName() {
-        return jName;
-    }
-
-    public void setjName(String jName) {
-        this.jName = jName;
-    }
-
-    public String getsGh() {
-        return sGh;
-    }
-
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
-    }
-
-    public String getsName() {
-        return sName;
-    }
-
-    public void setsName(String sName) {
-        this.sName = sName;
-    }
-
-    public String getPlanType() {
-        return planType;
-    }
-
-    public void setPlanType(String planType) {
-        this.planType = planType;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getFgsCompany() {
-        return fgsCompany;
-    }
-
-    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;
-    }
-}
+package com.bsth.server_ws.attendance.entity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import com.bsth.entity.ScheduleRealInfo;
+
+/**
+ * 南汇驾驶员考勤
+ * Created by panzhao on 2017/3/27.
+ */
+public class Jsy_attendance {
+
+    /** 日期 */
+    private String rq;
+
+    /** 公司编码 */
+    private String company;
+
+    /** 分公司编码 */
+    private String fgsCompany;
+
+    /** 线路编码 */
+    private String xlBm;
+
+    /** 线路名称 */
+    private String xlName;
+
+    /** 驾驶员工号 */
+    private String jGh;
+
+    /** 驾驶员名称 */
+    private String jName;
+
+    /** 售票员工号 */
+    private String sGh;
+
+    /** 售票员名称 */
+    private String sName;
+
+    /** 班型 */
+    private String planType;
+
+    /**
+     * 出勤状态 应出,实出
+     * 1,0 应出未出
+     * 1,1 应出实出
+     * 0,1 无计划，临加出勤
+     */
+    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;
+        List<ScheduleRealInfo> temp = new ArrayList<ScheduleRealInfo>();
+        for (ScheduleRealInfo sri : list) {
+        	if (sri.getFcsjT() != null) {
+        		temp.add(sri);
+        	}
+        }
+        Collections.sort(temp, 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;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getPlanType() {
+        return planType;
+    }
+
+    public void setPlanType(String planType) {
+        this.planType = planType;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getFgsCompany() {
+        return fgsCompany;
+    }
+
+    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;
+    }
+}
@@ -757,7 +757,7 @@ public class WSDataConver {
     			//考勤
                 attendance.setStatus((plan==null?"0":"1") + "," + (real==null?"0":"1"));
                 //班型
-                attendance.setPlanType(types.get(jGh)==null?"1":types.get(jGh));
+                attendance.setPlanType("1");
                 //驾驶员工号
                 attendance.setjGh(jGh);
                 //早晚班类型
-package com.bsth.service.impl;
-
-import com.bsth.Application;
-import com.bsth.service.DDYAuthorityService;
-import com.google.common.base.Splitter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by panzhao on 2017/3/27.
- */
-@Service
-@Order(5)
-public class DDYAuthorityServiceImpl implements DDYAuthorityService, CommandLineRunner {
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    /**
-     * 驾驶员班型对照
-     * 1: 做1休1
-     * 1,1,1,1,1,0,0  : 做5休2
-     */
-    static Map<String, String> planTypesMap;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public List<String> findLinesByDDY(String ddy_id) {
-        List<String> rs;
-        try {
-            Map<String, Object> map = jdbcTemplate.queryForMap("select LINE_CODE_STR from bsth_c_real_control_authority a left join bsth_c_sys_user u on a.user_id=u.id where u.user_name=?", ddy_id);
-            String idx = map.get("LINE_CODE_STR").toString();
-
-            rs = Splitter.on(",").trimResults().splitToList(idx);
-        }catch (Exception e){
-            logger.error("", e);
-            rs = new ArrayList<>();
-        }
-        return rs;
-    }
-
-    @Override
-    public String findPlanType(String jGh) {
-        return planTypesMap.get(jGh);
-    }
-
-    /**
-     * 加载驾驶员班型数据
-     */
-    @Override
-    public void loadPlanTypes(){
-        Map<String, String> rsMap = new HashMap<>();
-        //线路_搭班编码 ——> 班型
-        Map<String, String> ddbm2bxMap = new HashMap<>();
-        List<Map<String, Object>> listMap = jdbcTemplate.queryForList("select IFNULL(FBGS, '1') as FBGS, RY_DBBMS, XL from bsth_c_s_sr1_flat where ry_dbbms is not null and xl is not null");
-        List<String> fbList, dbList;
-        String xl, fbgs;
-        for(Map<String, Object> map : listMap){
-            xl = map.get("XL").toString();
-            fbgs = map.get("FBGS").toString();
-            //拆分分班
-            fbList = Splitter.on("-").trimResults().splitToList(map.get("RY_DBBMS").toString());
-            for(String fb : fbList){
-                //拆分搭班编码
-                dbList = Splitter.on(",").trimResults().splitToList(fb);
-
-                for(String db : dbList)
-                    ddbm2bxMap.put(xl + "_" + db, fbgs);
-            }
-        }
-
-        //线路_搭班编码 ——> 驾驶员
-        Map<String, String> ddbm2jsyMap = new HashMap<>();
-        listMap = jdbcTemplate.queryForList("select ec.DBBM,ec.XL,p.JOB_CODE from bsth_c_s_ecinfo ec LEFT JOIN bsth_c_personnel p on ec.jsy=p.id where ec.dbbm is not null and ec.xl is not null and p.job_code is not null");
-        for(Map<String, Object> map : listMap){
-            ddbm2jsyMap.put(map.get("XL") + "_" + map.get("DBBM"), map.get("JOB_CODE").toString());
-        }
-
-        Set<String> dbms = ddbm2jsyMap.keySet();
-        for(String bm : dbms){
-            if(ddbm2bxMap.containsKey(bm))
-                rsMap.put(ddbm2jsyMap.get(bm), ddbm2bxMap.get(bm));
-        }
-        planTypesMap = rsMap;
-    }
-
-    @Override
-    public Map<String, String> findMultiType(Set<String> jsySet) {
-        Map<String, String> rs = new HashMap<>();
-        for(String jGh: jsySet){
-            rs.put(jGh, planTypesMap.get(jGh));
-        }
-        return rs;
-    }
-
-
-    @Autowired
-    RefreshPlanTypesThread refreshPlanTypesThread;
-
-    @Override
-    public void run(String... strings) throws Exception {
-        //加载驾驶员班型数据
-        Application.mainServices.scheduleWithFixedDelay(refreshPlanTypesThread, 30, 60 * 120, TimeUnit.SECONDS);
-    }
-
-    @Component
-    public static class RefreshPlanTypesThread extends Thread{
-
-        @Autowired
-        DDYAuthorityService ddyAuthorityService;
-
-        @Override
-        public void run() {
-            ddyAuthorityService.loadPlanTypes();
-        }
-    }
-}
+package com.bsth.service.impl;
+
+import com.bsth.Application;
+import com.bsth.service.DDYAuthorityService;
+import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Service
+@Order(5)
+public class DDYAuthorityServiceImpl implements DDYAuthorityService, CommandLineRunner {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    /**
+     * 驾驶员班型对照
+     * 1: 做1休1
+     * 1,1,1,1,1,0,0  : 做5休2
+     */
+    static Map<String, String> planTypesMap;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public List<String> findLinesByDDY(String ddy_id) {
+        List<String> rs;
+        try {
+            Map<String, Object> map = jdbcTemplate.queryForMap("select LINE_CODE_STR from bsth_c_real_control_authority a left join bsth_c_sys_user u on a.user_id=u.id where u.user_name=?", ddy_id);
+            String idx = map.get("LINE_CODE_STR").toString();
+
+            rs = Splitter.on(",").trimResults().splitToList(idx);
+        }catch (Exception e){
+            logger.error("", e);
+            rs = new ArrayList<>();
+        }
+        return rs;
+    }
+
+    @Override
+    public String findPlanType(String jGh) {
+        return planTypesMap.get(jGh);
+    }
+
+    /**
+     * 加载驾驶员班型数据
+     */
+    @Override
+    public void loadPlanTypes(){
+        Map<String, String> rsMap = new HashMap<>();
+        //线路_搭班编码 ——> 班型
+        Map<String, String> ddbm2bxMap = new HashMap<>();
+        List<Map<String, Object>> listMap = jdbcTemplate.queryForList("select IFNULL(FBGS, '1') as FBGS, RY_DBBMS, XL from bsth_c_s_sr1_flat where ry_dbbms is not null and xl is not null");
+        List<String> fbList, dbList;
+        String xl, fbgs;
+        for(Map<String, Object> map : listMap){
+            xl = map.get("XL").toString();
+            fbgs = map.get("FBGS").toString();
+            //拆分分班
+            fbList = Splitter.on("-").trimResults().splitToList(map.get("RY_DBBMS").toString());
+            for(String fb : fbList){
+                //拆分搭班编码
+                dbList = Splitter.on(",").trimResults().splitToList(fb);
+
+                for(String db : dbList)
+                    ddbm2bxMap.put(xl + "_" + db, fbgs);
+            }
+        }
+
+        //线路_搭班编码 ——> 驾驶员
+        Map<String, String> ddbm2jsyMap = new HashMap<>();
+        listMap = jdbcTemplate.queryForList("select ec.DBBM,ec.XL,p.JOB_CODE from bsth_c_s_ecinfo ec LEFT JOIN bsth_c_personnel p on ec.jsy=p.id where ec.dbbm is not null and ec.xl is not null and p.job_code is not null");
+        for(Map<String, Object> map : listMap){
+            ddbm2jsyMap.put(map.get("XL") + "_" + map.get("DBBM"), map.get("JOB_CODE").toString());
+        }
+
+        Set<String> dbms = ddbm2jsyMap.keySet();
+        for(String bm : dbms){
+            if(ddbm2bxMap.containsKey(bm))
+                rsMap.put(ddbm2jsyMap.get(bm), ddbm2bxMap.get(bm));
+        }
+        planTypesMap = rsMap;
+    }
+
+    @Override
+    public Map<String, String> findMultiType(Set<String> jsySet) {
+        Map<String, String> rs = new HashMap<>();
+        for(String jGh: jsySet){
+        	System.out.println(jGh + " " + planTypesMap.get(jGh));
+            rs.put(jGh, planTypesMap.get(jGh));
+        }
+        return rs;
+    }
+
+
+    @Autowired
+    RefreshPlanTypesThread refreshPlanTypesThread;
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //加载驾驶员班型数据
+        Application.mainServices.scheduleWithFixedDelay(refreshPlanTypesThread, 30, 60 * 120, TimeUnit.SECONDS);
+    }
+
+    @Component
+    public static class RefreshPlanTypesThread extends Thread{
+
+        @Autowired
+        DDYAuthorityService ddyAuthorityService;
+
+        @Override
+        public void run() {
+            ddyAuthorityService.loadPlanTypes();
+        }
+    }
+}