update...

潘钊
1 parent 29879135
Showing 26 changed files with 549 additions and 45 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/old_sys_wsclient/OldWSClient.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_rs/base_info/line/Line.java
src/main/java/com/bsth/server_rs/base_info/line/LineService.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineBufferData.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineRefreshThread.java
src/main/java/com/bsth/ws_proxy/WebServiceProxy.java → src/main/java/com/bsth/server_ws/WebServiceProxy.java
src/main/java/com/bsth/ws_server/attendance/AttendanceService.java → src/main/java/com/bsth/server_ws/attendance/AttendanceService.java
src/main/java/com/bsth/ws_server/attendance/AttendanceServiceSoap.java → src/main/java/com/bsth/server_ws/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/ws_server/attendance/entity/NH_jsy_attendance.java → src/main/java/com/bsth/server_ws/attendance/entity/NH_jsy_attendance.java
src/main/java/com/bsth/ws_server/park_station/CompanyService.java → src/main/java/com/bsth/server_ws/park_station/CompanyService.java
src/main/java/com/bsth/ws_server/park_station/CompanyServiceSoap.java → src/main/java/com/bsth/server_ws/park_station/CompanyServiceSoap.java
src/main/java/com/bsth/ws_server/util/Constants.java → src/main/java/com/bsth/server_ws/util/Constants.java
src/main/java/com/bsth/ws_server/util/ControlHttpUtils.java → src/main/java/com/bsth/server_ws/util/ControlHttpUtils.java
src/main/java/com/bsth/ws_server/util/ScheduleCalculator.java → src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
src/main/java/com/bsth/ws_server/util/WSDataConver.java → src/main/java/com/bsth/server_ws/util/WSDataConver.java
src/main/java/com/bsth/ws_server/waybill/LD_Service.java → src/main/java/com/bsth/server_ws/waybill/LD_Service.java
src/main/java/com/bsth/ws_server/waybill/LD_ServiceSoap.java → src/main/java/com/bsth/server_ws/waybill/LD_ServiceSoap.java
@@ -11,7 +11,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(1);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(5);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 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 com.bsth.server_ws.attendance.AttendanceServiceSoap;
+import com.bsth.server_ws.park_station.CompanyServiceSoap;
+import com.bsth.server_ws.waybill.LD_ServiceSoap;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;
@@ -8,7 +8,7 @@ import com.bsth.old_sys_wsclient.nh_ld.ClsLDInfo;
 import com.bsth.old_sys_wsclient.nh_ld.LD_Service;
 import com.bsth.old_sys_wsclient.nh_ld.LD_ServiceLocator;
 import com.bsth.old_sys_wsclient.nh_ld.holders.ArrayOfClsLDInfoHolder;
-import com.bsth.ws_server.util.Constants;
+import com.bsth.server_ws.util.Constants;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -4,7 +4,7 @@ import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
-import com.bsth.ws_proxy.WebServiceProxy;
+import com.bsth.server_ws.WebServiceProxy;
 import com.google.common.collect.ArrayListMultimap;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
