update...

潘钊
1 parent 3b394d44
Showing 14 changed files with 938 additions and 163 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/common/BasicData.java
src/main/java/com/bsth/server_rs/base_info/section/LD_SectionRestService.java
src/main/java/com/bsth/server_rs/base_info/section/buffer/LD_SectionBufferData.java
src/main/java/com/bsth/server_rs/base_info/section/buffer/LD_SectionRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/section/entity/LD_Section.java
src/main/java/com/bsth/server_rs/base_info/section/entity/LD_SectionRoute.java
src/main/java/com/bsth/server_rs/base_info/station/buffer/StationRefreshThread.java
src/main/java/com/bsth/server_rs/schedule/dto/AttendancePlanDay.java
src/main/java/com/bsth/server_rs/schedule/dto/AttendancePlanMonth.java
src/main/java/com/bsth/server_rs/schedule/dto/PlanScheduleDTO_JK.java
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleInOut.java
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleRealInfoDTO_JK.java
src/main/java/com/bsth/server_rs/schedule/plan/SchedulePlanService.java
@@ -4,9 +4,11 @@ import com.bsth.server_rs.AuthorizeInterceptor_IN;
 import com.bsth.server_rs.base_info.car.CarRestService;
 import com.bsth.server_rs.base_info.line.LineRestService;
 import com.bsth.server_rs.base_info.person.PersonRestService;
+import com.bsth.server_rs.base_info.section.LD_SectionRestService;
 import com.bsth.server_rs.base_info.station.StationRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
+import com.bsth.server_rs.schedule.plan.SchedulePlanService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
 import com.bsth.server_ws.attendance.AttendanceServiceSoap;
 import com.bsth.server_ws.park_station.CompanyServiceSoap;
@@ -73,9 +75,12 @@ public class CXFConfig {
     @Autowired
     ScheduleRealService scheduleRealService;
-
     @Autowired
     StationRestService stationRestService;
+    @Autowired
+    LD_SectionRestService ldSectionRestService;
+    @Autowired
+    SchedulePlanService schedulePlanService;
     @Bean
     public Server rsServer() {
@@ -88,7 +93,9 @@ public class CXFConfig {
                 new PersonRestService(),
                 new GpsRestService(),
                 scheduleRealService,
-                stationRestService));
+                stationRestService,
+                ldSectionRestService,
+                schedulePlanService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -69,7 +69,7 @@ public class BasicData implements CommandLineRunner {
         }
         private String calcScheduleDate(String startDate){
-            return "20170828";
+            return "20170831";
         }
     }
 }
