基础数据同步

yiming
1 parent f329afe2
Showing 35 changed files with 3560 additions and 15 deletions
src/main/java/com/bsth/data/commonData/SyncData.java
src/main/java/com/bsth/data/commonData/entity/BusCompany.java
src/main/java/com/bsth/data/commonData/entity/BusLineBase.java
src/main/java/com/bsth/data/commonData/entity/BusLineOperations.java
src/main/java/com/bsth/data/commonData/entity/BusPark.java
src/main/java/com/bsth/data/commonData/entity/BusStaff.java
src/main/java/com/bsth/data/commonData/entity/BusStop.java
src/main/java/com/bsth/data/commonData/entity/BusStopLevel.java
src/main/java/com/bsth/data/commonData/entity/BusVeh.java
src/main/java/com/bsth/data/commonData/entity/RoadSection.java
src/main/java/com/bsth/data/commonData/entity/RoadSectionLevel.java
src/main/java/com/bsth/data/jddzx/JDInterface.java
src/main/java/com/bsth/repository/BusinessRepository.java
src/main/java/com/bsth/repository/CarParkRepository.java
src/main/java/com/bsth/repository/CarsRepository.java
src/main/java/com/bsth/repository/LineInformationRepository.java
src/main/java/com/bsth/repository/PersonnelRepository.java
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/service/BusinessService.java
+package com.bsth.data.commonData;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.commonData.entity.*;
+import com.bsth.entity.*;
+import com.bsth.repository.*;
+import com.bsth.service.*;
+import com.bsth.service.schedule.CarsService;
+import com.bsth.util.db.DBUtils_jiaDingBus;
+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.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Component
+@EnableTransactionManagement
+public class SyncData  extends Thread{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
+
+    @Autowired
+    private BusinessService businessService;
+
+    @Autowired
+    private BusinessRepository businessRepository;
+
+    @Autowired
+    private CarParkRepository carParkRepository;
+
+    @Autowired
+    private CarParkService carParkService;
+
+    @Autowired
+    private LineService lineService;
+
+    @Autowired
+    private LineVersionsService lineVersionsService;
+
+    @Autowired
+    private LineInformationRepository informationRepository;
+
+    @Autowired
+    private LineInformationService lineInformationService;
+
+    @Autowired
+    private CarsService carsService;
+
+    @Autowired
+    private CarsRepository carsRepository;
+
+    @Autowired
+    private PersonnelRepository personnelRepository;
+
+    @Autowired
+    private PersonnelService personnelService;
+
+    @Autowired
+    private StationService stationService;
+
+    @Autowired
+    private StationRepository stationRepository;
+
+    @Autowired
+    private StationRouteRepository stationRouteRepository;
+
+    @Autowired
+    private LsStationRouteRepository lsStationRouteRepository;
+
+    @Autowired
+    SectionService sectionService;
+
+    @Autowired
+    SectionRepository sectionRepository;
+
+    @Autowired
+    SectionRouteRepository sectionRouteRepository;
+
+    @Autowired
+    LsSectionRouteRepository lsSectionRouteRepository;
+
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+
+    @Scheduled(cron = "0 0/1 * * * ?")
+    @Transactional()
+    public void SyncData(){
+        syncBusiness();
+        syncCarPark();
+        syncLine();
+        syncLineInformation();
+        syncCar();
+        syncPersonnel();
+        syncStation();
+        syncStationRoute();
+        syncSection();
+        syncSectionRoute();
+        basicDataLoader.loadAllData();
+    }
+
+
+
+
+    public void syncBusiness(){
+        try {
+            String sql = "select * from common_bus_company";
+            List<BusCompany> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusCompany.class));
+            List<Business> businesses=BusCompany.convert(list);
+            for (Business business : businesses) {
+                if(businessRepository.findByBusinessCode(business.getBusinessCode()).size()>0){
+                    businessService.update(business);
+                }else {
+                    businessService.save(business);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>公司数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>公司数据同步异常",e);
+        }
+    }
+
+
+    public void syncCarPark(){
+        try {
+            String sql2 = "select *,ST_AsText(b_park_point) b_park_point_wkt,ST_AsText(g_park_point) g_park_point_wkt from common_bus_park";
+            List<BusPark> list2 = jdbcTemp.query(sql2, new BeanPropertyRowMapper(BusPark.class));
+            List<CarPark> carParks=BusPark.convert(list2);
+            for (CarPark carPark : carParks) {
+                if(carParkRepository.selectTccInfoByCode(carPark.getParkCode()).size()>0){
+                    carParkService.update(carPark);
+                }else {
+                    carParkService.save(carPark);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>停车场数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>停车场数据同步异常",e);
+        }
+    }
+
+
+    public void syncLine(){
+        try {
+            String sql = "select * from common_bus_line_base";
+            List<BusLineBase> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusLineBase.class));
+            List<Line> lines=BusLineBase.convert(list);
+            for (Line line : lines) {
+                if(line.getId()==null) {
+                    line.setId(Integer.valueOf(line.getLineCode()));
+                }
+                if(line.getId().toString().length()>6) {
+                    logger.info(">>>>>>>>>>>>>线路编码不符合条件"+line.getId().toString());
+                }
+                if(lineService.lineCodeVerification(line.getLineCode()).equals("false")){//线路存在 修改
+                    lineService.update(line);
+                }else {//新增
+                    saveLine(line);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>线路数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>线路数据同步异常",e);
+        }
+    }
+
+    public void saveLine(Line t){
+        // 添加线路版本
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date endDate = simpleDateFormat.parse("2088-08-08 00:00:00");
+            LineVersions lineVersions = new LineVersions();
+            lineVersions.setName("原始版本");
+            lineVersions.setLine(t);
+            lineVersions.setLineCode(t.getLineCode());
+            lineVersions.setStartDate(new java.sql.Date(new Date().getTime()));
+            lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));// 2088-8-8 00:00:00
+            lineVersions.setCreateDate(new java.sql.Date(new Date().getTime()));
+            lineVersions.setUpdateDate(new java.sql.Date(new Date().getTime()));
+            lineVersions.setVersions(1);
+            lineVersions.setStatus(1);
+            // 先添加线路再添加版本
+            lineService.save(t);
+            lineVersionsService.save(lineVersions);
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return;
+        }
+    }
+
+
+    public void syncLineInformation(){
+        try {
+            String sql = "select * from common_bus_line_operations";
+            List<BusLineOperations> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusLineOperations.class));
+            List<LineInformation> lineInformations=BusLineOperations.convert(list);
+            for (LineInformation lineInformation : lineInformations) {
+                if(informationRepository.findLineInformationByLineCode(String.valueOf(lineInformation.getLine().getId())).size()>0){//线路存在 修改
+                    lineInformationService.update(lineInformation);
+                }else {//新增
+                    lineInformationService.save(lineInformation);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>线路配置数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>线路配置数据同步异常",e);
+        }
+    }
+
+
+    public void syncCar(){
+        try {
+            String sql = "select * from common_bus_veh";
+            List<BusVeh> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusVeh.class));
+            List<Cars> cars=BusVeh.convert(list);
+            for (Cars car : cars) {
+                if(carsRepository.findCarsByCode(car.getInsideCode()).size()>0){//存在
+                    carsService.update(car);
+                }else {
+                    carsService.save(car);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>车辆数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>车辆数据同步异常",e);
+        }
+    }
+
+
+    public void syncPersonnel(){
+        try {
+            String sql = "select * from common_bus_staff";
+            List<BusStaff> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStaff.class));
+            List<Personnel> personnels=BusStaff.convert(list);
+            for (Personnel personnel : personnels) {
+                if(personnelRepository.findPersonnelByCode(personnel.getJobCodeori()).size()>0){//存在
+                    personnelService.update(personnel);
+                }else {
+                    personnelService.save(personnel);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>人员数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>人员数据同步异常",e);
+        }
+    }
+
+
+    public void syncStation(){
+        try {
+            String sql = "select *,ST_AsText(center_point) center_point_wkt from common_bus_stop";
+            List<BusStop> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStop.class));
+            List<Station> stations=BusStop.convert(list);
+            for (Station station : stations) {
+                if(stationRepository.findStationByStationCode(station.getStationCode()).size()>0){//存在
+                    stationService.update(station);
+                }else {
+                    stationService.add(station);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>站点数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>站点数据同步异常",e);
+        }
+    }
+
+
+
+    public void syncStationRoute(){
+        try {
+            String sql = "select *,ST_AsText(center_point) center_point_wkt,ST_AsText(buffer_polygon) buffer_polygon_wkt from common_bus_stoplevel";
+            List<BusStopLevel> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStopLevel.class));
+            List<StationRoute> stationRoutes=BusStopLevel.convert(list);
+            List<LsStationRoute> lsStationRoutes=BusStopLevel.convertLS(list);
+            if(stationRoutes.size()>0){
+                stationRouteRepository.deleteAll();
+                lsStationRouteRepository.deleteAll();
+            }
+            stationRouteRepository.saveAll(stationRoutes);
+            lsStationRouteRepository.saveAll(lsStationRoutes);
+            logger.info(">>>>>>>>>>>>>站点路由数据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>站点路由数据同步异常",e);
+        }
+    }
+
+
+    private void syncSection(){
+        try {
+            String sql = "select *,ST_AsText(bsection_vector) bsectionVectorWkt from common_road_section";
+            List<RoadSection> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(RoadSection.class));
+            List<Section> sections=RoadSection.convert(list);
+            for (Section section : sections) {
+                if(sectionRepository.findSectionByCode(section.getSectionCode()).size()>0){
+                    sectionService.modify(section);
+                }else {
+                    sectionService.add(section);
+                }
+            }
+            logger.info(">>>>>>>>>>>>>路段据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>路段数据同步异常",e);
+        }
+    }
+
+
+    private void syncSectionRoute(){
+        try {
+            String sql = "select * from common_road_sectionlevel where destroy=0";
+            List<RoadSectionLevel> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(RoadSectionLevel.class));
+            List<SectionRoute> sectionRoutes=RoadSectionLevel.convert(list);
+            List<LsSectionRoute> lsSectionRoutes=RoadSectionLevel.convertLS(list);
+            if(sectionRoutes.size()>0){
+                sectionRouteRepository.deleteAll();
+                lsSectionRouteRepository.deleteAll();
+            }
+            sectionRouteRepository.saveAll(sectionRoutes);
+            lsSectionRouteRepository.saveAll(lsSectionRoutes);
+            logger.info(">>>>>>>>>>>>>路段路由据同步完成");
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>>>>路段路由数据同步异常",e);
+        }
+    }
+
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.Business;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusCompany implements Cloneable{
+
+	//公司编号
+	private String COMPANY_ID;
+	//公司名称
+	private String COMPANY_NAME;
+	//公司简称
+	private String COMPANY_ADDR;
+	//上级编码
+	private String P_COMPANY_ID;
+	//删除标识0未删除1已删除
+	private String DEL_FLAG;
+	//创建时间
+	private String CREATE_TIME;
+	//修改时间
+	private String UPDATE_TIME;
+	//创建人
+	private String CREATE_USER;
+	//修改人
+	private String UPDATE_USER;
+
+	public static Business convert(BusCompany busCompany){
+		Business business = new Business();
+		business.setBusinessName(busCompany.getCOMPANY_NAME());
+		business.setBusinessCode(busCompany.getCOMPANY_ID());
+		business.setUpCode(busCompany.getP_COMPANY_ID());
+		business.setCreateDate(new java.sql.Date(new Date().getTime()));
+		business.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return business;
+	}
+
+	public static List<Business> convert(List<BusCompany> busCompanies){
+		List<Business> list = new ArrayList<>();
+		for (BusCompany busCompany : busCompanies) {
+			list.add(convert(busCompany));
+		}
+		return list;
+	}
+
+
+	public String getCOMPANY_ID() {
+		return COMPANY_ID;
+	}
+
+	public void setCOMPANY_ID(String COMPANY_ID) {
+		this.COMPANY_ID = COMPANY_ID;
+	}
+
+	public String getCOMPANY_NAME() {
+		return COMPANY_NAME;
+	}
+
+	public void setCOMPANY_NAME(String COMPANY_NAME) {
+		this.COMPANY_NAME = COMPANY_NAME;
+	}
+
+	public String getCOMPANY_ADDR() {
+		return COMPANY_ADDR;
+	}
+
+	public void setCOMPANY_ADDR(String COMPANY_ADDR) {
+		this.COMPANY_ADDR = COMPANY_ADDR;
+	}
+
+	public String getP_COMPANY_ID() {
+		return P_COMPANY_ID;
+	}
+
+	public void setP_COMPANY_ID(String p_COMPANY_ID) {
+		P_COMPANY_ID = p_COMPANY_ID;
+	}
+
+	public String getDEL_FLAG() {
+		return DEL_FLAG;
+	}
+
+	public void setDEL_FLAG(String DEL_FLAG) {
+		this.DEL_FLAG = DEL_FLAG;
+	}
+
+	public String getCREATE_TIME() {
+		return CREATE_TIME;
+	}
+
+	public void setCREATE_TIME(String CREATE_TIME) {
+		this.CREATE_TIME = CREATE_TIME;
+	}
+
+	public String getUPDATE_TIME() {
+		return UPDATE_TIME;
+	}
+
+	public void setUPDATE_TIME(String UPDATE_TIME) {
+		this.UPDATE_TIME = UPDATE_TIME;
+	}
+
+	public String getCREATE_USER() {
+		return CREATE_USER;
+	}
+
+	public void setCREATE_USER(String CREATE_USER) {
+		this.CREATE_USER = CREATE_USER;
+	}
+
+	public String getUPDATE_USER() {
+		return UPDATE_USER;
+	}
+
+	public void setUPDATE_USER(String UPDATE_USER) {
+		this.UPDATE_USER = UPDATE_USER;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.Line;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusLineBase implements Cloneable{
+
+	//线路编号
+	private String id;
+	//线路名称
+	private String name;
+	//线路编码
+	private String line_code;
+	//线路英文名
+	private String es;
+	//线路简称
+	private String short_name;
+	//配置车辆总数
+	private int car_sum_number;
+	//空调车辆数量
+	private int hvac_car_number;
+	//普通车辆数量
+	private int ord_car_number;
+	//停车场编码
+	private String car_park_code;
+	//起始站名称
+	private String start_station_name;
+	//	起始站首班车时间 00:00
+	private String start_station_first_time;
+	//起始站末班车时间 00:00
+	private String start_station_end_time;
+	//终点站名称
+	private String end_station_name;
+	//终点站首班时间 00:00
+	private String end_station_first_time;
+	//终点站末班时间 00:00
+	private String end_station_end_time;
+	//所属公司
+	private String company;
+	//分公司
+	private String branche_company;
+	//性质(线路类型)
+	private String nature;
+	//线路等级
+	private String level;
+	//线路长度
+	private double length;
+	//线路负责人
+	private String charge_name;
+	//负责人电话
+	private String telephone;
+	//是否撤销
+	private int destroy;
+	//是否夜宵线
+	private int supper_line;
+	//起始调度电话
+	private String start_phone;
+	//终点调度电话
+	private String end_phone;
+	//开辟日期
+	private Date open_date;
+	//线路沿革
+	private String history;
+	//上海市线路编码
+	private String shanghai_linecode;
+	//设备线路编码
+	private String eq_linecode;
+	//描述
+	private String descriptions;
+	//创建人
+	private String create_by;
+	//创建日期
+	private Date create_date;
+	//修改人
+	private String update_by;
+	//修改日期
+	private Date update_date;
+	//收否环线（0常规 1环线）
+	private int line_play_type;
+	//权证配车数
+	private int warrant_car;
+/*	//权证日期
+	private Integer warrant_date;*/
+	//是否运营
+	private int sfyy;
+	//票价
+	private String ticket_price;
+	//是否跨区 0-不跨区 1-跨区
+	private int region;
+	//线路版本ID
+	private String line_version_id;
+
+	public static Line convert(BusLineBase busLineBase){
+		Line line = new Line();
+		line.setName(busLineBase.name);
+		line.setLineCode(busLineBase.getLine_code());
+		line.setEs(busLineBase.getEs());
+		line.setShortName(busLineBase.getShort_name());
+		line.setStartStationName(busLineBase.getStart_station_name());
+		line.setEndStationName(busLineBase.getEnd_station_name());
+		line.setStartStationFirstTime(busLineBase.getStart_station_first_time());
+		line.setStartStationEndTime(busLineBase.getStart_station_end_time());
+		line.setEndStationFirstTime(busLineBase.getEnd_station_first_time());
+		line.setEndStationEndTime(busLineBase.getEnd_station_end_time());
+		line.setCompany(busLineBase.getCompany());
+		line.setBrancheCompany(busLineBase.getBranche_company());
+		line.setNature(busLineBase.getNature());
+		line.setLevel(busLineBase.getLevel());
+		line.setLength(busLineBase.getLength());
+		line.setChargeName(busLineBase.getCharge_name());
+		line.setTelephone(busLineBase.getTelephone());
+		line.setDestroy(busLineBase.getDestroy());
+		line.setSupperLine(busLineBase.getSupper_line());
+		line.setSfyy(busLineBase.getSfyy());
+		line.setRegion(busLineBase.getRegion());
+		line.setStartPhone(busLineBase.getStart_phone());
+		line.setEndPhone(busLineBase.getEnd_phone());
+		line.setOpenDate(busLineBase.getOpen_date());
+		line.setHistory(busLineBase.getHistory());
+		line.setShanghaiLinecode(busLineBase.getShanghai_linecode());
+		line.setEqLinecode(busLineBase.getEq_linecode());
+		line.setCarSumNumber(busLineBase.getCar_sum_number());
+		line.setHvacCarNumber(busLineBase.getHvac_car_number());
+		line.setOrdCarNumber(busLineBase.getOrd_car_number());
+		line.setWarrantCar(busLineBase.getWarrant_car());
+		line.setCarParkCode(busLineBase.getCar_park_code());
+		line.setLinePlayType(busLineBase.getLine_play_type());
+		line.setDescriptions(busLineBase.getDescriptions());
+		line.setCreateDate(new java.sql.Date(new Date().getTime()));
+		line.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		int isUse=0;
+		if(busLineBase.getDestroy()==0){
+			isUse=1;
+		}
+		line.setInUse(isUse);
+		line.setRemove(0);
+		return line;
+	}
+
+	public static List<Line> convert(List<BusLineBase> busLineBases){
+		List<Line> list = new ArrayList<>();
+		for (BusLineBase busLineBase : busLineBases) {
+			list.add(convert(busLineBase));
+		}
+		return list;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLine_code() {
+		return line_code;
+	}
+
+	public void setLine_code(String line_code) {
+		this.line_code = line_code;
+	}
+
+	public String getEs() {
+		return es;
+	}
+
+	public void setEs(String es) {
+		this.es = es;
+	}
+
+	public String getShort_name() {
+		return short_name;
+	}
+
+	public void setShort_name(String short_name) {
+		this.short_name = short_name;
+	}
+
+	public int getCar_sum_number() {
+		return car_sum_number;
+	}
+
+	public void setCar_sum_number(int car_sum_number) {
+		this.car_sum_number = car_sum_number;
+	}
+
+	public int getHvac_car_number() {
+		return hvac_car_number;
+	}
+
+	public void setHvac_car_number(int hvac_car_number) {
+		this.hvac_car_number = hvac_car_number;
+	}
+
+	public int getOrd_car_number() {
+		return ord_car_number;
+	}
+
+	public void setOrd_car_number(int ord_car_number) {
+		this.ord_car_number = ord_car_number;
+	}
+
+	public String getCar_park_code() {
+		return car_park_code;
+	}
+
+	public void setCar_park_code(String car_park_code) {
+		this.car_park_code = car_park_code;
+	}
+
+	public String getStart_station_name() {
+		return start_station_name;
+	}
+
+	public void setStart_station_name(String start_station_name) {
+		this.start_station_name = start_station_name;
+	}
+
+	public String getStart_station_first_time() {
+		return start_station_first_time;
+	}
+
+	public void setStart_station_first_time(String start_station_first_time) {
+		this.start_station_first_time = start_station_first_time;
+	}
+
+	public String getStart_station_end_time() {
+		return start_station_end_time;
+	}
+
+	public void setStart_station_end_time(String start_station_end_time) {
+		this.start_station_end_time = start_station_end_time;
+	}
+
+	public String getEnd_station_name() {
+		return end_station_name;
+	}
+
+	public void setEnd_station_name(String end_station_name) {
+		this.end_station_name = end_station_name;
+	}
+
+	public String getEnd_station_first_time() {
+		return end_station_first_time;
+	}
+
+	public void setEnd_station_first_time(String end_station_first_time) {
+		this.end_station_first_time = end_station_first_time;
+	}
+
+	public String getEnd_station_end_time() {
+		return end_station_end_time;
+	}
+
+	public void setEnd_station_end_time(String end_station_end_time) {
+		this.end_station_end_time = end_station_end_time;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getBranche_company() {
+		return branche_company;
+	}
+
+	public void setBranche_company(String branche_company) {
+		this.branche_company = branche_company;
+	}
+
+	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 getCharge_name() {
+		return charge_name;
+	}
+
+	public void setCharge_name(String charge_name) {
+		this.charge_name = charge_name;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public int getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(int destroy) {
+		this.destroy = destroy;
+	}
+
+	public int getSupper_line() {
+		return supper_line;
+	}
+
+	public void setSupper_line(int supper_line) {
+		this.supper_line = supper_line;
+	}
+
+	public String getStart_phone() {
+		return start_phone;
+	}
+
+	public void setStart_phone(String start_phone) {
+		this.start_phone = start_phone;
+	}
+
+	public String getEnd_phone() {
+		return end_phone;
+	}
+
+	public void setEnd_phone(String end_phone) {
+		this.end_phone = end_phone;
+	}
+
+	public Date getOpen_date() {
+		return open_date;
+	}
+
+	public void setOpen_date(Date open_date) {
+		this.open_date = open_date;
+	}
+
+	public String getHistory() {
+		return history;
+	}
+
+	public void setHistory(String history) {
+		this.history = history;
+	}
+
+	public String getShanghai_linecode() {
+		return shanghai_linecode;
+	}
+
+	public void setShanghai_linecode(String shanghai_linecode) {
+		this.shanghai_linecode = shanghai_linecode;
+	}
+
+	public String getEq_linecode() {
+		return eq_linecode;
+	}
+
+	public void setEq_linecode(String eq_linecode) {
+		this.eq_linecode = eq_linecode;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getCreate_by() {
+		return create_by;
+	}
+
+	public void setCreate_by(String create_by) {
+		this.create_by = create_by;
+	}
+
+	public Date getCreate_date() {
+		return create_date;
+	}
+
+	public void setCreate_date(Date create_date) {
+		this.create_date = create_date;
+	}
+
+	public String getUpdate_by() {
+		return update_by;
+	}
+
+	public void setUpdate_by(String update_by) {
+		this.update_by = update_by;
+	}
+
+	public Date getUpdate_date() {
+		return update_date;
+	}
+
+	public void setUpdate_date(Date update_date) {
+		this.update_date = update_date;
+	}
+
+	public int getLine_play_type() {
+		return line_play_type;
+	}
+
+	public void setLine_play_type(int line_play_type) {
+		this.line_play_type = line_play_type;
+	}
+
+	public int getWarrant_car() {
+		return warrant_car;
+	}
+
+	public void setWarrant_car(int warrant_car) {
+		this.warrant_car = warrant_car;
+	}
+
+	public int getSfyy() {
+		return sfyy;
+	}
+
+	public void setSfyy(int sfyy) {
+		this.sfyy = sfyy;
+	}
+
+	public String getTicket_price() {
+		return ticket_price;
+	}
+
+	public void setTicket_price(String ticket_price) {
+		this.ticket_price = ticket_price;
+	}
+
+	public int getRegion() {
+		return region;
+	}
+
+	public void setRegion(int region) {
+		this.region = region;
+	}
+
+	public String getLine_version_id() {
+		return line_version_id;
+	}
+
+	public void setLine_version_id(String line_version_id) {
+		this.line_version_id = line_version_id;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusLineOperations implements Cloneable{
+
+	//序号
+	private String ID;
+	//线路基础信息编号
+	private String line_base_id;
+	//线路标准信息类型
+	private String type;
+	//标准总里程
+	private Double total_mileage;
+	//空放里程
+	private Double empty_mileage;
+	//上行里程
+	private Double up_mileage;
+	//下行里程
+	private Double down_mileage;
+	//上行行驶时间
+	private Double up_travel_time;
+	//下行行驶时间
+	private Double down_travel_time;
+	//早高峰开始时间 00:00
+	private String early_start_time;
+	//早高峰结束时间 00:00
+	private String early_end_time;
+	//晚高峰开始时间 00:00
+	private String late_start_time;
+	//晚高峰结束时间 00:00
+	private String late_end_time;
+	//早高峰大间隔（分钟）
+	private Double early_interval_lg;
+	//晚高峰大间隔（分钟）
+	private Double late_interval_lg;
+	//平时大间隔（分钟）
+	private Double interval_lg;
+	//限速（平时）
+	private Double speed_limit;
+	//限速（雨天）
+	private Double rain_limit;
+	//限速（大雾）
+	private Double fog_limit;
+	//限速（冰雪）
+	private Double snow_limit;
+	//限速（节庆）
+	private Double festival_speed_limit;
+	//滞站
+	private Integer lag_station;
+	//越站
+	private Integer skip;
+	//超速
+	private Integer speeding;
+	//串线
+	private Integer crossed_line;
+	//越界
+	private Integer overflights;
+	//描述
+	private String descriptions;
+	//创建人
+	private String create_by;
+	//创建日期
+	private Date create_date;
+	//修改人
+	private String update_by;
+	//修改日期
+	private Date update_date;
+	//早高峰下行行驶时间
+	private Double early_down_time;
+	//早高峰下行行驶时间
+	private Double early_up_time;
+	//晚高峰下行行驶时间
+	private Double late_down_time;
+	//晚高峰上行行驶时间
+	private Double late_up_time;
+	//小夜高峰上行行驶时间
+	private Double night_end_time;
+	//小夜高峰下行行驶时间
+	private Double night_start_time;
+	//低谷下行行驶时间
+	private Double trough_down_time;
+	//低谷上行行驶时间
+	private Double trough_up_time;
+	//停车场
+	private String car_park;
+	//下行进场里程
+	private Double down_in_mileage;
+	//下行进场时间
+	private Double down_in_timer;
+	//下行出场里程
+	private Double down_out_mileage;
+	//下行出场时间
+	private Double down_out_timer;
+	//上行进场里程
+	private Double up_in_mileage;
+	//上行进场时间
+	private Double up_in_timer;
+	//上行出场里程
+	private Double up_out_mileage;
+	//上行出场时间
+	private Double up_out_timer;
+	//小夜高峰结束时间
+	private String xygfjssj;
+	//小夜高峰开始时间
+	private String xygfkssj;
+
+	public static LineInformation convert(BusLineOperations blo){
+		LineInformation information=new LineInformation();
+		Line line=new Line();
+		line.setId(Integer.parseInt(blo.getLine_base_id()));
+		information.setLine(line);
+		information.setType(blo.getType());
+		information.setTotalMileage(blo.getTotal_mileage());
+		information.setEmptyMileage(blo.getEmpty_mileage());
+		information.setUpMileage(blo.getUp_mileage());
+		information.setDownMileage(blo.getDown_mileage());
+		information.setUpTravelTime(blo.getUp_travel_time());
+		information.setDownTravelTime(blo.getDown_travel_time());
+		information.setEarlyStartTime(blo.getEarly_start_time());
+		information.setEarlyEndTime(blo.getEarly_end_time());
+		information.setLateStartTime(blo.getLate_start_time());
+		information.setLateEndTime(blo.getLate_end_time());
+		information.setXygfkssj(blo.getXygfkssj());
+		information.setXygfjssj(blo.getXygfjssj());
+		information.setEarlyUpTime(blo.getEarly_up_time());
+		information.setEarlyDownTime(blo.getEarly_down_time());
+		information.setLateUpTime(blo.getLate_up_time());
+		information.setLateDownTime(blo.getLate_down_time());
+		information.setNightStartTime(blo.getNight_start_time());
+		information.setNightEndTime(blo.getNight_end_time());
+		information.setTroughUpTime(blo.getTrough_up_time());
+		information.setTroughDownTime(blo.getTrough_down_time());
+		information.setCarPark(blo.getCar_park());
+		information.setUpInTimer(blo.getUp_in_timer());
+		information.setUpOutTimer(blo.getUp_out_timer());
+		information.setDownInTimer(blo.getDown_in_timer());
+		information.setDownOutTimer(blo.getDown_out_timer());
+		information.setEarlyIntervalLg(blo.getEarly_interval_lg());
+		information.setLateIntervalLg(blo.getLate_interval_lg());
+		information.setIntervalLg(blo.getInterval_lg());
+		information.setSpeedLimit(blo.getSpeed_limit());
+		information.setRainLimit(blo.getRain_limit());
+		information.setFogLimit(blo.getFog_limit());
+		information.setSnowLimit(blo.getSnow_limit());
+		information.setFestivalSpeedLimit(blo.getFestival_speed_limit());
+		information.setLagStation(blo.getLag_station());
+		information.setSkip(blo.getSkip());
+		information.setSpeeding(blo.getSpeeding());
+		information.setCrossedLine(blo.getCrossed_line());
+		information.setOverflights(blo.getOverflights());
+		information.setDescriptions(blo.getDescriptions());
+		information.setCreateDate(new java.sql.Date(new Date().getTime()));
+		information.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return information;
+	}
+
+	public static List<LineInformation> convert(List<BusLineOperations> busLineOperations){
+		List<LineInformation> list = new ArrayList<>();
+		for (BusLineOperations busLineOperation : busLineOperations) {
+			list.add(convert(busLineOperation));
+		}
+		return list;
+	}
+
+	public String getID() {
+		return ID;
+	}
+
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+
+	public String getLine_base_id() {
+		return line_base_id;
+	}
+
+	public void setLine_base_id(String line_base_id) {
+		this.line_base_id = line_base_id;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Double getTotal_mileage() {
+		return total_mileage;
+	}
+
+	public void setTotal_mileage(Double total_mileage) {
+		this.total_mileage = total_mileage;
+	}
+
+	public Double getEmpty_mileage() {
+		return empty_mileage;
+	}
+
+	public void setEmpty_mileage(Double empty_mileage) {
+		this.empty_mileage = empty_mileage;
+	}
+
+	public Double getUp_mileage() {
+		return up_mileage;
+	}
+
+	public void setUp_mileage(Double up_mileage) {
+		this.up_mileage = up_mileage;
+	}
+
+	public Double getDown_mileage() {
+		return down_mileage;
+	}
+
+	public void setDown_mileage(Double down_mileage) {
+		this.down_mileage = down_mileage;
+	}
+
+	public Double getUp_travel_time() {
+		return up_travel_time;
+	}
+
+	public void setUp_travel_time(Double up_travel_time) {
+		this.up_travel_time = up_travel_time;
+	}
+
+	public Double getDown_travel_time() {
+		return down_travel_time;
+	}
+
+	public void setDown_travel_time(Double down_travel_time) {
+		this.down_travel_time = down_travel_time;
+	}
+
+	public String getEarly_start_time() {
+		return early_start_time;
+	}
+
+	public void setEarly_start_time(String early_start_time) {
+		this.early_start_time = early_start_time;
+	}
+
+	public String getEarly_end_time() {
+		return early_end_time;
+	}
+
+	public void setEarly_end_time(String early_end_time) {
+		this.early_end_time = early_end_time;
+	}
+
+	public String getLate_start_time() {
+		return late_start_time;
+	}
+
+	public void setLate_start_time(String late_start_time) {
+		this.late_start_time = late_start_time;
+	}
+
+	public String getLate_end_time() {
+		return late_end_time;
+	}
+
+	public void setLate_end_time(String late_end_time) {
+		this.late_end_time = late_end_time;
+	}
+
+	public Double getEarly_interval_lg() {
+		return early_interval_lg;
+	}
+
+	public void setEarly_interval_lg(Double early_interval_lg) {
+		this.early_interval_lg = early_interval_lg;
+	}
+
+	public Double getLate_interval_lg() {
+		return late_interval_lg;
+	}
+
+	public void setLate_interval_lg(Double late_interval_lg) {
+		this.late_interval_lg = late_interval_lg;
+	}
+
+	public Double getInterval_lg() {
+		return interval_lg;
+	}
+
+	public void setInterval_lg(Double interval_lg) {
+		this.interval_lg = interval_lg;
+	}
+
+	public Double getSpeed_limit() {
+		return speed_limit;
+	}
+
+	public void setSpeed_limit(Double speed_limit) {
+		this.speed_limit = speed_limit;
+	}
+
+	public Double getRain_limit() {
+		return rain_limit;
+	}
+
+	public void setRain_limit(Double rain_limit) {
+		this.rain_limit = rain_limit;
+	}
+
+	public Double getFog_limit() {
+		return fog_limit;
+	}
+
+	public void setFog_limit(Double fog_limit) {
+		this.fog_limit = fog_limit;
+	}
+
+	public Double getSnow_limit() {
+		return snow_limit;
+	}
+
+	public void setSnow_limit(Double snow_limit) {
+		this.snow_limit = snow_limit;
+	}
+
+	public Double getFestival_speed_limit() {
+		return festival_speed_limit;
+	}
+
+	public void setFestival_speed_limit(Double festival_speed_limit) {
+		this.festival_speed_limit = festival_speed_limit;
+	}
+
+	public Integer getLag_station() {
+		return lag_station;
+	}
+
+	public void setLag_station(Integer lag_station) {
+		this.lag_station = lag_station;
+	}
+
+	public Integer getSkip() {
+		return skip;
+	}
+
+	public void setSkip(Integer skip) {
+		this.skip = skip;
+	}
+
+	public Integer getSpeeding() {
+		return speeding;
+	}
+
+	public void setSpeeding(Integer speeding) {
+		this.speeding = speeding;
+	}
+
+	public Integer getCrossed_line() {
+		return crossed_line;
+	}
+
+	public void setCrossed_line(Integer crossed_line) {
+		this.crossed_line = crossed_line;
+	}
+
+	public Integer getOverflights() {
+		return overflights;
+	}
+
+	public void setOverflights(Integer overflights) {
+		this.overflights = overflights;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getCreate_by() {
+		return create_by;
+	}
+
+	public void setCreate_by(String create_by) {
+		this.create_by = create_by;
+	}
+
+	public Date getCreate_date() {
+		return create_date;
+	}
+
+	public void setCreate_date(Date create_date) {
+		this.create_date = create_date;
+	}
+
+	public String getUpdate_by() {
+		return update_by;
+	}
+
+	public void setUpdate_by(String update_by) {
+		this.update_by = update_by;
+	}
+
+	public Date getUpdate_date() {
+		return update_date;
+	}
+
+	public void setUpdate_date(Date update_date) {
+		this.update_date = update_date;
+	}
+
+	public Double getEarly_down_time() {
+		return early_down_time;
+	}
+
+	public void setEarly_down_time(Double early_down_time) {
+		this.early_down_time = early_down_time;
+	}
+
+	public Double getEarly_up_time() {
+		return early_up_time;
+	}
+
+	public void setEarly_up_time(Double early_up_time) {
+		this.early_up_time = early_up_time;
+	}
+
+	public Double getLate_down_time() {
+		return late_down_time;
+	}
+
+	public void setLate_down_time(Double late_down_time) {
+		this.late_down_time = late_down_time;
+	}
+
+	public Double getLate_up_time() {
+		return late_up_time;
+	}
+
+	public void setLate_up_time(Double late_up_time) {
+		this.late_up_time = late_up_time;
+	}
+
+	public Double getNight_end_time() {
+		return night_end_time;
+	}
+
+	public void setNight_end_time(Double night_end_time) {
+		this.night_end_time = night_end_time;
+	}
+
+	public Double getNight_start_time() {
+		return night_start_time;
+	}
+
+	public void setNight_start_time(Double night_start_time) {
+		this.night_start_time = night_start_time;
+	}
+
+	public Double getTrough_down_time() {
+		return trough_down_time;
+	}
+
+	public void setTrough_down_time(Double trough_down_time) {
+		this.trough_down_time = trough_down_time;
+	}
+
+	public Double getTrough_up_time() {
+		return trough_up_time;
+	}
+
+	public void setTrough_up_time(Double trough_up_time) {
+		this.trough_up_time = trough_up_time;
+	}
+
+	public String getCar_park() {
+		return car_park;
+	}
+
+	public void setCar_park(String car_park) {
+		this.car_park = car_park;
+	}
+
+	public Double getDown_in_mileage() {
+		return down_in_mileage;
+	}
+
+	public void setDown_in_mileage(Double down_in_mileage) {
+		this.down_in_mileage = down_in_mileage;
+	}
+
+	public Double getDown_in_timer() {
+		return down_in_timer;
+	}
+
+	public void setDown_in_timer(Double down_in_timer) {
+		this.down_in_timer = down_in_timer;
+	}
+
+	public Double getDown_out_mileage() {
+		return down_out_mileage;
+	}
+
+	public void setDown_out_mileage(Double down_out_mileage) {
+		this.down_out_mileage = down_out_mileage;
+	}
+
+	public Double getDown_out_timer() {
+		return down_out_timer;
+	}
+
+	public void setDown_out_timer(Double down_out_timer) {
+		this.down_out_timer = down_out_timer;
+	}
+
+	public Double getUp_in_mileage() {
+		return up_in_mileage;
+	}
+
+	public void setUp_in_mileage(Double up_in_mileage) {
+		this.up_in_mileage = up_in_mileage;
+	}
+
+	public Double getUp_in_timer() {
+		return up_in_timer;
+	}
+
+	public void setUp_in_timer(Double up_in_timer) {
+		this.up_in_timer = up_in_timer;
+	}
+
+	public Double getUp_out_mileage() {
+		return up_out_mileage;
+	}
+
+	public void setUp_out_mileage(Double up_out_mileage) {
+		this.up_out_mileage = up_out_mileage;
+	}
+
+	public Double getUp_out_timer() {
+		return up_out_timer;
+	}
+
+	public void setUp_out_timer(Double up_out_timer) {
+		this.up_out_timer = up_out_timer;
+	}
+
+	public String getXygfjssj() {
+		return xygfjssj;
+	}
+
+	public void setXygfjssj(String xygfjssj) {
+		this.xygfjssj = xygfjssj;
+	}
+
+	public String getXygfkssj() {
+		return xygfkssj;
+	}
+
+	public void setXygfkssj(String xygfkssj) {
+		this.xygfkssj = xygfkssj;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.CarPark;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusPark implements Cloneable{
+
+	//面积 默认0
+	private Double area;
+	//公司编码
+	private String company;
+	//停车场编号长度8位 用F补足
+	private String park_code;
+	//停车场名称
+	private String park_name;
+	//地理位置中心点 百度
+	private String b_center_point;
+	//地理位置 百度
+	private String b_park_point_wkt;
+	//分公司编码
+	private String branche_company;
+	//经纬坐标类型 b：百度坐标系 d：高德坐标系
+	private String db_type;
+	//描述
+	private String descriptions;
+	//是否撤销 0否 1是
+	private Integer destroy;
+	//地理位置中心点(WGS坐标)
+	private String g_center_point;
+	//地理位置(WGS坐标)
+	private String g_park_point_wkt;
+	//圆形半径
+	private Integer radius;
+	//图形类型 r：圆形 d：多边形
+	private String shapes_type;
+
+
+	public static CarPark convert(BusPark bp){
+		CarPark carPark = new CarPark();
+		carPark.setParkCode(bp.getPark_code());
+		carPark.setParkName(bp.getPark_name());
+		carPark.setbParkPoint(bp.getB_park_point_wkt());
+		carPark.setbCenterPoint(bp.getB_center_point());
+		carPark.setgParkPoint(bp.getG_park_point_wkt());
+		carPark.setgCenterPoint(bp.getG_center_point());
+		carPark.setDbType(bp.getDb_type());
+		carPark.setShapesType(bp.getShapes_type());
+		carPark.setRadius(bp.getRadius());
+		carPark.setArea(bp.getArea());
+		carPark.setCompany(bp.getCompany());
+		carPark.setBrancheCompany(bp.getBranche_company());
+		carPark.setDestroy(bp.getDestroy());
+		carPark.setDescriptions(bp.getDescriptions());
+		carPark.setVersions(1);
+		carPark.setCreateDate(new java.sql.Date(new Date().getTime()));
+		carPark.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return carPark;
+	}
+
+	public static List<CarPark> convert(List<BusPark> busParks){
+		List<CarPark> list = new ArrayList<>();
+		for (BusPark busPark : busParks) {
+			list.add(convert(busPark));
+		}
+		return list;
+	}
+
+	public Double getArea() {
+		return area;
+	}
+
+	public void setArea(Double area) {
+		this.area = area;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getPark_code() {
+		return park_code;
+	}
+
+	public void setPark_code(String park_code) {
+		this.park_code = park_code;
+	}
+
+	public String getPark_name() {
+		return park_name;
+	}
+
+	public void setPark_name(String park_name) {
+		this.park_name = park_name;
+	}
+
+	public String getB_center_point() {
+		return b_center_point;
+	}
+
+	public void setB_center_point(String b_center_point) {
+		this.b_center_point = b_center_point;
+	}
+
+	public String getB_park_point_wkt() {
+		return b_park_point_wkt;
+	}
+
+	public void setB_park_point_wkt(String b_park_point_wkt) {
+		this.b_park_point_wkt = b_park_point_wkt;
+	}
+
+	public String getBranche_company() {
+		return branche_company;
+	}
+
+	public void setBranche_company(String branche_company) {
+		this.branche_company = branche_company;
+	}
+
+	public String getDb_type() {
+		return db_type;
+	}
+
+	public void setDb_type(String db_type) {
+		this.db_type = db_type;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public String getG_center_point() {
+		return g_center_point;
+	}
+
+	public void setG_center_point(String g_center_point) {
+		this.g_center_point = g_center_point;
+	}
+
+	public String getG_park_point_wkt() {
+		return g_park_point_wkt;
+	}
+
+	public void setG_park_point_wkt(String g_park_point_wkt) {
+		this.g_park_point_wkt = g_park_point_wkt;
+	}
+
+	public Integer getRadius() {
+		return radius;
+	}
+
+	public void setRadius(Integer radius) {
+		this.radius = radius;
+	}
+
+	public String getShapes_type() {
+		return shapes_type;
+	}
+
+	public void setShapes_type(String shapes_type) {
+		this.shapes_type = shapes_type;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+
+import com.bsth.entity.Personnel;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusStaff implements Cloneable{
+
+
+	//所属分公司
+	private String branche_company;
+	//分公司编码
+	private String branche_company_code;
+	//所属公司		
+	private String company;
+	//公司编码
+	private String company_code;
+	//描述
+	private String descriptions;
+	//一卡通工作卡号
+	private String ic_card_code;
+	//工号（员工编号带公司编码前缀）
+	private String job_code;
+	//运营服务证书号
+	private String papers_code;
+	//姓名
+	private String personnel_name;
+	//性别 1-男 2-女
+	private String personnel_type;
+	//所属岗位/工种
+	private String posts;
+	//手机号
+	private String telphone;
+	//身份证
+	private String card;
+	//工号
+	private String job_codeori;
+	//创建日期
+	private Date create_date;
+	//更新日期
+	private Date update_date;
+
+
+	public static Personnel convert(BusStaff busStaff){
+		Personnel personnel = new Personnel();
+		personnel.setJobCodeori(busStaff.getJob_codeori());
+		personnel.setJobCode(busStaff.getJob_code());
+		personnel.setCompany(busStaff.getCompany());
+		personnel.setCompanyCode(busStaff.getCompany_code());
+		personnel.setBrancheCompany(busStaff.getBranche_company());
+		personnel.setBrancheCompanyCode(busStaff.getBranche_company_code());
+		personnel.setPersonnelName(busStaff.getPersonnel_name());
+		personnel.setPapersCode(busStaff.getPapers_code());
+		personnel.setIcCardCode(busStaff.getIc_card_code());
+		personnel.setPosts(busStaff.getPosts());
+		personnel.setCard(busStaff.getCard());
+		personnel.setDestroy(0);
+		return personnel;
+	}
+
+	public static List<Personnel> convert(List<BusStaff> busStaffs){
+		List<Personnel> list = new ArrayList<>();
+		for (BusStaff busStaff : busStaffs) {
+			list.add(convert(busStaff));
+		}
+		return list;
+	}
+
+	public String getBranche_company() {
+		return branche_company;
+	}
+
+	public void setBranche_company(String branche_company) {
+		this.branche_company = branche_company;
+	}
+
+	public String getBranche_company_code() {
+		return branche_company_code;
+	}
+
+	public void setBranche_company_code(String branche_company_code) {
+		this.branche_company_code = branche_company_code;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getCompany_code() {
+		return company_code;
+	}
+
+	public void setCompany_code(String company_code) {
+		this.company_code = company_code;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getIc_card_code() {
+		return ic_card_code;
+	}
+
+	public void setIc_card_code(String ic_card_code) {
+		this.ic_card_code = ic_card_code;
+	}
+
+	public String getJob_code() {
+		return job_code;
+	}
+
+	public void setJob_code(String job_code) {
+		this.job_code = job_code;
+	}
+
+	public String getPapers_code() {
+		return papers_code;
+	}
+
+	public void setPapers_code(String papers_code) {
+		this.papers_code = papers_code;
+	}
+
+	public String getPersonnel_name() {
+		return personnel_name;
+	}
+
+	public void setPersonnel_name(String personnel_name) {
+		this.personnel_name = personnel_name;
+	}
+
+	public String getPersonnel_type() {
+		return personnel_type;
+	}
+
+	public void setPersonnel_type(String personnel_type) {
+		this.personnel_type = personnel_type;
+	}
+
+	public String getPosts() {
+		return posts;
+	}
+
+	public void setPosts(String posts) {
+		this.posts = posts;
+	}
+
+	public String getTelphone() {
+		return telphone;
+	}
+
+	public void setTelphone(String telphone) {
+		this.telphone = telphone;
+	}
+
+	public String getCard() {
+		return card;
+	}
+
+	public void setCard(String card) {
+		this.card = card;
+	}
+
+	public String getJob_codeori() {
+		return job_codeori;
+	}
+
+	public void setJob_codeori(String job_codeori) {
+		this.job_codeori = job_codeori;
+	}
+
+	public Date getCreate_date() {
+		return create_date;
+	}
+
+	public void setCreate_date(Date create_date) {
+		this.create_date = create_date;
+	}
+
+	public Date getUpdate_date() {
+		return update_date;
+	}
+
+	public void setUpdate_date(Date update_date) {
+		this.update_date = update_date;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+
+import com.bsth.entity.Station;
+import com.bsth.util.GeoConverter;
+import org.geolatte.geom.Point;
+import org.geolatte.geom.codec.Wkt;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusStop implements Cloneable{
+
+
+	//站点编码
+	private String station_cod;
+	//站点名称
+	private String station_name;
+	//所在道路编码
+	private String road_coding;
+	//站址
+	private String STOP_ADDRESS;
+	//是否撤销<1：撤销;0：不撤销>
+	private Integer destroy=0;
+	//版本
+	private Integer versions;
+	//描述
+	private String descriptions;
+	//中心点 数字格式
+	private String centerPointWkt;
+
+	public static Station convert(BusStop busStop){
+		Station station = new Station();
+		station.setId(Integer.parseInt(busStop.getStation_cod()));
+		station.setStationCode(busStop.getStation_cod());
+		station.setStationName(busStop.getStation_name());
+		station.setRoadCoding(busStop.getRoad_coding());
+		station.setAddress(busStop.getSTOP_ADDRESS());
+		station.setDestroy(busStop.getDestroy());
+		station.setVersions(busStop.getVersions());
+		station.setDescriptions(busStop.getDescriptions());
+		station.setCreateDate(new java.sql.Date(new Date().getTime()));
+		station.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		if (!StringUtils.isEmpty(busStop.getCenterPointWkt())) {
+			Point baidu = (Point) Wkt.fromWkt(busStop.getCenterPointWkt());
+			Point wgs = GeoConverter.pointBd2wgs(busStop.getCenterPointWkt());
+			station.setCenterPoint(baidu);
+			station.setCenterPointWgs(wgs);
+		}
+		return station;
+	}
+
+	public static List<Station> convert(List<BusStop> busStops){
+		List<Station> list = new ArrayList<>();
+		for (BusStop busStop : busStops) {
+			list.add(convert(busStop));
+		}
+		return list;
+	}
+
+
+	public String getStation_cod() {
+		return station_cod;
+	}
+
+	public void setStation_cod(String station_cod) {
+		this.station_cod = station_cod;
+	}
+
+	public String getStation_name() {
+		return station_name;
+	}
+
+	public void setStation_name(String station_name) {
+		this.station_name = station_name;
+	}
+
+	public String getRoad_coding() {
+		return road_coding;
+	}
+
+	public void setRoad_coding(String road_coding) {
+		this.road_coding = road_coding;
+	}
+
+	public String getSTOP_ADDRESS() {
+		return STOP_ADDRESS;
+	}
+
+	public void setSTOP_ADDRESS(String STOP_ADDRESS) {
+		this.STOP_ADDRESS = STOP_ADDRESS;
+	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getCenterPointWkt() {
+		return centerPointWkt;
+	}
+
+	public void setCenterPointWkt(String centerPointWkt) {
+		this.centerPointWkt = centerPointWkt;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.*;
+import com.bsth.util.GeoConverter;
+import org.geolatte.geom.Point;
+import org.geolatte.geom.Polygon;
+import org.geolatte.geom.codec.Wkt;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusStopLevel implements Cloneable{
+
+
+	//线路基础信息编号
+	private String Line_base_id;
+	//站点id
+	private String station;
+	//站点名称
+	private String station_name;
+	//站点路由序号
+	private Integer station_route_code;
+	//线路编码
+	private String line_code;
+	//站点编码
+	private String station_code;
+	//站点类别<B：起点站;Z：中途站;E：终点站;T：停车场>
+	private String station_mark;
+	//站点路由出站序号
+	private Integer out_station_nmber;
+	//站点路由方向
+	private Integer directions;
+	//站点路由到站距离
+	private Double distances;
+	//站点路由到站时间
+	private Double to_time;
+	//首班时间
+	private String first_time;
+	//末班时间
+	private String end_time;
+	//描述
+	private String descriptions;
+	//是否撤销
+	private Integer destroy;
+	//版本
+	private Integer versions;
+	//创建人
+	private String create_by;
+	//创建日期
+	private Date create_date;
+	//修改人
+	private String update_by;
+	//修改日期
+	private Date update_date;
+	//行业编码
+	private String industry_code;
+	//与下一站距离（米）
+	private Double last_stop_distance;
+	//线路名称
+	private String line_name;
+	//缓冲区几何图形类型 d 多边形 r 圆形
+	private String shaped_type;
+	//缓冲区为圆形时的半径(米)
+	private Integer radius;
+	//多边形缓冲区坐标百度  POLYGON((lon lat, lon lat))
+	private String buffer_polygon_wkt;
+	//中心点 数字格式 百度
+	private String centerPointWkt;
+
+
+
+
+	public static StationRoute convert(BusStopLevel bsl){
+		StationRoute stationRoute = new StationRoute();
+		stationRoute.setStationRouteCode(bsl.getStation_route_code());
+		stationRoute.setStationCode(bsl.getStation_code());
+		Line line=new Line();
+		line.setId(Integer.parseInt(bsl.getLine_code()));
+		stationRoute.setLine(line);
+		Station station=new Station();
+		station.setId(Integer.parseInt(bsl.getStation_code()));
+		stationRoute.setStation(station);
+		stationRoute.setStationName(bsl.getStation_name());
+		stationRoute.setLineCode(bsl.getLine_code());
+		stationRoute.setStationMark(bsl.getStation_mark());
+		stationRoute.setDistances(bsl.getDistances());
+		stationRoute.setToTime(bsl.getTo_time());
+		stationRoute.setFirstTime(bsl.getFirst_time());
+		stationRoute.setEndTime(bsl.getEnd_time());
+		stationRoute.setDirections(bsl.getDirections());
+		stationRoute.setVersions(1);
+		stationRoute.setDestroy(bsl.getDestroy());
+		stationRoute.setDescriptions(bsl.getDescriptions());
+		stationRoute.setShapedType(bsl.getShaped_type());
+		stationRoute.setRadius(bsl.getRadius());
+		if (!StringUtils.isEmpty(bsl.getBuffer_polygon_wkt())) {
+			stationRoute.setBufferPolygon((Polygon) Wkt.fromWkt(bsl.getBuffer_polygon_wkt()));
+			stationRoute.setBufferPolygonWgs(GeoConverter.polygonBd2wgs(bsl.getBuffer_polygon_wkt()));
+		}
+		if (!StringUtils.isEmpty(bsl.getCenterPointWkt())) {
+			Point baidu = (Point) Wkt.fromWkt(bsl.getCenterPointWkt());
+			Point wgs = GeoConverter.pointBd2wgs(bsl.getCenterPointWkt());
+			stationRoute.setCenterPoint(baidu);
+			stationRoute.setCenterPointWgs(wgs);
+		}
+		stationRoute.setCreateDate(new java.sql.Date(new Date().getTime()));
+		stationRoute.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return stationRoute;
+	}
+
+	public static List<StationRoute> convert(List<BusStopLevel> busStopLevels){
+		List<StationRoute> list = new ArrayList<>();
+		for (BusStopLevel bsl : busStopLevels) {
+			list.add(convert(bsl));
+		}
+		return list;
+	}
+
+	public static LsStationRoute convertLS(BusStopLevel bsl){
+		LsStationRoute stationRoute = new LsStationRoute();
+		stationRoute.setStationRouteCode(bsl.getStation_route_code());
+		stationRoute.setStationCode(bsl.getStation_code());
+		Line line=new Line();
+		line.setId(Integer.parseInt(bsl.getLine_code()));
+		stationRoute.setLine(line);
+		Station station=new Station();
+		station.setId(Integer.parseInt(bsl.getStation_code()));
+		stationRoute.setStation(station);
+		stationRoute.setStationName(bsl.getStation_name());
+		stationRoute.setLineCode(bsl.getLine_code());
+		stationRoute.setStationMark(bsl.getStation_mark());
+		stationRoute.setDistances(bsl.getDistances());
+		stationRoute.setToTime(bsl.getTo_time());
+		stationRoute.setFirstTime(bsl.getFirst_time());
+		stationRoute.setEndTime(bsl.getEnd_time());
+		stationRoute.setDirections(bsl.getDirections());
+		stationRoute.setVersions(1);
+		stationRoute.setDestroy(bsl.getDestroy());
+		stationRoute.setDescriptions(bsl.getDescriptions());
+		stationRoute.setShapedType(bsl.getShaped_type());
+		stationRoute.setRadius(bsl.getRadius());
+		if (!StringUtils.isEmpty(bsl.getBuffer_polygon_wkt())) {
+			stationRoute.setBufferPolygon((Polygon) Wkt.fromWkt(bsl.getBuffer_polygon_wkt()));
+			stationRoute.setBufferPolygonWgs(GeoConverter.polygonBd2wgs(bsl.getBuffer_polygon_wkt()));
+		}
+		if (!StringUtils.isEmpty(bsl.getCenterPointWkt())) {
+			Point baidu = (Point) Wkt.fromWkt(bsl.getCenterPointWkt());
+			Point wgs = GeoConverter.pointBd2wgs(bsl.getCenterPointWkt());
+			stationRoute.setCenterPoint(baidu);
+			stationRoute.setCenterPointWgs(wgs);
+		}
+		stationRoute.setCreateDate(new java.sql.Date(new Date().getTime()));
+		stationRoute.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return stationRoute;
+	}
+
+	public static List<LsStationRoute> convertLS(List<BusStopLevel> busStopLevels){
+		List<LsStationRoute> list = new ArrayList<>();
+		for (BusStopLevel bsl : busStopLevels) {
+			list.add(convertLS(bsl));
+		}
+		return list;
+	}
+
+
+	public String getLine_base_id() {
+		return Line_base_id;
+	}
+
+	public void setLine_base_id(String line_base_id) {
+		Line_base_id = line_base_id;
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+
+	public String getStation_name() {
+		return station_name;
+	}
+
+	public void setStation_name(String station_name) {
+		this.station_name = station_name;
+	}
+
+	public Integer getStation_route_code() {
+		return station_route_code;
+	}
+
+	public void setStation_route_code(Integer station_route_code) {
+		this.station_route_code = station_route_code;
+	}
+
+	public String getLine_code() {
+		return line_code;
+	}
+
+	public void setLine_code(String line_code) {
+		this.line_code = line_code;
+	}
+
+	public String getStation_code() {
+		return station_code;
+	}
+
+	public void setStation_code(String station_code) {
+		this.station_code = station_code;
+	}
+
+	public String getStation_mark() {
+		return station_mark;
+	}
+
+	public void setStation_mark(String station_mark) {
+		this.station_mark = station_mark;
+	}
+
+	public Integer getOut_station_nmber() {
+		return out_station_nmber;
+	}
+
+	public void setOut_station_nmber(Integer out_station_nmber) {
+		this.out_station_nmber = out_station_nmber;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+
+	public Double getDistances() {
+		return distances;
+	}
+
+	public void setDistances(Double distances) {
+		this.distances = distances;
+	}
+
+	public Double getTo_time() {
+		return to_time;
+	}
+
+	public void setTo_time(Double to_time) {
+		this.to_time = to_time;
+	}
+
+	public String getFirst_time() {
+		return first_time;
+	}
+
+	public void setFirst_time(String first_time) {
+		this.first_time = first_time;
+	}
+
+	public String getEnd_time() {
+		return end_time;
+	}
+
+	public void setEnd_time(String end_time) {
+		this.end_time = end_time;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+
+	public String getCreate_by() {
+		return create_by;
+	}
+
+	public void setCreate_by(String create_by) {
+		this.create_by = create_by;
+	}
+
+	public Date getCreate_date() {
+		return create_date;
+	}
+
+	public void setCreate_date(Date create_date) {
+		this.create_date = create_date;
+	}
+
+	public String getUpdate_by() {
+		return update_by;
+	}
+
+	public void setUpdate_by(String update_by) {
+		this.update_by = update_by;
+	}
+
+	public Date getUpdate_date() {
+		return update_date;
+	}
+
+	public void setUpdate_date(Date update_date) {
+		this.update_date = update_date;
+	}
+
+	public String getIndustry_code() {
+		return industry_code;
+	}
+
+	public void setIndustry_code(String industry_code) {
+		this.industry_code = industry_code;
+	}
+
+	public Double getLast_stop_distance() {
+		return last_stop_distance;
+	}
+
+	public void setLast_stop_distance(Double last_stop_distance) {
+		this.last_stop_distance = last_stop_distance;
+	}
+
+	public String getLine_name() {
+		return line_name;
+	}
+
+	public void setLine_name(String line_name) {
+		this.line_name = line_name;
+	}
+
+	public String getShaped_type() {
+		return shaped_type;
+	}
+
+	public void setShaped_type(String shaped_type) {
+		this.shaped_type = shaped_type;
+	}
+
+	public Integer getRadius() {
+		return radius;
+	}
+
+	public void setRadius(Integer radius) {
+		this.radius = radius;
+	}
+
+	public String getBuffer_polygon_wkt() {
+		return buffer_polygon_wkt;
+	}
+
+	public void setBuffer_polygon_wkt(String buffer_polygon_wkt) {
+		this.buffer_polygon_wkt = buffer_polygon_wkt;
+	}
+
+	public String getCenterPointWkt() {
+		return centerPointWkt;
+	}
+
+	public void setCenterPointWkt(String centerPointWkt) {
+		this.centerPointWkt = centerPointWkt;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+import com.bsth.entity.Cars;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class BusVeh implements Cloneable{
+
+	//
+	private int id;
+	//公司编号
+	private String COMPANY_ID;
+	//分公司名称
+	private String branche_company;
+	//分公司代码
+	private String branche_company_code;
+	//公司代码
+	private String business_code;
+	//车型
+	private String car_class;
+	//车辆编码
+	private String car_code;
+	//车牌
+	private String car_plate;
+	//座位数
+	private Integer car_seatn_number;
+	//车辆标准
+	private String car_standard;
+	//车辆类型
+	private String car_type;
+	//公司名
+	private String company;
+	//创建日期
+	private Date create_date;
+	//描述
+	private String descriptions;
+	//引擎编码1
+	private String engine_code_one;
+	//引擎编码2
+	private String engine_code_two;
+	//设备编码
+	private String equipment_code;
+	//内部编码
+	private String inside_code;
+	//报废编码
+	private String scrap_code;
+	//报废日期
+	private Date scrap_date;
+	//报废状态
+	private Integer scrap_state;
+	//是否电车
+	private Integer sfdc;
+	//供应商
+	private String supplier_name;
+	//售票类型
+	private Integer ticket_type;
+	//更新日期
+	private Date update_date;
+	//能源类型
+	private Integer ny_type;
+
+	public static Cars convert(BusVeh bv){
+		Cars cars=new Cars();
+		cars.setInsideCode(bv.getInside_code());
+		cars.setBusinessCode(bv.getBusiness_code());
+		cars.setCompany(bv.getCompany());
+		cars.setBrancheCompanyCode(bv.getBranche_company_code());
+		cars.setBrancheCompany(bv.getBranche_company());
+		cars.setCarCode(bv.getCar_code());
+		cars.setCarPlate(bv.getCar_plate());
+		cars.setSupplierName(bv.getSupplier_name());
+		cars.setEquipmentCode(bv.getEquipment_code());
+		cars.setCarClass(bv.getCar_class());
+		cars.setCarSeatnNumber(bv.getCar_seatn_number());
+		cars.setCarStandard(bv.getCar_standard());
+		cars.setScrapCode(bv.getScrap_code());
+		cars.setScrapDate(bv.getScrap_date());
+		cars.setMakeCodeOne(bv.getEngine_code_one());
+		cars.setMakeCodeTwo(bv.getEngine_code_two());
+		cars.setEngineCodeOne(bv.getEngine_code_one());
+		cars.setEngineCodeTwo(bv.getEngine_code_two());
+		cars.setCarType(bv.getCar_type());
+		cars.setSfdc((bv.getSfdc()==null||bv.getSfdc()==0)?false:true);
+		cars.setDescriptions(bv.getDescriptions());
+		cars.setScrapState((bv.getScrap_state()==null||bv.getScrap_state()==0)?false:true);
+		cars.setCreateDate(new java.sql.Date(new Date().getTime()));
+		cars.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		cars.setHydrogen(false);
+		return cars;
+	}
+
+	public static List<Cars> convert(List<BusVeh> busVehs){
+		List<Cars> list = new ArrayList<>();
+		for (BusVeh busVeh : busVehs) {
+			list.add(convert(busVeh));
+		}
+		return list;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getCOMPANY_ID() {
+		return COMPANY_ID;
+	}
+
+	public void setCOMPANY_ID(String COMPANY_ID) {
+		this.COMPANY_ID = COMPANY_ID;
+	}
+
+	public String getBranche_company() {
+		return branche_company;
+	}
+
+	public void setBranche_company(String branche_company) {
+		this.branche_company = branche_company;
+	}
+
+	public String getBranche_company_code() {
+		return branche_company_code;
+	}
+
+	public void setBranche_company_code(String branche_company_code) {
+		this.branche_company_code = branche_company_code;
+	}
+
+	public String getBusiness_code() {
+		return business_code;
+	}
+
+	public void setBusiness_code(String business_code) {
+		this.business_code = business_code;
+	}
+
+	public String getCar_class() {
+		return car_class;
+	}
+
+	public void setCar_class(String car_class) {
+		this.car_class = car_class;
+	}
+
+	public String getCar_code() {
+		return car_code;
+	}
+
+	public void setCar_code(String car_code) {
+		this.car_code = car_code;
+	}
+
+	public String getCar_plate() {
+		return car_plate;
+	}
+
+	public void setCar_plate(String car_plate) {
+		this.car_plate = car_plate;
+	}
+
+	public Integer getCar_seatn_number() {
+		return car_seatn_number;
+	}
+
+	public void setCar_seatn_number(Integer car_seatn_number) {
+		this.car_seatn_number = car_seatn_number;
+	}
+
+	public String getCar_standard() {
+		return car_standard;
+	}
+
+	public void setCar_standard(String car_standard) {
+		this.car_standard = car_standard;
+	}
+
+	public String getCar_type() {
+		return car_type;
+	}
+
+	public void setCar_type(String car_type) {
+		this.car_type = car_type;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public Date getCreate_date() {
+		return create_date;
+	}
+
+	public void setCreate_date(Date create_date) {
+		this.create_date = create_date;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getEngine_code_one() {
+		return engine_code_one;
+	}
+
+	public void setEngine_code_one(String engine_code_one) {
+		this.engine_code_one = engine_code_one;
+	}
+
+	public String getEngine_code_two() {
+		return engine_code_two;
+	}
+
+	public void setEngine_code_two(String engine_code_two) {
+		this.engine_code_two = engine_code_two;
+	}
+
+	public String getEquipment_code() {
+		return equipment_code;
+	}
+
+	public void setEquipment_code(String equipment_code) {
+		this.equipment_code = equipment_code;
+	}
+
+	public String getInside_code() {
+		return inside_code;
+	}
+
+	public void setInside_code(String inside_code) {
+		this.inside_code = inside_code;
+	}
+
+	public String getScrap_code() {
+		return scrap_code;
+	}
+
+	public void setScrap_code(String scrap_code) {
+		this.scrap_code = scrap_code;
+	}
+
+	public Date getScrap_date() {
+		return scrap_date;
+	}
+
+	public void setScrap_date(Date scrap_date) {
+		this.scrap_date = scrap_date;
+	}
+
+	public Integer getScrap_state() {
+		return scrap_state;
+	}
+
+	public void setScrap_state(Integer scrap_state) {
+		this.scrap_state = scrap_state;
+	}
+
+	public Integer getSfdc() {
+		return sfdc;
+	}
+
+	public void setSfdc(Integer sfdc) {
+		this.sfdc = sfdc;
+	}
+
+	public String getSupplier_name() {
+		return supplier_name;
+	}
+
+	public void setSupplier_name(String supplier_name) {
+		this.supplier_name = supplier_name;
+	}
+
+	public Integer getTicket_type() {
+		return ticket_type;
+	}
+
+	public void setTicket_type(Integer ticket_type) {
+		this.ticket_type = ticket_type;
+	}
+
+	public Date getUpdate_date() {
+		return update_date;
+	}
+
+	public void setUpdate_date(Date update_date) {
+		this.update_date = update_date;
+	}
+
+	public Integer getNy_type() {
+		return ny_type;
+	}
+
+	public void setNy_type(Integer ny_type) {
+		this.ny_type = ny_type;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+
+import com.bsth.entity.Section;
+import com.bsth.util.GeoConverter;
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.codec.Wkt;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class RoadSection implements Cloneable{
+	//路段编码
+	private String section_code;
+	//路段名称
+	private String section_name;
+	//交叉路
+	private String croses_road;
+	//终止节点
+	private String end_node;
+	//起始节点
+	private String start_node;
+	//中间节点
+	private String middle_node;
+	//路段类型
+	private String section_type;
+	//路段矢量(空间坐标点集合)--城建坐标点
+	private String csection_vector;
+	//路段矢量(空间坐标点集合)--百度原始坐标坐标点
+	private String bsectionVectorWkt;
+	//路段矢量(空间坐标点集合)--GPS坐标点
+	private String gsectionVectorWkt;
+	//道路编码
+	private String road_coding;
+	//路段距离
+	private Double section_distance;
+	//路段时间
+	private Double section_time;
+	//经纬坐标类型
+	private String db_type;
+	//限速
+	private Double speed_limit;
+	//描述
+	private String descriptions;
+	//版本号
+	private Integer versions;
+
+
+
+	public static Section convert(RoadSection rs){
+		Section section = new Section();
+		section.setId(Integer.parseInt(rs.getSection_code()));
+		section.setSectionCode(rs.getSection_code());
+		section.setRoadCoding(rs.getRoad_coding());
+		section.setSectionName(rs.getSection_name());
+		section.setSectionDistance(rs.getSection_distance());
+		section.setSectionTime(rs.getSection_time());
+		section.setDbType(rs.getDb_type());
+		section.setSectionType(rs.getSection_type());
+		section.setCrosesRoad(rs.getCroses_road());
+		section.setStartNode(rs.getStart_node());
+		section.setMiddleNode(rs.getMiddle_node());
+		section.setEndNode(rs.getEnd_node());
+		section.setSpeedLimit(rs.getSpeed_limit());
+		section.setVersions(rs.getVersions());
+		section.setDescriptions(rs.getDescriptions());
+		if (!StringUtils.isEmpty(rs.getBsectionVectorWkt())) {
+			section.setBsectionVector((LineString) Wkt.fromWkt(rs.getBsectionVectorWkt()));
+			section.setGsectionVector(GeoConverter.lineStringBd2wgs(rs.getBsectionVectorWkt()));
+		}
+		section.setCreateDate(new java.sql.Date(new Date().getTime()));
+		section.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return section;
+	}
+
+	public static List<Section> convert(List<RoadSection> roadSections){
+		List<Section> list = new ArrayList<>();
+		for (RoadSection roadSection : roadSections) {
+			list.add(convert(roadSection));
+		}
+		return list;
+	}
+
+
+	public String getSection_code() {
+		return section_code;
+	}
+
+	public void setSection_code(String section_code) {
+		this.section_code = section_code;
+	}
+
+	public String getSection_name() {
+		return section_name;
+	}
+
+	public void setSection_name(String section_name) {
+		this.section_name = section_name;
+	}
+
+	public String getCroses_road() {
+		return croses_road;
+	}
+
+	public void setCroses_road(String croses_road) {
+		this.croses_road = croses_road;
+	}
+
+	public String getEnd_node() {
+		return end_node;
+	}
+
+	public void setEnd_node(String end_node) {
+		this.end_node = end_node;
+	}
+
+	public String getStart_node() {
+		return start_node;
+	}
+
+	public void setStart_node(String start_node) {
+		this.start_node = start_node;
+	}
+
+	public String getMiddle_node() {
+		return middle_node;
+	}
+
+	public void setMiddle_node(String middle_node) {
+		this.middle_node = middle_node;
+	}
+
+	public String getSection_type() {
+		return section_type;
+	}
+
+	public void setSection_type(String section_type) {
+		this.section_type = section_type;
+	}
+
+	public String getCsection_vector() {
+		return csection_vector;
+	}
+
+	public void setCsection_vector(String csection_vector) {
+		this.csection_vector = csection_vector;
+	}
+
+	public String getBsectionVectorWkt() {
+		return bsectionVectorWkt;
+	}
+
+	public void setBsectionVectorWkt(String bsectionVectorWkt) {
+		this.bsectionVectorWkt = bsectionVectorWkt;
+	}
+
+	public String getGsectionVectorWkt() {
+		return gsectionVectorWkt;
+	}
+
+	public void setGsectionVectorWkt(String gsectionVectorWkt) {
+		this.gsectionVectorWkt = gsectionVectorWkt;
+	}
+
+	public String getRoad_coding() {
+		return road_coding;
+	}
+
+	public void setRoad_coding(String road_coding) {
+		this.road_coding = road_coding;
+	}
+
+	public Double getSection_distance() {
+		return section_distance;
+	}
+
+	public void setSection_distance(Double section_distance) {
+		this.section_distance = section_distance;
+	}
+
+	public Double getSection_time() {
+		return section_time;
+	}
+
+	public void setSection_time(Double section_time) {
+		this.section_time = section_time;
+	}
+
+	public String getDb_type() {
+		return db_type;
+	}
+
+	public void setDb_type(String db_type) {
+		this.db_type = db_type;
+	}
+
+	public Double getSpeed_limit() {
+		return speed_limit;
+	}
+
+	public void setSpeed_limit(Double speed_limit) {
+		this.speed_limit = speed_limit;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+}
+package com.bsth.data.commonData.entity;
+
+
+
+import com.bsth.entity.Line;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.Section;
+import com.bsth.entity.SectionRoute;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+public class RoadSectionLevel implements Cloneable{
+
+	//线路编码
+	private String line_code;
+	//路段编码
+	private String section_code;
+	//路段路由序号
+	private String sectionroute_code;
+	//路段路由方向
+	private Integer directions;
+	//线路基础信息编号
+	private String line_base_id;
+	//路段信息(id)
+	private String section;
+	//描述
+	private String descriptions;
+	//版本号
+	private Integer versions;
+	//是否撤销 0-否，1-是
+	private Integer destroy;
+	//是否有路段限速数据  0-分段；1-未分段
+	private Integer is_roade_speed;
+	//线路名称
+	private String line_name;
+	//路段名称
+	private String section_name;
+
+
+	public static SectionRoute convert(RoadSectionLevel rsl){
+		SectionRoute sectionRoute = new SectionRoute();
+		sectionRoute.setSectionrouteCode(Integer.parseInt(rsl.getSectionroute_code()));
+		sectionRoute.setLineCode(rsl.getLine_code());
+		sectionRoute.setSectionCode(rsl.getSection_code());
+		sectionRoute.setDirections(rsl.getDirections());
+		sectionRoute.setVersions(1);
+		sectionRoute.setDestroy(rsl.getDestroy());
+		sectionRoute.setIsRoadeSpeed(rsl.getIs_roade_speed());
+		sectionRoute.setDescriptions(rsl.getDescriptions());
+		Section section = new Section();
+		section.setId(Integer.parseInt(rsl.getSection()));
+		sectionRoute.setSection(section);
+		Line line = new Line();
+		line.setId(Integer.parseInt(rsl.getLine_code()));
+		sectionRoute.setLine(line);
+		sectionRoute.setCreateDate(new java.sql.Date(new Date().getTime()));
+		sectionRoute.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return sectionRoute;
+	}
+
+	public static List<SectionRoute> convert(List<RoadSectionLevel> roadSectionLevels){
+		List<SectionRoute> list = new ArrayList<>();
+		for (RoadSectionLevel roadSectionLevel : roadSectionLevels) {
+			list.add(convert(roadSectionLevel));
+		}
+		return list;
+	}
+
+	public static LsSectionRoute convertLS(RoadSectionLevel rsl){
+		LsSectionRoute sectionRoute = new LsSectionRoute();
+		sectionRoute.setSectionrouteCode(Integer.parseInt(rsl.getSectionroute_code()));
+		sectionRoute.setLineCode(rsl.getLine_code());
+		sectionRoute.setSectionCode(rsl.getSection_code());
+		sectionRoute.setDirections(rsl.getDirections());
+		sectionRoute.setVersions(1);
+		sectionRoute.setDestroy(rsl.getDestroy());
+		sectionRoute.setIsRoadeSpeed(rsl.getIs_roade_speed());
+		sectionRoute.setDescriptions(rsl.getDescriptions());
+		Section section = new Section();
+		section.setId(Integer.parseInt(rsl.getSection()));
+		sectionRoute.setSection(section);
+		Line line = new Line();
+		line.setId(Integer.parseInt(rsl.getLine_code()));
+		sectionRoute.setLine(line);
+		sectionRoute.setCreateDate(new java.sql.Date(new Date().getTime()));
+		sectionRoute.setUpdateDate(new java.sql.Date(new Date().getTime()));
+		return sectionRoute;
+	}
+
+	public static List<LsSectionRoute> convertLS(List<RoadSectionLevel> roadSectionLevels){
+		List<LsSectionRoute> list = new ArrayList<>();
+		for (RoadSectionLevel roadSectionLevel : roadSectionLevels) {
+			list.add(convertLS(roadSectionLevel));
+		}
+		return list;
+	}
+
+	public String getLine_code() {
+		return line_code;
+	}
+
+	public void setLine_code(String line_code) {
+		this.line_code = line_code;
+	}
+
+	public String getSection_code() {
+		return section_code;
+	}
+
+	public void setSection_code(String section_code) {
+		this.section_code = section_code;
+	}
+
+	public String getSectionroute_code() {
+		return sectionroute_code;
+	}
+
+	public void setSectionroute_code(String sectionroute_code) {
+		this.sectionroute_code = sectionroute_code;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+
+	public String getLine_base_id() {
+		return line_base_id;
+	}
+
+	public void setLine_base_id(String line_base_id) {
+		this.line_base_id = line_base_id;
+	}
+
+	public String getSection() {
+		return section;
+	}
+
+	public void setSection(String section) {
+		this.section = section;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public Integer getIs_roade_speed() {
+		return is_roade_speed;
+	}
+
+	public void setIs_roade_speed(Integer is_roade_speed) {
+		this.is_roade_speed = is_roade_speed;
+	}
+
+	public String getLine_name() {
+		return line_name;
+	}
+
+	public void setLine_name(String line_name) {
+		this.line_name = line_name;
+	}
+
+	public String getSection_name() {
+		return section_name;
+	}
+
+	public void setSection_name(String section_name) {
+		this.section_name = section_name;
+	}
+}
@@ -103,11 +103,15 @@ public class JDInterface {
             //人员投入
             int jhrytl=culateService.culateJhry(schList,"");
             int sjrytl=culateService.culateSjry(schList,"");
-            BigDecimal rytl=BigDecimal.valueOf(100);
+            BigDecimal rytlbfb=BigDecimal.valueOf(100);
             if(jhrytl>0){
-                rytl=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
+                rytlbfb=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
             }
-            data.put("rytl",rytl.setScale(2,BigDecimal.ROUND_HALF_UP));
+            Map<String,Object> rytl=new HashMap<>();
+            rytl.put("jhrytl",jhrytl);
+            rytl.put("sjrytl",sjrytl);
+            rytl.put("rytl",rytlbfb.setScale(2,BigDecimal.ROUND_HALF_UP));
+            data.put("rytl",rytl);
  
             //车辆投入
             Map<String,Object> cltl=new HashMap<>();
@@ -117,6 +121,8 @@ public class JDInterface {
             if(jh_z>0){
                 cltl_z=BigDecimal.valueOf((double)sj_z/jh_z*100);
             }
+            cltl.put("jh_z",jh_z);
+            cltl.put("sj_z",sj_z);
             cltl.put("cltl_z",cltl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             int jh_w=culateService.culateJhcl(schList,"wgf");
@@ -125,6 +131,8 @@ public class JDInterface {
             if(jh_w>0){
                 cltl_w=BigDecimal.valueOf((double)sj_w/jh_w*100);
             }
+            cltl.put("jh_w",jh_w);
+            cltl.put("sj_w",sj_w);
             cltl.put("cltl_w",cltl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             int jh_q=culateService.culateJhcl(schList,"");
@@ -133,6 +141,8 @@ public class JDInterface {
             if(jh_q>0){
                 cltl_q=BigDecimal.valueOf((double)sj_q/jh_q*100);
             }
+            cltl.put("jh_q",jh_q);
+            cltl.put("sj_q",sj_q);
             cltl.put("cltl_q",cltl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             data.put("cltl",cltl);
@@ -145,6 +155,8 @@ public class JDInterface {
             if(jhbctl_z>0){
                 bctl_z=BigDecimal.valueOf((double)sjbctl_z/jhbctl_z*100);
             }
+            bctl.put("jhbctl_z",jhbctl_z);
+            bctl.put("sjbctl_z",sjbctl_z);
             bctl.put("bctl_z",bctl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             int jhbctl_w=culateService.culateJhbc(schList,"wgf");
@@ -153,6 +165,8 @@ public class JDInterface {
             if(jhbctl_w>0){
                 bctl_w=BigDecimal.valueOf((double)sjbctl_w/jhbctl_w*100);
             }
+            bctl.put("jhbctl_w",jhbctl_w);
+            bctl.put("sjbctl_w",sjbctl_w);
             bctl.put("bctl_w",bctl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             int jhbctl_q=culateService.culateJhbc(schList,"");
@@ -161,6 +175,8 @@ public class JDInterface {
             if(jhbctl_q>0){
                 bctl_q=BigDecimal.valueOf((double)sjbctl_q/jhbctl_q*100);
             }
+            bctl.put("jhbctl_q",jhbctl_q);
+            bctl.put("sjbctl_q",sjbctl_q);
             bctl.put("bctl_q",bctl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
  
             data.put("bctl",bctl);
 package com.bsth.repository;
  
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
 import com.bsth.entity.Business;
  
+import java.util.Date;
 import java.util.List;
  
 /**
@@ -32,4 +34,11 @@ public interface BusinessRepository extends BaseRepository&lt;Business, Integer&gt; {
  
     @Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_business) k" , nativeQuery=true)
 	long getMaxId();
+
+    @Modifying
+    @Query(value = "UPDATE Business b set b.businessName=?1 , b.upCode=?2, b.updateDate=?3 "
+            + "where b.businessCode=?4")
+    int update(String businessName, String upCode, Date updateDate,
+               String businessCode);
+
 }
 package com.bsth.repository;
  
+import java.util.Date;
 import java.util.List;
  
 import org.springframework.data.jpa.repository.Modifying;
@@ -36,7 +37,7 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
     			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,ST_GeomFromText(?14), ?15, " +
  
     			 "?16, ST_GeomFromText(?17), ?18,?19)", nativeQuery=true)
-	public void carParkSave(Double area,String company,String parkCode,String parkName,
+	public int carParkSave(Double area,String company,String parkCode,String parkName,
  
 							String brancheCompany,Integer createBy,String createDate,String descriptions,Integer destroy,
  
@@ -113,4 +114,32 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
  
 	@Query(value ="select c.id, c.area,c.company,c.park_code,c.park_name,c.branche_company,c.create_by,c.create_date,c.descriptions,c.destroy,c.update_by,c.update_date,c.versions,c.b_center_point,ST_AsText(c.b_park_point) b_park_point,c.g_center_point,ST_AsText(c.g_park_point) g_park_point,c.db_type,c.radius,c.shapes_type from bsth_c_line_information l left join bsth_c_car_park c on l.car_park = c.park_code  where l.line = ?1", nativeQuery=true)
 	CarPark findByLineId(int  lineId);
+
+	@Transactional
+	@Modifying
+	@Query(value="UPDATE bsth_c_car_park SET " +
+			"area =  ?1 , " +
+			"company = ?2  , " +
+			"park_name = ?3  , " +
+			"branche_company =  ?4  , " +
+			"descriptions =  ?5  , " +
+			"destroy = ?6  , " +
+			"update_date =?7  , " +
+			"versions = ?8  , " +
+			"b_center_point = ?9  , " +
+			"g_center_point = ?10 , " +
+			"b_park_point = ST_GeomFromText(?11)  , " +
+			"g_park_point = ST_GeomFromText(?12)  , " +
+			"db_type = ?13  , " +
+			"radius = ?14  , " +
+			"shapes_type = ?15  " +
+			" WHERE park_code = ?16   ", nativeQuery=true)
+	public int update(double area, String company, String parkName, String brancheCompany,
+
+					   String descriptions, Integer destroy, Date updateDate, Integer versions, String bCenterPoint,
+
+					   String gCenterPoint, String bParkPoint,
+
+					   String gParkPoint, String dbType, Integer radius, String shapesType, String parkCode );
+
 }
 package com.bsth.repository;
  
+import java.util.Date;
 import java.util.List;
  
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
@@ -18,4 +20,15 @@ public interface CarsRepository extends BaseRepository&lt;Cars, Integer&gt;{
  
 	@Query(value="select s from Cars s where s.insideCode=?1")
 	List<Cars> findCarsByCode(String insideCode);
+
+	@Modifying
+	@Query(value = "UPDATE Cars s set s.businessCode=?1 , s.company=?2, s.brancheCompany=?3,  s.brancheCompanyCode=?4, "
+			+ "s.carCode=?5, s.carPlate=?6, s.supplierName=?7, s.equipmentCode=?8, s.carClass=?9, s.carSeatnNumber=?10,"
+			+ "s.carStandard=?11, s.scrapCode=?12, s.scrapDate=?13, s.makeCodeOne=?14, s.makeCodeTwo=?15, s.engineCodeOne=?16,"
+			+ "s.engineCodeTwo=?17, s.carType=?18, s.sfdc=?19, s.descriptions=?20, s.scrapState=?21 "
+			+ "where s.insideCode=?22")
+	int update(String businessCode, String company, String brancheCompany, String brancheCompanyCode,
+			   String carCode, String carPlate, String supplierName, String equipmentCode, String carClass, Integer carSeatnNumber,
+			   String carStandard, String scrapCode, Date scrapDate, String makeCodeOne, String makeCodeTwo, String engineCodeOne,
+			   String engineCodeTwo, String carType, Boolean sfdc, String descriptions, Boolean scrapState, String insideCode);
 }
@@ -2,6 +2,7 @@ package com.bsth.repository;
  
 import java.util.List;
  
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
@@ -31,4 +32,26 @@ public interface LineInformationRepository extends BaseRepository&lt;LineInformatio
 	List<LineInformation> findByLine(List<String> lineCodes);
  
 	List<LineInformation> findByLine(Line line);
+
+	@Query(value="select i from LineInformation i where i.line.lineCode=?1")
+	List<LineInformation> findLineInformationByLineCode(String lineCode);
+
+	@Modifying
+	@Query(value = "UPDATE LineInformation i set i.type=?1 , i.totalMileage=?2, i.emptyMileage=?3,  i.upMileage=?4, "
+			+ "i.downMileage=?5, i.upTravelTime=?6, i.downTravelTime=?7, i.earlyStartTime=?8, i.earlyEndTime=?9, i.lateStartTime=?10, "
+			+ "i.lateEndTime=?11, i.xygfkssj=?12, i.xygfjssj=?13, i.earlyUpTime=?14, i.earlyDownTime=?15, i.lateUpTime=?16, "
+			+ "i.lateDownTime=?17, i.nightStartTime=?18, i.nightEndTime=?19, i.troughUpTime=?20, i.troughDownTime=?21, i.carPark=?22, "
+			+ "i.upInTimer=?23, i.upOutTimer=?24, i.downInTimer=?25, i.downOutTimer=?26, i.earlyIntervalLg=?27, i.lateIntervalLg=?28, "
+			+ "i.intervalLg=?29, i.speedLimit=?30, i.rainLimit=?31, i.fogLimit=?32, i.snowLimit=?33, i.festivalSpeedLimit=?34, "
+			+ "i.lagStation=?35, i.skip=?36, i.speeding=?37, i.crossedLine=?38, i.overflights=?39, i.descriptions=?40 "
+			+ "where i.line.id=?41")
+	int update(String type, Double totalMileage, Double emptyMileage, Double upMileage,
+			   Double downMileage, Double upTravelTime, Double downTravelTime, String earlyStartTime, String earlyEndTime,String lateStartTime,
+			   String lateEndTime, String xygfkssj, String xygfjssj, Double earlyUpTime, Double earlyDownTime,Double lateUpTime,
+			   Double lateDownTime, Double nightStartTime, Double nightEndTime, Double troughUpTime, Double troughDownTime,String carPark,
+			   Double upInTimer, Double upOutTimer, Double downInTimer, Double downOutTimer, Double earlyIntervalLg,Double lateIntervalLg,
+			   Double intervalLg, Double speedLimit, Double rainLimit, Double fogLimit, Double snowLimit,Double festivalSpeedLimit,
+			   Integer lagStation, Integer skip, Integer speeding, Integer crossedLine, Integer overflights,String descriptions,
+			   int lineId);
+
 }
@@ -3,6 +3,7 @@ package com.bsth.repository;
 import java.util.List;
  
 import com.bsth.entity.Personnel;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
@@ -17,4 +18,15 @@ public interface PersonnelRepository extends BaseRepository&lt;Personnel, Integer&gt; 
  
 	@Query(value="select s from Personnel s where s.id in(select e.spy.id from EmployeeConfigInfo e where e.xl.id = ?1) ")
 	List<Personnel> findSpysByLineId(Integer lineId);
+
+	@Query(value="select s from Personnel s where s.jobCodeori=?1")
+	List<Personnel> findPersonnelByCode(String jobCodeori);
+
+	@Modifying
+	@Query(value = "UPDATE Personnel s set s.company=?1 , s.companyCode=?2, s.brancheCompany=?3,  s.brancheCompanyCode=?4, "
+			+ "s.personnelName=?5, s.papersCode=?6, s.icCardCode=?7, s.posts=?8, s.card=?9, s.jobCode=?10 "
+			+ "where s.jobCodeori=?11")
+	int update(String company, String companyCode, String brancheCompany, String brancheCompanyCode,
+			   String personnelName, String papersCode, String icCardCode, String posts, String card,String jobCode,
+			   String jobCodeori);
 }
 package com.bsth.repository;
  
+import com.bsth.entity.Personnel;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -172,4 +173,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 	@Query(value = "SELECT AsText(s.bsection_vector) as section,r.directions as dir FROM bsth_c_section s left join bsth_c_sectionroute r on s.section_code = r.section_code " +
 			"where r.line = ?1 and directions = ?2 ORDER BY r.directions,r.sectionroute_code ",nativeQuery = true)
 	List<Object[]> getSectionDirByLineId(Integer lineId , Integer directions);
+
+	@Query(value="select s from Section s where s.sectionCode=?1")
+	List<Section> findSectionByCode(String sectionCode);
 }
@@ -2,6 +2,8 @@ package com.bsth.repository;
  
 import java.util.List;
  
+import com.bsth.entity.Personnel;
+import org.geolatte.geom.Point;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -45,4 +47,16 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
  
 	@Query(value = "SELECT ST_AsText(b.buffer_polygon_wgs) g_polygon_grid, b.shaped_type,CONCAT(ST_X(a.center_point), ' ', ST_Y(a.center_point)) g_center_point , b.radius, a.station_code, b.station_name FROM bsth_c_station a JOIN bsth_c_stationroute b ON a.id = b.station WHERE b.line_code = ?1 AND a.station_code = ?2", nativeQuery = true)
 	Object[][] findBufferArea(String lineCode, String stationCode);
+
+	@Modifying
+	@Query(value = "UPDATE Station s set s.stationName=?1 , s.roadCoding=?2, s.address=?3,  s.destroy=?4, "
+			+ "s.versions=?5, s.descriptions=?6, s.centerPoint=?7, s.centerPointWgs=?8 "
+			+ "where s.stationCode=?9")
+	int update(String stationName, String roadCoding, String address, Integer destroy,
+			   Integer versions, String descriptions, Point centerPoint, Point centerPointWgs,
+			   String stationCode);
+
+	@Query(value="select s from Station s where s.stationCode=?1")
+	List<Station> findStationByStationCode(String stationCode);
+
 }
 package com.bsth.service;
  
 import com.bsth.entity.Business;
+import java.util.Map;
  
 /**
  * 
@@ -19,4 +20,6 @@ import com.bsth.entity.Business;
  */
 public interface BusinessService extends BaseService<Business, Integer> {
 	long getCompCode();
+
+	Map<String, Object> update(Business business);
 }
@@ -32,4 +32,9 @@ public interface CarParkService extends BaseService&lt;CarPark, Integer&gt; {
  	boolean selectTccInfoByCode(Map<String, Object> map);
  
 	long carParkMaxId();
+
+	Map<String, Object> update(CarPark carPark);
+
+	Map<String, Object> save(CarPark carPark);
+
 }
 package com.bsth.service;
  
 import java.util.List;
+import java.util.Map;
  
 import com.bsth.entity.LineInformation;
  
@@ -23,4 +24,6 @@ import com.bsth.entity.LineInformation;
 public interface LineInformationService extends BaseService<LineInformation, Integer> {
  
 	List<LineInformation> findByLine(String lineCodes);
+
+	Map<String, Object> update(LineInformation lineInformation);
 }
@@ -10,4 +10,5 @@ import com.bsth.entity.Personnel;
  */
 public interface PersonnelService extends BaseService<Personnel, Integer> {
 	List<Map<String, String>> sreachPersonnel(String jobCode);
+	Map<String, Object> update(Personnel personnel);
 }
@@ -57,4 +57,6 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	 * @return
 	 */
 	List<Station> findStationByName(String stationName);
+
+	Map<String, Object> update(Station station);
 }
 package com.bsth.service.impl;
  
+import com.bsth.common.ResponseCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
 import com.bsth.entity.Business;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.service.BusinessService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * 
@@ -33,4 +38,19 @@ public class BusinessServiceImpl extends BaseServiceImpl&lt;Business, Integer&gt; impl
 		return businessRepository.getMaxId();
 	}
  
+	@Transactional
+	@Override
+	public Map<String, Object> update(Business b) {
+		Map<String, Object> map = new HashMap<>();
+		int status = businessRepository.update(b.getBusinessName(), b.getUpCode(), b.getUpdateDate(),
+				b.getBusinessCode());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
+
 }
@@ -16,8 +16,9 @@ import com.bsth.util.CoordinateConverter.Location;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
  
- 
 @Service
 public class CarParkServiceImpl extends BaseServiceImpl<CarPark, Integer> implements CarParkService {
  
@@ -280,4 +281,40 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 	public long carParkMaxId() {
 		return carParkRepository.carParkMaxId();
 	}
+
+
+
+	@Transactional
+	@Override
+	public Map<String, Object> save(CarPark c) {
+		Map<String, Object> map = new HashMap<>();
+		int status = carParkRepository.carParkSave(c.getArea(), c.getCompany(),c.getParkCode(), c.getParkName(),
+				c.getBrancheCompany(),c.getCreateBy(),c.getCreateDate().toString(), c.getDescriptions(), c.getDestroy(),
+				c.getUpdateBy(),c.getUpdateDate().toString(), c.getVersions(), c.getbCenterPoint(),c.getbParkPoint(),
+				c.getDbType(), c.getgCenterPoint(), c.getgParkPoint(), c.getRadius(), c.getShapesType());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> update(CarPark c) {
+		Map<String, Object> map = new HashMap<>();
+		int status = carParkRepository.update(c.getArea(), c.getCompany(), c.getParkName(), c.getBrancheCompany(),
+				c.getDescriptions(), c.getDestroy(), c.getUpdateDate(), c.getVersions(), c.getbCenterPoint(),c.getgCenterPoint(),
+				c.getbParkPoint(), c.getgParkPoint(), c.getDbType(), c.getRadius(), c.getShapesType(),c.getParkCode());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
+
 }
 package com.bsth.service.impl;
  
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
+import com.bsth.common.ResponseCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
@@ -9,6 +12,7 @@ import com.bsth.entity.LineInformation;
 import com.bsth.repository.LineInformationRepository;
 import com.bsth.service.LineInformationService;
 import com.google.common.base.Splitter;
+import org.springframework.transaction.annotation.Transactional;
  
 /**
  * 
@@ -39,4 +43,25 @@ public class LineInformationServiceImpl extends BaseServiceImpl&lt;LineInformation,
 			return null;
 		return lineInformationRepository.findByLine(list);
 	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> update(LineInformation i) {
+		Map<String, Object> map = new HashMap<>();
+		int status = lineInformationRepository.update(i.getType(), i.getTotalMileage(), i.getEmptyMileage(), i.getUpMileage(),
+				i.getDownMileage(), i.getUpTravelTime(), i.getDownTravelTime(), i.getEarlyStartTime(), i.getEarlyEndTime(),i.getLateStartTime(),
+				i.getLateEndTime(), i.getXygfkssj(), i.getXygfjssj(), i.getEarlyUpTime(), i.getEarlyDownTime(),i.getLateUpTime(),
+				i.getLateDownTime(), i.getNightStartTime(), i.getNightEndTime(), i.getTroughUpTime(), i.getTroughDownTime(),i.getCarPark(),
+				i.getUpInTimer(), i.getUpOutTimer(), i.getDownInTimer(), i.getDownOutTimer(), i.getEarlyIntervalLg(),i.getLateIntervalLg(),
+				i.getIntervalLg(), i.getSpeedLimit(), i.getRainLimit(), i.getFogLimit(), i.getSnowLimit(),i.getFestivalSpeedLimit(),
+				i.getLagStation(), i.getSkip(), i.getSpeeding(), i.getCrossedLine(), i.getOverflights(),i.getDescriptions(),
+				i.getLine().getId());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
 }
 package com.bsth.service.impl;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.Personnel;
 import com.bsth.repository.PersonnelRepository;
 import com.bsth.service.PersonnelService;
@@ -15,6 +16,7 @@ import java.util.Set;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
  
 /**
  * Created by xu on 16/6/15.
@@ -56,4 +58,21 @@ public class PersonnelServiceImpl extends BaseServiceImpl&lt;Personnel, Integer&gt; im
 		return null;
  
 	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> update(Personnel p) {
+		Map<String, Object> map = new HashMap<>();
+		int status = repository.update(p.getCompany(), p.getCompanyCode(), p.getBrancheCompany(), p.getBrancheCompanyCode(),
+				p.getPersonnelName(), p.getPapersCode(), p.getIcCardCode(), p.getPosts(), p.getCard(),p.getJobCode(),
+				p.getJobCodeori());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
+
 }
 package com.bsth.service.impl;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.Station;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.*;
@@ -141,4 +142,21 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			station.setCenterPointWgs(wgs);
 		}
 	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> update(Station s) {
+		Map<String, Object> map = new HashMap<>();
+		int status = stationRepository.update(s.getStationName(), s.getRoadCoding(), s.getAddress(), s.getDestroy(),
+				s.getVersions(), s.getDescriptions(),s.getCenterPoint(),s.getCenterPointWgs(),
+				s.getStationCode());
+		if (status==1) {
+			map.put("status", ResponseCode.SUCCESS);
+		} else {
+			map.put("status", ResponseCode.ERROR);
+		}
+
+		return map;
+	}
+
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@ package com.bsth.service.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.exception.ScheduleException;
  
+import java.util.Map;
+
 /**
  * Created by xu on 16/12/8.
  */
@@ -11,4 +13,5 @@ public interface CarsService extends BService&lt;Cars, Integer&gt; {
     public void validate_clbh(Cars cars) throws ScheduleException;
     public void validate_cph(Cars cars) throws ScheduleException;
     public void validate_sbbh(Cars cars) throws ScheduleException;
+    Map<String, Object> update(Cars cars);
 }
 package com.bsth.service.schedule.impl;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.CarsRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.CarsService;
@@ -37,6 +40,9 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     @Autowired
     private CarConfigInfoRepository carConfigInfoRepository;
  
+    @Autowired
+    CarsRepository carsRepository;
+
     @Override
     public Cars save(Cars cars) {
         if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
@@ -143,4 +149,21 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
             throw new ScheduleException("设备编号重复");
         }
     }
+
+    @Transactional
+    @Override
+    public Map<String, Object> update(Cars c) {
+        Map<String, Object> map = new HashMap<>();
+        int status = carsRepository.update(c.getBusinessCode(), c.getCompany(), c.getBrancheCompany(), c.getBrancheCompanyCode(),
+                c.getCarCode(), c.getCarPlate(), c.getSupplierName(), c.getEquipmentCode(), c.getCarClass(),c.getCarSeatnNumber(),
+                c.getCarStandard(), c.getScrapCode(), c.getScrapDate(), c.getMakeCodeOne(),c.getMakeCodeTwo(),c.getEngineCodeOne(),
+                c.getEngineCodeTwo(), c.getCarType(), c.getSfdc(), c.getDescriptions(),c.getScrapState(), c.getInsideCode());
+        if (status==1) {
+            map.put("status", ResponseCode.SUCCESS);
+        } else {
+            map.put("status", ResponseCode.ERROR);
+        }
+
+        return map;
+    }
 }
+package com.bsth.util.db;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 嘉定基础库库连接池
+ * @author
+ *
+ */
+//@Component
+public class DBUtils_jiaDingBus {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_jiaDingBus.class);
+	
+	static {
+		Properties env = new Properties();
+
+		try {
+			env.load(DBUtils_jiaDingBus.class.getClassLoader().getResourceAsStream("jiaDingBus-jdbc.properties"));
+			// 1. 加载驱动类
+			Class.forName(env.getProperty("jiaDingBus.mysql.driver"));
+
+			url = env.getProperty("jiaDingBus.mysql.url");
+			username = env.getProperty("jiaDingBus.mysql.username");
+			pwd = env.getProperty("jiaDingBus.mysql.password");
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 10);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//30秒检测一次
+			pool_conf.put("idleConnectionTestPeriod", 30);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		} catch (FileNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (IOException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
+jiaDingBus.mysql.driver= com.mysql.jdbc.Driver
+jiaDingBus.mysql.url= jdbc:mysql://127.0.0.1/jiading_bus?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+jiaDingBus.mysql.username= root
+jiaDingBus.mysql.password= 123456
 \ No newline at end of file
@@ -59,16 +59,11 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2025-03-04 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2025-09-15</h2>
     <br><br>
     <ul >
-        <li class="sub_title"><h6>智能调度</h6></li>
-        <li><span class="label s_c_change">修改</span>1.智能调度实发二次调整刷新页面-后续程序上会对这块进行更新，已撤销的班次，你手动再次撤销会刷新这个班次不会再提示无法撤销。</li>
-        <li><span class="label s_c_change">修改</span>2.末二班车提示上线</li>
-        <li><span class="label s_c_change">修改</span>3.交互屏催发接口修复</li>
-        <li><span class="label s_c_change">修改</span>4.行车路单有未实到的班次，导出的时候显示计划公里</li>
-        <li><span class="label s_c_change">修改</span>5.自动调度实发未发只判断有rfid的班次</li>
-
+        <li class="sub_title"><h6>嘉定示范线调度</h6></li>
+        <li><span class="label s_c_change">试运行</span>
     </ul>
  
 </div>
@@ -260,8 +260,10 @@ var gb_home_layout = (function () {
         if(gb_svg_chart.getChecked()!=undefined){
             lineCode=gb_svg_chart.getChecked();
         }
-        createEcharts(lineCode);
-        createEcharts2(lineCode);
+        if(lineCode!=undefined){
+            createEcharts(lineCode);
+            createEcharts2(lineCode);
+        }
         timer = setTimeout(f, realT);
     }