+package com.bsth.server_rs.base_info.line;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @ClassName: Line(线路实体类)
+ * @Description: TODO(线路)
+ * @Author bsth@lq
+ * @Date 2016-4-11 16:06:17
+ * @Version 公交调度系统BS版 0.1
+ */
+
+public class Line implements Serializable {
+
+    /**
+     * 线路ID 主键(唯一标识符) int length(11)
+     */
+    private Integer id;
+
+    /**
+     * 线路名称  varchar length(50) 不能为空
+     */
+    private String name;
+
+    /**
+     * 线路编码 varchar length(50) 不能为空
+     */
+    private String lineCode;
+
+    /**
+     * 英文名  varchar length(50)
+     */
+    private String es;
+
+    /**
+     * 简称 varchar length(50)
+     */
+    private String shortName;
+
+    /**
+     * 起始站名称 varchar length(50) 不能为空
+     * 该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值
+     */
+    private String startStationName;
+
+    /**
+     * 终点站名称 varchar length(50) 不能为空
+     * 该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值
+     */
+    private String endStationName;
+
+    /**
+     * 起始站首班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
+     */
+    private String startStationFirstTime;
+
+    /**
+     * 起始站末班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
+     */
+    private String startStationEndTime;
+
+    /**
+     * 终点站首班时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空
+     */
+    private String endStationFirstTime;
+
+    /**
+     * 终点站末班时间 00:00 上海公交APP中某个接口所需要的字段值
+     */
+    private String endStationEndTime;
+
+    /**
+     * 所属公司 varchar length(50)
+     */
+    private String company;
+
+    /**
+     * 分公司  varchar length(50)
+     */
+    private String brancheCompany;
+
+    /**
+     * 性质(线路类型) varchar length(50)
+     */
+    private String nature;
+
+    /**
+     * 线路等级 varchar length(50)
+     */
+    private String level;
+
+    /**
+     * 线路长度
+     */
+    private double length;
+
+    /**
+     * 线路负责人 varchar length(50)
+     */
+    private String chargeName;
+
+    /**
+     * 负责人电话 varchar length(50)
+     */
+    private String telephone;
+
+    /**
+     * 是否撤销 <1:是;0:否> bit length(50)
+     */
+    private Integer destroy;
+
+    /**
+     * 是否夜宵线   <1:是;0:否> bit length(50)
+     */
+    private Integer supperLine;
+
+    /**
+     * 起始调度电话 varchar length(50)
+     */
+    private String startPhone;
+
+    /**
+     * 终点调度电话  varchar length(50)
+     */
+    private String endPhone;
+
+    /**
+     * 开辟日期 date
+     */
+    private Date openDate;
+
+    /**
+     * 线路沿革 varchar length(50)
+     */
+    private String history;
+
+    /**
+     * 上海市线路编码 varchar length(50)
+     */
+    private String shanghaiLinecode;
+
+    /**
+     * 设备线路编码 varchar length(50)
+     */
+    private String eqLinecode;
+
+    /**
+     * 权证车辆数量  报表需要的字段值
+     */
+    private Integer warrantCar;
+
+    /**
+     * 权证配车启用日期  报表需要的字段值
+     */
+    private Integer warrantDate;
+
+    /**
+     * 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空
+     */
+    private Integer linePlayType;
+
+    /**
+     * 描述 varchar length(255)
+     */
+    private String descriptions;
+
+    /**
+     * 创建日期 timestamp
+     */
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getEs() {
+        return es;
+    }
+
+    public void setEs(String es) {
+        this.es = es;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public String getStartStationName() {
+        return startStationName;
+    }
+
+    public void setStartStationName(String startStationName) {
+        this.startStationName = startStationName;
+    }
+
+    public String getEndStationName() {
+        return endStationName;
+    }
+
+    public void setEndStationName(String endStationName) {
+        this.endStationName = endStationName;
+    }
+
+    public String getStartStationFirstTime() {
+        return startStationFirstTime;
+    }
+
+    public void setStartStationFirstTime(String startStationFirstTime) {
+        this.startStationFirstTime = startStationFirstTime;
+    }
+
+    public String getStartStationEndTime() {
+        return startStationEndTime;
+    }
+
+    public void setStartStationEndTime(String startStationEndTime) {
+        this.startStationEndTime = startStationEndTime;
+    }
+
+    public String getEndStationFirstTime() {
+        return endStationFirstTime;
+    }
+
+    public void setEndStationFirstTime(String endStationFirstTime) {
+        this.endStationFirstTime = endStationFirstTime;
+    }
+
+    public String getEndStationEndTime() {
+        return endStationEndTime;
+    }
+
+    public void setEndStationEndTime(String endStationEndTime) {
+        this.endStationEndTime = endStationEndTime;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public double getLength() {
+        return length;
+    }
+
+    public void setLength(double length) {
+        this.length = length;
+    }
+
+    public String getChargeName() {
+        return chargeName;
+    }
+
+    public void setChargeName(String chargeName) {
+        this.chargeName = chargeName;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public Integer getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(Integer destroy) {
+        this.destroy = destroy;
+    }
+
+    public Integer getSupperLine() {
+        return supperLine;
+    }
+
+    public void setSupperLine(Integer supperLine) {
+        this.supperLine = supperLine;
+    }
+
+    public String getStartPhone() {
+        return startPhone;
+    }
+
+    public void setStartPhone(String startPhone) {
+        this.startPhone = startPhone;
+    }
+
+    public String getEndPhone() {
+        return endPhone;
+    }
+
+    public void setEndPhone(String endPhone) {
+        this.endPhone = endPhone;
+    }
+
+    public Date getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
+
+    public String getHistory() {
+        return history;
+    }
+
+    public void setHistory(String history) {
+        this.history = history;
+    }
+
+    public String getShanghaiLinecode() {
+        return shanghaiLinecode;
+    }
+
+    public void setShanghaiLinecode(String shanghaiLinecode) {
+        this.shanghaiLinecode = shanghaiLinecode;
+    }
+
+    public String getEqLinecode() {
+        return eqLinecode;
+    }
+
+    public void setEqLinecode(String eqLinecode) {
+        this.eqLinecode = eqLinecode;
+    }
+
+    public Integer getWarrantCar() {
+        return warrantCar;
+    }
+
+    public void setWarrantCar(Integer warrantCar) {
+        this.warrantCar = warrantCar;
+    }
+
+    public Integer getWarrantDate() {
+        return warrantDate;
+    }
+
+    public void setWarrantDate(Integer warrantDate) {
+        this.warrantDate = warrantDate;
+    }
+
+    public Integer getLinePlayType() {
+        return linePlayType;
+    }
+
+    public void setLinePlayType(Integer linePlayType) {
+        this.linePlayType = linePlayType;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}
+package com.bsth.server_rs.base_info.line;
+
+/**
+ * 线路 Rest Service
+ * Created by panzhao on 2017/3/27.
+ */
+public class LineService {
+
+}
+package com.bsth.server_rs.base_info.line.buffer;
+
+import com.bsth.server_rs.base_info.line.Line;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 线路数据缓存（自更新）
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+@Order(10)
+public class LineBufferData implements CommandLineRunner {
+
+    @Autowired
+    LineRefreshThread lineRefreshThread;
+
+    private static List<Line> data;
+    private static Map<Integer, Line> idMap;
+
+    public static List<Line> findAll(){
+        return data;
+    }
+
+    public static Line findOne(Integer id){
+        return idMap.get(id);
+    }
+
+    public static void replaceAll(List<Line> newData){
+        data = newData;
+        Map<Integer, Line> idMapCopy = new HashMap<>();
+        for(Line line : data){
+            idMapCopy.put(line.getId(), line);
+        }
+        idMap = idMapCopy;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //Application.mainServices.scheduleWithFixedDelay(lineRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+}
+package com.bsth.server_rs.base_info.line.buffer;
+
+import com.bsth.server_rs.base_info.line.Line;
+import org.springframework.beans.factory.annotation.Autowired;
+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 LineRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Override
+    public void run() {
+
+        List<Line> list = jdbcTemplate.queryForList("select * from bsth_c_line", Line.class);
+        if(list != null && list.size() > 0)
+            LineBufferData.replaceAll(list);
+    }
+}
-package com.bsth.ws_proxy;
+package com.bsth.server_ws;
  
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -7,7 +7,7 @@ import com.bsth.entity.Line2System;
 import com.bsth.old_sys_wsclient.nh_ld.ClsLDInfo;
 import com.bsth.repository.Line2SystemRepository;
 import com.bsth.util.ConvertUtil;
-import com.bsth.ws_server.waybill.entity.NH_waybill;
+import com.bsth.server_ws.waybill.entity.NH_waybill;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
-package com.bsth.ws_server.attendance;
+package com.bsth.server_ws.attendance;
  
-import com.bsth.ws_server.attendance.entity.NH_jsy_attendance;
+import com.bsth.server_ws.attendance.entity.NH_jsy_attendance;
  
 import javax.jws.WebParam;
 import javax.jws.WebService;
-package com.bsth.ws_server.attendance;
+package com.bsth.server_ws.attendance;
  
 import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
@@ -6,8 +6,8 @@ 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 com.bsth.server_ws.attendance.entity.NH_jsy_attendance;
+import com.bsth.server_ws.util.WSDataConver;
 import org.slf4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -30,7 +30,7 @@ import java.util.Set;
         portName = "AttendanceServiceSoap",
         serviceName = "AttendanceService",
         targetNamespace = "http://control.bsth.com/",
-        endpointInterface = "com.bsth.ws_server.attendance.AttendanceService")
+        endpointInterface = "com.bsth.server_ws.attendance.AttendanceService")
 public class AttendanceServiceSoap implements AttendanceService, ApplicationContextAware {
  
     Logger logger = org.slf4j.LoggerFactory.getLogger(this.getClass());
-package com.bsth.ws_server.attendance.entity;
+package com.bsth.server_ws.attendance.entity;
  
 /**
  * 南汇驾驶员考勤
-package com.bsth.ws_server.park_station;
+package com.bsth.server_ws.park_station;
  
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
-package com.bsth.ws_server.park_station;
+package com.bsth.server_ws.park_station;
  
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.old_sys_wsclient.OldWSClient;
-import com.bsth.ws_proxy.WebServiceProxy;
-import com.bsth.ws_server.util.Constants;
-import com.bsth.ws_server.util.ControlHttpUtils;
-import com.bsth.ws_server.util.WSDataConver;
+import com.bsth.server_ws.WebServiceProxy;
+import com.bsth.server_ws.util.Constants;
+import com.bsth.server_ws.util.ControlHttpUtils;
+import com.bsth.server_ws.util.WSDataConver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  
@@ -25,7 +25,7 @@ import java.util.List;
         portName = "CompanyServiceSoap",
         serviceName = "CompanyService",
         targetNamespace = "http://control.bsth.com/",
-        endpointInterface = "com.bsth.ws_server.park_station.CompanyService")
+        endpointInterface = "com.bsth.server_ws.park_station.CompanyService")
 public class CompanyServiceSoap implements CompanyService {
  
  
-package com.bsth.ws_server.util;
+package com.bsth.server_ws.util;
  
 /**
  * Created by panzhao on 2017/3/15.
-package com.bsth.ws_server.util;
+package com.bsth.server_ws.util;
  
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.entity.ScheduleRealInfo;
-package com.bsth.ws_server.util;
+package com.bsth.server_ws.util;
  
 import com.bsth.entity.ChildTaskPlan;
 import com.bsth.entity.DutyEmployee;
-package com.bsth.ws_server.util;
+package com.bsth.server_ws.util;
  
 import com.bsth.entity.DutyEmployee;
 import com.bsth.entity.OilInfo;
@@ -6,8 +6,8 @@ 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.bsth.server_ws.attendance.entity.NH_jsy_attendance;
+import com.bsth.server_ws.waybill.entity.*;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
-package com.bsth.ws_server.waybill;
+package com.bsth.server_ws.waybill;
  
-import com.bsth.ws_server.waybill.entity.NH_waybill;
-import com.bsth.ws_server.waybill.entity.SN_lossMileage;
-import com.bsth.ws_server.waybill.entity.SN_waybill;
+import com.bsth.server_ws.waybill.entity.NH_waybill;
+import com.bsth.server_ws.waybill.entity.SN_lossMileage;
+import com.bsth.server_ws.waybill.entity.SN_waybill;
  
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
-package com.bsth.ws_server.waybill;
+package com.bsth.server_ws.waybill;
  
 import com.bsth.entity.DutyEmployee;
 import com.bsth.entity.OilInfo;
@@ -9,11 +9,11 @@ import com.bsth.redis.OilRedisService;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.repository.DutyEmployeeRepository;
 import com.bsth.service.UserService;
-import com.bsth.ws_proxy.WebServiceProxy;
-import com.bsth.ws_server.util.WSDataConver;
-import com.bsth.ws_server.waybill.entity.NH_waybill;
-import com.bsth.ws_server.waybill.entity.SN_lossMileage;
-import com.bsth.ws_server.waybill.entity.SN_waybill;
+import com.bsth.server_ws.WebServiceProxy;
+import com.bsth.server_ws.util.WSDataConver;
+import com.bsth.server_ws.waybill.entity.NH_waybill;
+import com.bsth.server_ws.waybill.entity.SN_lossMileage;
+import com.bsth.server_ws.waybill.entity.SN_waybill;
 import com.google.common.collect.ArrayListMultimap;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -38,7 +38,7 @@ import java.util.Map;
         portName = "LD_ServiceSoap",
         serviceName = "LD_Service",
         targetNamespace = "http://control.bsth.com/",
-        endpointInterface = "com.bsth.ws_server.waybill.LD_Service")
+        endpointInterface = "com.bsth.server_ws.waybill.LD_Service")
 public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
  
     static OilRedisService oilRedisService;
-package com.bsth.ws_server.waybill.entity;
+package com.bsth.server_ws.waybill.entity;
  
 import java.util.List;
  
-package com.bsth.ws_server.waybill.entity;
+package com.bsth.server_ws.waybill.entity;
  
 /**
  * 南汇路单格式细项（一单多人）
-package com.bsth.ws_server.waybill.entity;
+package com.bsth.server_ws.waybill.entity;
  
 /**
  * 上南损失公里数据格式
-package com.bsth.ws_server.waybill.entity;
+package com.bsth.server_ws.waybill.entity;
  
 import java.util.List;
  
-package com.bsth.ws_server.waybill.entity;
+package com.bsth.server_ws.waybill.entity;
  
 /**
  * 上南路单细项（一单多人）
@@ -3,7 +3,7 @@ package com.bsth.service.impl;
 import com.bsth.entity.Line2System;
 import com.bsth.repository.Line2SystemRepository;
 import com.bsth.service.Line2SystemService;
-import com.bsth.ws_proxy.WebServiceProxy;
+import com.bsth.server_ws.WebServiceProxy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;