update...

潘钊
1 parent 0d4dd0dc
Showing 12 changed files with 1089 additions and 6 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/entity/DDYAuthority.java
src/main/java/com/bsth/entity/SchedulePlanInfo.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/repository/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/DDYAuthorityService.java
src/main/java/com/bsth/service/impl/DDYAuthorityServiceImpl.java
src/main/java/com/bsth/ws_server/attendance/AttendanceService.java
src/main/java/com/bsth/ws_server/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/ws_server/attendance/entity/NH_jsy_attendance.java
src/main/java/com/bsth/ws_server/util/WSDataConver.java
 package com.bsth;
  
+import com.bsth.ws_server.attendance.AttendanceServiceSoap;
 import com.bsth.ws_server.park_station.CompanyServiceSoap;
 import com.bsth.ws_server.waybill.LD_ServiceSoap;
 import org.apache.cxf.Bus;
@@ -32,6 +33,10 @@ public class CXFConfig {
         return new LD_ServiceSoap();
     }
  
+    public AttendanceServiceSoap attendanceService(){
+        return new AttendanceServiceSoap();
+    }
+
     @Bean
     public Endpoint companyEndpoint() {
         EndpointImpl endpoint = new EndpointImpl(springBus(), companyService());
@@ -49,6 +54,14 @@ public class CXFConfig {
     }
  
     @Bean
+    public Endpoint attendanceServiceEndpoint() {
+        EndpointImpl endpoint = new EndpointImpl(springBus(), attendanceService());
+        endpoint.publish("/attendanceService");
+        //endpoint.getInInterceptors().add(new AuthInterceptor());
+        return endpoint;
+    }
+
+    @Bean
     public ServletRegistrationBean servletRegistrationBean() {
         ServletRegistrationBean bean = new ServletRegistrationBean(new CXFServlet(), "/webservice/*");
         bean.setLoadOnStartup(0);
+package com.bsth.entity;
+
+/**
+ * 调度员对应的线路权限
+ * Created by panzhao on 2017/3/27.
+ */
+public class DDYAuthority {
+
+    /** 调度员编号 */
+    private String ddy_id;
+
+    /** 可调度的线路编码 ,号分隔多个 */
+    private String idx;
+
+    /**
+     * 调度模式 0: 监控模式  1：主调模式
+     */
+    private int pattern;
+
+    public String getDdy_id() {
+        return ddy_id;
+    }
+
+    public void setDdy_id(String ddy_id) {
+        this.ddy_id = ddy_id;
+    }
+
+    public String getIdx() {
+        return idx;
+    }
+
+    public void setIdx(String idx) {
+        this.idx = idx;
+    }
+
+    public int getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(int pattern) {
+        this.pattern = pattern;
+    }
+}
+package com.bsth.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 计调 计划排班
+ * Created by panzhao on 2017/3/27.
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info")
+public class SchedulePlanInfo implements Serializable {
+
+    /** 主键Id */
+    @Id
+    private Long id;
+
+    /** 排班计划日期 */
+    private Date scheduleDate;
+
+    /** 关联的公司名称 */
+    private String gsName;
+    /** 关联的公司编码 */
+    private String gsBm;
+    /** 关联的分公司名称 */
+    private String fgsName;
+    /** 关联的分公司编码 */
+    private String fgsBm;
+    /** 出场顺序号 */
+    private Integer ccno;
+
+    /** 关联 bsth_c_line 主键，不做mapping */
+    private Integer xl;
+    /** 线路名称 */
+    private String xlName;
+    /** 线路编码 */
+    private String xlBm;
+
+    /** 关联 bsth_c_s_gbi 主键，不做mapping */
+    private Long lp;
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 关联 bsth_c_cars 主键，不做mapping */
+    private Integer cl;
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 当分班的时候，驾驶员会不一样，具体根据规则，还有时刻表决定 */
+    /** 报道时间（格式 HH:mm） */
+    private String bdTime;
+    /** 出场时间（格式 HH:mm） */
+    private String ccTime;
+    /** 关联的驾驶员 bsth_c_personnel 主键，不做mapping */
+    private Integer j;
+    /** 驾驶员工号 */
+    private String jGh;
+    /** 驾驶员名字 */
+    private String jName;
+    /** 关联的售票员 bsth_c_personnel 主键，不做mapping */
+    private Integer s;
+    /** 售票员工号 */
+    private String sGh;
+    /** 售票员名字 */
+    private String sName;
+
+    // 冗余的时刻明细信息，不做mapping
+    /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+    private String xlDir;
+    /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    private Integer qdz;
+    /** 起点站code */
+    private String qdzCode;
+    /** 起点站名字 */
+    private String qdzName;
+    /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
+    private Integer zdz;
+    /** 终点站code */
+    private String zdzCode;
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 发车顺序号 */
+    private Integer fcno;
+    /** 对应班次数 */
+    private Integer bcs;
+    /** 计划里程 */
+    private Double jhlc;
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /** 班次类型 字典type=ScheduleType */
+    private String bcType;
+
+    /** 关联的时刻表id */
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+
+    public Integer getCcno() {
+        return ccno;
+    }
+
+    public void setCcno(Integer ccno) {
+        this.ccno = ccno;
+    }
+
+    public Integer getXl() {
+        return xl;
+    }
+
+    public void setXl(Integer xl) {
+        this.xl = xl;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public Long getLp() {
+        return lp;
+    }
+
+    public void setLp(Long lp) {
+        this.lp = lp;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public Integer getCl() {
+        return cl;
+    }
+
+    public void setCl(Integer cl) {
+        this.cl = cl;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getBdTime() {
+        return bdTime;
+    }
+
+    public void setBdTime(String bdTime) {
+        this.bdTime = bdTime;
+    }
+
+    public String getCcTime() {
+        return ccTime;
+    }
+
+    public void setCcTime(String ccTime) {
+        this.ccTime = ccTime;
+    }
+
+    public Integer getJ() {
+        return j;
+    }
+
+    public void setJ(Integer j) {
+        this.j = j;
+    }
+
+    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 Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
+    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 getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public Integer getQdz() {
+        return qdz;
+    }
+
+    public void setQdz(Integer qdz) {
+        this.qdz = qdz;
+    }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public Integer getZdz() {
+        return zdz;
+    }
+
+    public void setZdz(Integer zdz) {
+        this.zdz = zdz;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Integer getFcno() {
+        return fcno;
+    }
+
+    public void setFcno(Integer fcno) {
+        this.fcno = fcno;
+    }
+
+    public Integer getBcs() {
+        return bcs;
+    }
+
+    public void setBcs(Integer bcs) {
+        this.bcs = bcs;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+}
+package com.bsth.redis;
+
+import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.repository.SchedulePlanInfoRepository;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.ConvertUtil;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.DateTime;
+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.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ *  计调的 计划排班redis缓存
+ * Created by panzhao on 2017/3/27.
+ */
+@Service
+@Order(6)
+public class PlanScheduleRedisService implements CommandLineRunner {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    SchedulePlanInfoRepository planInfoRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private final static String REDIS_KEY_PREFIX = "plan:";
+
+    /**
+     * 将一批计划写入redis
+     *
+     * @param list
+     */
+    public void wirte(List<SchedulePlanInfo> list) {
+        ArrayListMultimap<String, SchedulePlanInfo> multimap;
+        try {
+            if (list.size() == 0)
+                return;
+            //按日期和线路分组数据
+            Class clazz = SchedulePlanInfo.class;
+            multimap = new ConvertUtil().groupMultiList(list, ":", clazz.getDeclaredField("xlBm"), clazz.getDeclaredField("scheduleDate"));
+
+            //写入redis
+            Iterator<String> iterator = multimap.keySet().iterator();
+            String key;
+            while (iterator.hasNext()) {
+                key = iterator.next();
+                mergeData(key, multimap.get(key));
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 将 list 与redis里的数据合并
+     *
+     * @param key
+     * @param list
+     */
+    public void mergeData(String key, List<SchedulePlanInfo> list) {
+        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
+
+        ListOperations<String, SchedulePlanInfo> ops = redisTemplate.opsForList();
+        List<SchedulePlanInfo> cacheList = ops.range(key, 0, -1);
+
+        for (SchedulePlanInfo plan : cacheList) {
+            if (!list.contains(plan))
+                list.add(plan);
+        }
+        //删除redis数据
+        redisTemplate.delete(key);
+        //重新写入
+        ops.leftPushAll(key, list);
+    }
+
+    /**
+     * 根据日期和线路编码从redis获取计划
+     *
+     * @param dateStr
+     * @param lineCode
+     * @return
+     */
+    public List<SchedulePlanInfo> read(String dateStr, String lineCode) {
+        return redisTemplate.opsForList().range(REDIS_KEY_PREFIX + lineCode + ":" + dateStr, 0, -1);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+        //设置key 序列化器
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+
+        DateTime dt = new DateTime();
+        dt = dt.minusDays(cacheDays);
+        dt = dt.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).minusDays(cacheDays);
+        List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(dt.toDate(), new Date());
+
+        //写入redis
+        wirte(list);
+    }
+
+    public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
+        rq = rq.replaceAll("-", "");
+        List<SchedulePlanInfo> rs = new ArrayList<>();
+        for(String lineCode : lineArray){
+            rs.addAll(read(rq, lineCode));
+        }
+        return rs;
+    }
+}
@@ -17,6 +17,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Service;
  
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
  
@@ -84,7 +85,7 @@ public class ScheduleRedisService implements CommandLineRunner {
                 list.add(sch);
         }
         //删除redis数据
-        redisTemplate.delete(key);
+         redisTemplate.delete(key);
         //重新写入
         ops.leftPushAll(key, list);
     }
@@ -183,4 +184,13 @@ public class ScheduleRedisService implements CommandLineRunner {
         //写入redis
         wirte(list);
     }
+
+    public List<ScheduleRealInfo> findByMultiLine(List<String> lineArray, String rq) {
+        rq = rq.replaceAll("-", "");
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+        for(String lineCode : lineArray){
+            rs.addAll(read(rq, lineCode));
+        }
+        return rs;
+    }
 }
+package com.bsth.repository;
+
+import com.bsth.entity.SchedulePlanInfo;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Repository
+public interface SchedulePlanInfoRepository extends PagingAndSortingRepository<SchedulePlanInfo, Long> {
+
+
+    /**
+     * 获取大于指定日期的班次信息
+     * @param schDate
+     * @return
+     */
+    @Query("select s from SchedulePlanInfo s where s.scheduleDate>?1 and s.scheduleDate<=?2")
+    List<SchedulePlanInfo> findByDateRange(Date s, Date e);
+}
+package com.bsth.service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+public interface DDYAuthorityService {
+
+    /**
+     * 获取调度员分管的线路集合
+     * @param ddy_id
+     * @return
+     */
+    List<String> findLinesByDDY(String ddy_id);
+
+    /**
+     * 根据驾驶员工号获取班型
+     * @param jGh
+     * @return
+     */
+    String findPlanType(String jGh);
+
+
+    public void loadPlanTypes();
+
+    Map<String,String> findMultiType(Set<String> jsySet);
+}
+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.ws_server.attendance;
+
+import com.bsth.ws_server.attendance.entity.NH_jsy_attendance;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+
+/**
+ * 考勤相关数据接口
+ * Created by panzhao on 2017/3/27.
+ */
+@WebService(
+        name = "AttendanceServiceSoap",
+        targetNamespace = "http://control.bsth.com/")
+public interface AttendanceService {
+
+    /**
+     * 驾驶员考勤信息
+     * @param password
+     * @param rq
+     * @param ddy_id 调度员ID
+     * @param result
+     * @param fError
+     * @return
+     */
+    boolean jsy_attendance_NH(
+            @WebParam(name = "password") String password,
+            @WebParam(name = "rq") String rq,
+            @WebParam(name = "ddy_id") String ddy_id,
+            @WebParam(name = "resultArray", mode = WebParam.Mode.INOUT) Holder<NH_jsy_attendance[]> result,
+            @WebParam(name = "fError", mode = WebParam.Mode.INOUT) Holder<String> fError);
+}
+package com.bsth.ws_server.attendance;
+
+import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.redis.PlanScheduleRedisService;
+import com.bsth.redis.ScheduleRedisService;
+import com.bsth.service.DDYAuthorityService;
+import com.bsth.service.UserService;
+import com.bsth.ws_server.attendance.entity.NH_jsy_attendance;
+import com.bsth.ws_server.util.WSDataConver;
+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.
+ */
+@Component
+@WebService(
+        name = "AttendanceServiceSoap",
+        portName = "AttendanceServiceSoap",
+        serviceName = "AttendanceService",
+        targetNamespace = "http://control.bsth.com/",
+        endpointInterface = "com.bsth.ws_server.attendance.AttendanceService")
+public class AttendanceServiceSoap implements AttendanceService, ApplicationContextAware {
+
+    Logger logger = org.slf4j.LoggerFactory.getLogger(this.getClass());
+
+    static DDYAuthorityService ddyAuthorityService;
+    static PlanScheduleRedisService planScheduleRedisService;
+    static ScheduleRedisService scheduleRedisService;
+
+    static UserService userService;
+
+    @Override
+    public boolean jsy_attendance_NH(String password, String rq, String ddy_id, Holder<NH_jsy_attendance[]> result, Holder<String> fError) {
+        try {
+            if(userService.get(password) == null){
+                fError.value = "无效的密码！";
+                return false;
+            }
+
+            //该调度员分管的线路
+            List<String> lineArray = ddyAuthorityService.findLinesByDDY(ddy_id);
+            //计划排班
+            List<SchedulePlanInfo> plans = planScheduleRedisService.findByMultiLine(lineArray, rq);
+            //实际排班
+            List<ScheduleRealInfo> reals = scheduleRedisService.findByMultiLine(lineArray, rq);
+            //从计划和实际里提取出驾驶员
+            Set<String> jsySet = extractJsy(plans, reals);
+            //驾驶员班型对照
+            Map<String, String> types = ddyAuthorityService.findMultiType(jsySet);
+
+            //转换成工资系统想要的数据
+            result.value = WSDataConver.to_jsyAttendanceNH(plans, reals, types, rq);
+        }catch (Exception e){
+            logger.error("", e);
+            fError.value = "服务器出现异常！";
+            return false;
+        }
+        return true;
+    }
+
+
+    private Set<String> extractJsy(List<SchedulePlanInfo> plans, List<ScheduleRealInfo> reals) {
+        Set<String> rs = new HashSet<>();
+        for (SchedulePlanInfo plan : plans) {
+            rs.add(plan.getjGh());
+        }
+
+        for (ScheduleRealInfo sch : reals) {
+            rs.add(sch.getjGh());
+        }
+        return rs;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        ddyAuthorityService = applicationContext.getBean(DDYAuthorityService.class);
+        planScheduleRedisService = applicationContext.getBean(PlanScheduleRedisService.class);
+        scheduleRedisService = applicationContext.getBean(ScheduleRedisService.class);
+        userService = applicationContext.getBean(UserService.class);
+    }
+}
+package com.bsth.ws_server.attendance.entity;
+
+/**
+ * 南汇驾驶员考勤
+ * Created by panzhao on 2017/3/27.
+ */
+public class NH_jsy_attendance {
+
+    /** 日期 */
+    private String rq;
+
+    /** 线路编码 */
+    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;
+
+    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;
+    }
+}
@@ -2,9 +2,11 @@ package com.bsth.ws_server.util;
  
 import com.bsth.entity.DutyEmployee;
 import com.bsth.entity.OilInfo;
+import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.util.Arith;
 import com.bsth.util.ConvertUtil;
+import com.bsth.ws_server.attendance.entity.NH_jsy_attendance;
 import com.bsth.ws_server.waybill.entity.*;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
@@ -288,7 +290,7 @@ public class WSDataConver {
  
             //根据车辆获取油量信息
             oilArray = likeGet(oilInfoMap, sch.getClZbh() + "_");
-            if(oilArray.size() > 0){
+            if (oilArray.size() > 0) {
                 Collections.sort(oilArray, oilComp);
                 //出厂存油
                 sn_waybill.setOut_oil(oilArray.get(0).getCzyl());
@@ -344,6 +346,7 @@ public class WSDataConver {
  
     /**
      * 将实际排班转换成上南需要损失公里数据
+     *
      * @param listMap
      * @return
      */
@@ -439,7 +442,7 @@ public class WSDataConver {
  
     private static double countOilExpend(List<OilInfo> oilArray) {
         double sum = 0;
-        for(OilInfo oilInfo : oilArray){
+        for (OilInfo oilInfo : oilArray) {
             sum = Arith.add(sum, oilInfo.getYh());
         }
         return sum;
@@ -447,8 +450,8 @@ public class WSDataConver {
  
     private static double countOilExpend(List<OilInfo> oilArray, String jGh) {
         double sum = 0;
-        for(OilInfo oilInfo : oilArray){
-            if(oilInfo.getJsy().equals(jGh))
+        for (OilInfo oilInfo : oilArray) {
+            if (oilInfo.getJsy().equals(jGh))
                 sum = Arith.add(sum, oilInfo.getYh());
         }
         return sum;
@@ -469,7 +472,77 @@ public class WSDataConver {
         return list;
     }
  
-    public static class OilComp implements Comparator<OilInfo>{
+    /**
+     * 将数据转换成南汇工资系统需要的驾驶员考勤数据
+     *
+     * @param plans
+     * @param reals
+     * @param types
+     * @return
+     */
+    public static NH_jsy_attendance[] to_jsyAttendanceNH(List<SchedulePlanInfo> plans, List<ScheduleRealInfo> reals, Map<String, String> types, String rq) {
+        List<String> ghArray = new ArrayList<>(types.keySet());
+        NH_jsy_attendance[] rs = new NH_jsy_attendance[ghArray.size()];
+
+        NH_jsy_attendance attendance;
+        SchedulePlanInfo plan;
+        ScheduleRealInfo real;
+        String jGh;
+        for(int i = 0; i < ghArray.size(); i ++){
+            jGh = ghArray.get(i);
+
+            attendance = new NH_jsy_attendance();
+            attendance.setRq(rq);
+            //计划
+            plan = searchByJsy(plans, jGh);
+            //实际
+            real = searchRealByJsy(reals, jGh);
+            //考勤
+            attendance.setStatus((plan==null?"0":"1") + "," + (real==null?"0":"1"));
+            //班型
+            attendance.setPlanType(types.get(jGh)==null?"1":types.get(jGh));
+            //驾驶员工号
+            attendance.setjGh(jGh);
+
+            if(real != null){
+                attendance.setXlBm(real.getXlBm());
+                attendance.setXlName(real.getXlName());
+                attendance.setjName(real.getjName());
+                attendance.setsGh(real.getsGh());
+                attendance.setsName(real.getsName());
+            }
+            else if(plan != null){
+                attendance.setXlBm(plan.getXlBm());
+                attendance.setXlName(plan.getXlName());
+                attendance.setjName(plan.getjName());
+                attendance.setsGh(plan.getsGh());
+                attendance.setsName(plan.getsName());
+            }
+
+            rs[i] = attendance;
+        }
+        return rs;
+    }
+
+    public static SchedulePlanInfo searchByJsy(List<SchedulePlanInfo> plans, String jGh){
+
+        for(SchedulePlanInfo plan : plans){
+            if(plan.getjGh().equals(jGh))
+                return plan;
+        }
+        return null;
+    }
+
+    public static ScheduleRealInfo searchRealByJsy(List<ScheduleRealInfo> reals, String jGh){
+
+        for(ScheduleRealInfo sch : reals){
+            if(sch.getjGh().equals(jGh))
+                return sch;
+        }
+        return null;
+    }
+
+    public static class OilComp implements Comparator<OilInfo> {
  
         @Override
         public int compare(OilInfo o1, OilInfo o2) {