+package com.bsth.server_rs.base_info.section;
+
+import com.bsth.server_rs.base_info.section.buffer.LD_SectionBufferData;
+import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/9/1.
+ */
+
+@Component
+@Path("/ld_section")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class LD_SectionRestService {
+
+    @GET
+    @Path("/{company}")
+    public Map<String, Collection<LD_SectionRoute>> findByCompany(@PathParam("company") String company){
+        return LD_SectionBufferData.findRouteByCompany(company);
+    }
+}
+package com.bsth.server_rs.base_info.section.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.base_info.section.entity.LD_Section;
+import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 站点数据缓存（自更新）
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+@Order(6)
+public class LD_SectionBufferData implements CommandLineRunner {
+
+
+    private static List<LD_Section> data;
+    private static Map<String, LD_Section> codeMap;
+
+    @Autowired
+    LD_SectionRefreshThread ld_sectionRefreshThread;
+
+    /**
+        路由缓存
+        线路编码_上下行 ——> 路由集合
+     */
+    private static ArrayListMultimap<String, LD_SectionRoute> routeListMap;
+
+
+    public static List<LD_Section> findAll(){
+        return data;
+    }
+
+    public static Map<String, Collection<LD_SectionRoute>> findAllRoute(){
+        return routeListMap.asMap();
+    }
+
+    public static LD_Section findOne(String code){
+        return codeMap.get(code);
+    }
+
+    public static void replaceAll(List<LD_Section> newData){
+        data = newData;
+        Map<String, LD_Section> codeMapCopy = new HashMap<>();
+        for(LD_Section section : data){
+            codeMapCopy.put(section.getSectionCode(), section);
+        }
+
+        codeMap = codeMapCopy;
+    }
+
+    public static void replaceRoutes(List<LD_SectionRoute> list){
+        Collections.sort(list, new Comparator<LD_SectionRoute>() {
+            @Override
+            public int compare(LD_SectionRoute o1, LD_SectionRoute o2) {
+                return o1.getSectionrouteCode().compareTo(o2.getSectionrouteCode());
+            }
+        });
+
+        ArrayListMultimap<String, LD_SectionRoute> routeListMapCopy = ArrayListMultimap.create();
+        for(LD_SectionRoute sr : list){
+            routeListMapCopy.put(sr.getLineCode()+"_" + sr.getDirections(), sr);
+        }
+
+        routeListMap = routeListMapCopy;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(ld_sectionRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public static Map<String, Collection<LD_SectionRoute>> findRouteByCompany(String company) {
+        List<Line> lines = LineBufferData.findByCompany(company);
+
+        ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
+
+
+        Set<String> ks = routeListMap.keySet();
+
+        for(String k : ks){
+            if(include(lines, k)){
+                listMap.putAll(k, routeListMap.get(k));
+            }
+        }
+        return listMap.asMap();
+    }
+
+    private static boolean include(List<Line> lines, String k){
+
+        for(Line line : lines){
+            if(k.startsWith(line.getLineCode() + "_"))
+                return true;
+        }
+        return false;
+    }
+}
+package com.bsth.server_rs.base_info.section.buffer;
+
+import com.bsth.server_rs.base_info.section.entity.LD_Section;
+import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+public class LD_SectionRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+
+            //路段信息
+            List<LD_Section> sectionList = jdbcTemplate.query("select section_code,section_name,section_type,ST_AsText(gsection_vector) as gsection_vector,croses_road,versions from bsth_c_section where section_name not like '%行路段'  ",
+                    BeanPropertyRowMapper.newInstance(LD_Section.class));
+
+            if(sectionList == null || sectionList.size() == 0)
+                return;
+
+            LD_SectionBufferData.replaceAll(sectionList);
+
+            //路段路由信息
+            List<LD_SectionRoute> routeList = jdbcTemplate.query("select line_code,section_code,directions,sectionroute_code,versions from bsth_c_sectionroute where destroy=0",
+                    BeanPropertyRowMapper.newInstance(LD_SectionRoute.class));
+
+            for(LD_SectionRoute sr : routeList){
+                sr.setSection(LD_SectionBufferData.findOne(sr.getSectionCode()));
+            }
+
+            LD_SectionBufferData.replaceRoutes(routeList);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
+package com.bsth.server_rs.base_info.section.entity;
+
+/**
+ * 路段
+ * Created by panzhao on 2017/9/1.
+ */
+public class LD_Section {
+
+    /** 路段编码 */
+    private String sectionCode;
+
+    /** 路段名称 */
+    private String sectionName;
+
+    /** 路段类型 */
+    private String sectionType;
+
+    /** 路段矢量(空间坐标点集合)--GPS坐标点 */
+    private String gsectionVector;
+
+    /** 交叉路 */
+    private String crosesRoad;
+
+    /** 版本号 */
+    private Integer versions;
+
+    public String getSectionCode() {
+        return sectionCode;
+    }
+
+    public void setSectionCode(String sectionCode) {
+        this.sectionCode = sectionCode;
+    }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
+
+    public String getSectionType() {
+        return sectionType;
+    }
+
+    public void setSectionType(String sectionType) {
+        this.sectionType = sectionType;
+    }
+
+    public String getGsectionVector() {
+        return gsectionVector;
+    }
+
+    public void setGsectionVector(String gsectionVector) {
+        this.gsectionVector = gsectionVector;
+    }
+
+    public String getCrosesRoad() {
+        return crosesRoad;
+    }
+
+    public void setCrosesRoad(String crosesRoad) {
+        this.crosesRoad = crosesRoad;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+}
+package com.bsth.server_rs.base_info.section.entity;
+
+/**
+ * 路段路由
+ * Created by panzhao on 2017/9/1.
+ */
+public class LD_SectionRoute {
+
+    /** 线路编号 */
+    private String lineCode;
+
+    /** 路段编号 */
+    private String sectionCode;
+
+    /** 路段路由方向 */
+    private Integer directions;
+
+    /** 路段路由序号 */
+    private Integer sectionrouteCode;
+
+    /** 版本号 */
+    private Integer versions;
+
+    /** 路段详细 */
+    private LD_Section section;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getSectionCode() {
+        return sectionCode;
+    }
+
+    public void setSectionCode(String sectionCode) {
+        this.sectionCode = sectionCode;
+    }
+
+    public Integer getDirections() {
+        return directions;
+    }
+
+    public void setDirections(Integer directions) {
+        this.directions = directions;
+    }
+
+    public Integer getSectionrouteCode() {
+        return sectionrouteCode;
+    }
+
+    public void setSectionrouteCode(Integer sectionrouteCode) {
+        this.sectionrouteCode = sectionrouteCode;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public LD_Section getSection() {
+        return section;
+    }
+
+    public void setSection(LD_Section section) {
+        this.section = section;
+    }
+}
@@ -35,7 +35,7 @@ public class StationRefreshThread extends Thread{
             StationBufferData.replaceAll(stationList);
             //站点路由信息
-            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions from bsth_c_stationroute",
+            List<StationRotue> routeList = jdbcTemplate.query("select id, line, station_route_code, line_code,station_code,station_mark,distances, to_time,directions from bsth_c_stationroute where destroy=0",
                     BeanPropertyRowMapper.newInstance(StationRotue.class));
             for(StationRotue sr : routeList){
+package com.bsth.server_rs.schedule.dto;
+
+/**
+ * Created by panzhao on 2017/9/1.
+ */
+public class AttendancePlanDay {
+
+    private String jGh;
+
+    private String jName;
+
+    private String scheduleDate;
+
+    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 getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(String scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+}
+package com.bsth.server_rs.schedule.dto;
+
+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/9/1.
+ */
+public class AttendancePlanMonth {
+
+    static Logger logger = LoggerFactory.getLogger(AttendancePlanMonth.class);
+
+    public static List<AttendancePlanMonth> getMultiInstance(String month, List<AttendancePlanDay> list){
+        List<AttendancePlanMonth> rs = new ArrayList<>();
+
+        if(list == null || list.size() == 0)
+            return rs;
+
+        //分组
+        Class clazz = AttendancePlanDay.class;
+        try {
+            ArrayListMultimap<String, AttendancePlanDay> listMultimap = new ConvertUtil<AttendancePlanDay>()
+                    .groupMultiList(list, "/", clazz.getDeclaredField("jGh"), clazz.getDeclaredField("jName"));
+
+            Set<String> ks = listMultimap.keySet();
+
+            for(String k : ks){
+                rs.add(new AttendancePlanMonth(month, k, listMultimap.get(k)));
+            }
+        } catch (NoSuchFieldException e) {
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    AttendancePlanMonth(){}
+
+    AttendancePlanMonth(String month, String jsy, List<AttendancePlanDay> list){
+        this.month = month;
+        this.jsy = jsy;
+        this.ycqts = list.size();
+
+        StringBuilder sb = new StringBuilder();
+        try {
+            for(AttendancePlanDay p : list){
+                sb.append(p.getScheduleDate().split("-")[2] + ",");
+            }
+            sb.deleteCharAt(sb.length() - 1);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        this.details = sb.toString();
+    }
+
+    /** 月份 yyyy-MM */
+    private String month;
+
+    /** 驾驶员 */
+    private String jsy;
+
+    /** 出勤天数 */
+    private int ycqts;
+
+    /** 详细 */
+    private String details;
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public int getYcqts() {
+        return ycqts;
+    }
+
+    public void setYcqts(int ycqts) {
+        this.ycqts = ycqts;
+    }
+
+    public String getDetails() {
+        return details;
+    }
+
+    public void setDetails(String details) {
+        this.details = details;
+    }
+}
+package com.bsth.server_rs.schedule.dto;
+
+import com.bsth.entity.SchedulePlanInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 输出给监控平台的计划排班
+ * Created by panzhao on 2017/9/1.
+ */
+@XmlRootElement
+public class PlanScheduleDTO_JK {
+
+    public static List<PlanScheduleDTO_JK> getMultiInstance(List<SchedulePlanInfo> list){
+        List<PlanScheduleDTO_JK> rs = new ArrayList<>();
+        if(list == null || list.size()==0)
+            return rs;
+
+        Collections.sort(list, new Comparator<SchedulePlanInfo>() {
+            @Override
+            public int compare(SchedulePlanInfo o1, SchedulePlanInfo o2) {
+                return o1.getFcno().compareTo(o2.getFcno());
+            }
+        });
+
+        for(SchedulePlanInfo plan : list){
+            rs.add(new PlanScheduleDTO_JK(plan));
+        }
+
+        return rs;
+    }
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    PlanScheduleDTO_JK(){}
+
+    PlanScheduleDTO_JK(SchedulePlanInfo sch){
+        this.id = sch.getId();
+        this.scheduleDateStr = fmtyyyyMMdd.print(sch.getScheduleDate().getTime());
+        this.lineCode = sch.getXlBm();
+        this.lineName = sch.getXlName();
+        this.lpName = sch.getLpName();
+        this.nbbm = sch.getClZbh();
+        this.jsy = sch.getjGh() + "/" + sch.getjName();
+        this.spy = sch.getsGh() + "/" + sch.getsName();
+        this.upDowm = Integer.parseInt(sch.getXlDir());
+        this.qdzCode = sch.getQdzCode();
+        this.qdzName = sch.getQdzName();
+        this.zdzCode = sch.getZdzCode();
+        this.zdzName = sch.getZdzName();
+        this.fcsj = sch.getFcsj();
+        this.fcno = sch.getFcno();
+        this.jhlc = sch.getJhlc();
+        this.bcsj = sch.getBcsj();
+        this.bcType = sch.getBcType();
+    }
+
+    /** 主键Id */
+    private Long id;
+
+    /** 排班计划日期 */
+    private String scheduleDateStr;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 车辆自编号 */
+    private String nbbm;
+
+    /** 驾驶员工号/姓名 */
+    private String jsy;
+    /** 售票员工号/姓名 */
+    private String spy;
+
+    /** 上下行 */
+    private Integer upDowm;
+    /** 起点站code */
+    private String qdzCode;
+    /** 起点站名字 */
+    private String qdzName;
+    /** 终点站code */
+    private String zdzCode;
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 发车顺序号 */
+    private Integer fcno;
+    /** 计划里程 */
+    private Double jhlc;
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /** 班次类型 */
+    private String bcType;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDateStr() {
+        return scheduleDateStr;
+    }
+
+    public void setScheduleDateStr(String scheduleDateStr) {
+        this.scheduleDateStr = scheduleDateStr;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public String getSpy() {
+        return spy;
+    }
+
+    public void setSpy(String spy) {
+        this.spy = spy;
+    }
+
+    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 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 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 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 Integer getUpDowm() {
+        return upDowm;
+    }
+
+    public void setUpDowm(Integer upDowm) {
+        this.upDowm = upDowm;
+    }
+}
 package com.bsth.server_rs.schedule.dto;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.ScheduleRealInfo;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -26,43 +24,40 @@ public class ScheduleInOut implements Serializable {
             if(!sch.getQdzCode().equals(tccCode) && !sch.getZdzCode().equals(tccCode))
                 continue;
-            rs.add(getInstance(sch));
+            rs.add(new ScheduleInOut(sch));
         }
         return rs;
     }
-    public static ScheduleInOut getInstance(ScheduleRealInfo sch){
-        return JSONObject.parseObject(JSON.toJSONString(sch), ScheduleInOut.class);
+  /*  public static ScheduleInOut getInstance(ScheduleRealInfo sch){
+        //return JSONObject.parseObject(JSON.toJSONString(sch), ScheduleInOut.class);
+    }*/
+
+    ScheduleInOut(){}
+
+    ScheduleInOut(ScheduleRealInfo sch){
+        this.id = sch.getId();
     }
     private Long id;
     private String scheduleDateStr;
-    private String realExecDate;
-    private String xlName;
-    private String xlBm;
+    private String lineCode;
+    private String lineName;
     private String lpName;
-    private String clZbh;
-    private String jGh;
-    private String jName;
-    private String sGh;
-    private String sName;
-    private String xlDir;
+    private String nbbm;
+    private String jsy;
+    private String spy;
+    private Integer upDown;
     private String qdzCode;
     private String qdzName;
     private String zdzCode;
     private String zdzName;
-    private String dfsj;
     private Long dfsjT;
-    private String zdsj;
     private Long zdsjT;
-    private String fcsjActual;
-    private String zdsjActual;
+    private Long fcsjActualTime;
+    private Long zdsjActualTime;
     private boolean sflj;
     private String remarks;
-    private String gsName;
-    private String gsBm;
-    private String fgsName;
-    private String fgsBm;
     public Long getId() {
         return id;
@@ -80,28 +75,20 @@ public class ScheduleInOut implements Serializable {
         this.scheduleDateStr = scheduleDateStr;
     }
-    public String getRealExecDate() {
-        return realExecDate;
-    }
-
-    public void setRealExecDate(String realExecDate) {
-        this.realExecDate = realExecDate;
-    }
-
-    public String getXlName() {
-        return xlName;
+    public String getLineCode() {
+        return lineCode;
     }
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
     }
-    public String getXlBm() {
-        return xlBm;
+    public String getLineName() {
+        return lineName;
     }
-    public void setXlBm(String xlBm) {
-        this.xlBm = xlBm;
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
     }
     public String getLpName() {
@@ -112,52 +99,36 @@ public class ScheduleInOut implements Serializable {
         this.lpName = lpName;
     }
-    public String getClZbh() {
-        return clZbh;
-    }
-
-    public void setClZbh(String clZbh) {
-        this.clZbh = clZbh;
-    }
-
-    public String getjGh() {
-        return jGh;
+    public String getNbbm() {
+        return nbbm;
     }
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
     }
-    public String getjName() {
-        return jName;
+    public String getJsy() {
+        return jsy;
     }
-    public void setjName(String jName) {
-        this.jName = jName;
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
     }
-    public String getsGh() {
-        return sGh;
+    public String getSpy() {
+        return spy;
     }
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
+    public void setSpy(String spy) {
+        this.spy = spy;
     }
-    public String getsName() {
-        return sName;
+    public Integer getUpDown() {
+        return upDown;
     }
-    public void setsName(String sName) {
-        this.sName = sName;
-    }
-
-    public String getXlDir() {
-        return xlDir;
-    }
-
-    public void setXlDir(String xlDir) {
-        this.xlDir = xlDir;
+    public void setUpDown(Integer upDown) {
+        this.upDown = upDown;
     }
     public String getQdzCode() {
@@ -192,14 +163,6 @@ public class ScheduleInOut implements Serializable {
         this.zdzName = zdzName;
     }
-    public String getDfsj() {
-        return dfsj;
-    }
-
-    public void setDfsj(String dfsj) {
-        this.dfsj = dfsj;
-    }
-
     public Long getDfsjT() {
         return dfsjT;
     }
@@ -208,14 +171,6 @@ public class ScheduleInOut implements Serializable {
         this.dfsjT = dfsjT;
     }
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
     public Long getZdsjT() {
         return zdsjT;
     }
@@ -224,20 +179,20 @@ public class ScheduleInOut implements Serializable {
         this.zdsjT = zdsjT;
     }
-    public String getFcsjActual() {
-        return fcsjActual;
+    public Long getFcsjActualTime() {
+        return fcsjActualTime;
     }
-    public void setFcsjActual(String fcsjActual) {
-        this.fcsjActual = fcsjActual;
+    public void setFcsjActualTime(Long fcsjActualTime) {
+        this.fcsjActualTime = fcsjActualTime;
     }
-    public String getZdsjActual() {
-        return zdsjActual;
+    public Long getZdsjActualTime() {
+        return zdsjActualTime;
     }
-    public void setZdsjActual(String zdsjActual) {
-        this.zdsjActual = zdsjActual;
+    public void setZdsjActualTime(Long zdsjActualTime) {
+        this.zdsjActualTime = zdsjActualTime;
     }
     public boolean isSflj() {
@@ -255,36 +210,4 @@ public class ScheduleInOut implements Serializable {
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
-
-    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;
-    }
 }
@@ -14,7 +14,12 @@ import java.util.*;
 @XmlRootElement
 public class ScheduleRealInfoDTO_JK implements Serializable {
-    public static List<ScheduleRealInfoDTO_JK> getMultiInstance(List<ScheduleRealInfo> list){
+    public static List<ScheduleRealInfoDTO_JK> getMultiInstance(List<ScheduleRealInfo> list) {
+
+        List<ScheduleRealInfoDTO_JK> rs = new ArrayList<>();
+
+        if(list == null || list.size()==0)
+            return rs;
         Collections.sort(list, new Comparator<ScheduleRealInfo>() {
             @Override
             public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
@@ -22,20 +27,16 @@ public class ScheduleRealInfoDTO_JK implements Serializable {
             }
         });
-        List<ScheduleRealInfoDTO_JK> rs = new ArrayList<>();
-        ScheduleRealInfoDTO_JK s;
-        for(ScheduleRealInfo sch : list){
-            s = new ScheduleRealInfoDTO_JK(sch);
-            if(!s.getId().toString().equals("2740904"))
-                continue;
-            rs.add(s);
+        for (ScheduleRealInfo sch : list) {
+            rs.add(new ScheduleRealInfoDTO_JK(sch));
         }
         return rs;
     }
-    ScheduleRealInfoDTO_JK(){}
+    ScheduleRealInfoDTO_JK() {
+    }
-    ScheduleRealInfoDTO_JK(ScheduleRealInfo sch){
+    ScheduleRealInfoDTO_JK(ScheduleRealInfo sch) {
         this.id = sch.getId();
         this.scheduleDate = sch.getScheduleDateStr();
         this.lineName = sch.getXlName();
@@ -69,53 +70,91 @@ public class ScheduleRealInfoDTO_JK implements Serializable {
     private String scheduleDate;
-    /** 线路名称 */
+    /**
+     * 线路名称
+     */
     private String lineName;
-    /** 线路编码 */
+    /**
+     * 线路编码
+     */
     private String lineCode;
-    /** 路牌名称 */
+    /**
+     * 路牌名称
+     */
     private String lpName;
-    /** 车辆自编号 */
+    /**
+     * 车辆自编号
+     */
     private String nbbm;
-    /** 驾驶员工号/名称 */
+    /**
+     * 驾驶员工号/名称
+     */
     private String jsy;
-    /** 售票员工号/名称 */
+    /**
+     * 售票员工号/名称
+     */
     private String spy;
-    /** 线路方向 */
+    /**
+     * 线路方向
+     */
     private Integer upDown;
-    /** 起点站code*/
+    /**
+     * 起点站code
+     */
     private String qdzCode;
-    /** 起点站名字 */
+    /**
+     * 起点站名字
+     */
     private String qdzName;
-    /** 终点站code*/
+    /**
+     * 终点站code
+     */
     private String zdzCode;
-    /** 终点站名字 */
+    /**
+     * 终点站名字
+     */
     private String zdzName;
-    /** 计划发车时间戳*/
+    /**
+     * 计划发车时间戳
+     */
     private Long fcsjT;
-    /**待发时间戳 */
+    /**
+     * 待发时间戳
+     */
     private Long dfsjT;
-    /** 计划终点时间戳*/
+    /**
+     * 计划终点时间戳
+     */
     private Long zdsjT;
-    /** 实际发车时间戳*/
+    /**
+     * 实际发车时间戳
+     */
     private Long fcsjActualTime;
-    /** 实际终点时间戳*/
+    /**
+     * 实际终点时间戳
+     */
     private Long zdsjActualTime;
-    /** 实际计划里程 */
+    /**
+     * 实际计划里程
+     */
     private Double jhlc;
-    /** 计划里程 */
+    /**
+     * 计划里程
+     */
     private Double jhlcOrig;
-    /** 班次历时 */
+    /**
+     * 班次历时
+     */
     private Integer bcsj;
     /**
@@ -124,18 +163,26 @@ public class ScheduleRealInfoDTO_JK implements Serializable {
     private String bcType;
-    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+    /**
+     * 班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班
+     */
     private int status;
     private String adjustExps;
-    /** 是否是临加班次 */
+    /**
+     * 是否是临加班次
+     */
     private boolean sflj;
-    /** 备注*/
+    /**
+     * 备注
+     */
     private String remarks;
-    /** 子任务 */
+    /**
+     * 子任务
+     */
     private Set<ChildTaskPlan> cTasks;
     public Long getId() {
+package com.bsth.server_rs.schedule.plan;
+
+import com.bsth.redis.PlanScheduleRedisService;
+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.AttendancePlanDay;
+import com.bsth.server_rs.schedule.dto.AttendancePlanMonth;
+import com.bsth.server_rs.schedule.dto.PlanScheduleDTO_JK;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/8/24.
+ */
+@Component
+@Path("/schedule")
+@Produces({MediaType.APPLICATION_JSON})
+public class SchedulePlanService {
+
+    @Autowired
+    PlanScheduleRedisService redisService;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @GET
+    @Path("/sch_jk/{company}/{rq}")
+    public List<PlanScheduleDTO_JK> find_JK(@PathParam("company") String company, @PathParam("rq") String rq){
+        List<PlanScheduleDTO_JK> all = new ArrayList<>();
+
+        List<Line> lines = LineBufferData.findByCompany(company);
+        for(Line line : lines){
+            all.addAll(PlanScheduleDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
+        }
+        return all;
+    }
+
+    @GET
+    @Path("/ycqts/{company}/{month}")
+    public List<AttendancePlanMonth> count_ycqts(@PathParam("company") String company,@PathParam("month") String month){
+        try {
+            DateFormat formatter = new SimpleDateFormat("yyyy-MM");
+            formatter.parse(month);
+        }catch (Exception e){
+            logger.error("", e);
+            return null;
+        }
+
+        List<AttendancePlanDay> list = jdbcTemplate.query("SELECT j_gh,j_name,DATE_FORMAT(schedule_date,'%Y-%m-%d') as schedule_date FROM bsth_c_s_sp_info WHERE gs_bm='"+company+"' and schedule_date LIKE '"+month+"-%' GROUP BY j_gh,j_name,DATE_FORMAT(schedule_date,'%Y-%m-%d')", BeanPropertyRowMapper.newInstance(AttendancePlanDay.class));
+        return AttendancePlanMonth.getMultiInstance(month, list);
+    }
+}