代码生成

common/src/main/java/com/jpsoft/bus/modules/base/dao/OrderInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.base.entity.OrderInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface OrderInfoDAO {
+	int insert(OrderInfo entity);
+	int update(OrderInfo entity);
+	int exist(String id);
+	OrderInfo get(String id);
+	int delete(String id);
+	List<OrderInfo> list();
+	List<OrderInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/dao/PaymentInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.base.entity.PaymentInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface PaymentInfoDAO {
+	int insert(PaymentInfo entity);
+	int update(PaymentInfo entity);
+	int exist(String id);
+	PaymentInfo get(String id);
+	int delete(String id);
+	List<PaymentInfo> list();
+	List<PaymentInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/dao/TripInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.base.entity.TripInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface TripInfoDAO {
+	int insert(TripInfo entity);
+	int update(TripInfo entity);
+	int exist(String id);
+	TripInfo get(String id);
+	int delete(String id);
+	List<TripInfo> list();
+	List<TripInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/entity/OrderInfo.java

@@ -0,0 +1,59 @@
+package com.jpsoft.bus.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_order_info的实体类
+ */
+@Data
+@ApiModel(value = "base_order_info的实体类")
+public class OrderInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "账单金额")
+    private BigDecimal totalFee;
+        @ApiModelProperty(value = "商品描述")
+    private String body;
+        @ApiModelProperty(value = "支付状态（10：未支付，15：部分支付，20：支付完成，30：关闭，40：全额退款，45：部分退款）")
+    private Integer payStatus;
+        @ApiModelProperty(value = "支付方式（wechat：微信，alipay：支付宝，cash：现金，ticket：车票）")
+    private String payName;
+        @ApiModelProperty(value = "支付金额")
+    private BigDecimal payFee;
+        @ApiModelProperty(value = "退款金额")
+    private BigDecimal refundFee;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
+        @ApiModelProperty(value = "系统订单号")
+    private String outOrderNo;
+        @ApiModelProperty(value = "微信支付订单号")
+    private String transactionId;
+        @ApiModelProperty(value = "用户标识")
+    private String openId;
+        @ApiModelProperty(value = "收款账户id")
+    private String paymentId;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/base/entity/PaymentInfo.java

@@ -0,0 +1,53 @@
+package com.jpsoft.bus.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_payment_info的实体类
+ */
+@Data
+@ApiModel(value = "base_payment_info的实体类")
+public class PaymentInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "账户名称")
+    private String name;
+        @ApiModelProperty(value = "微信的回调地址")
+    private String wechatNotifyUrl;
+        @ApiModelProperty(value = "支付宝的回调地址")
+    private String alipayNotifyUrl;
+        @ApiModelProperty(value = "")
+    private String appId;
+        @ApiModelProperty(value = "")
+    private String subAppSecret;
+        @ApiModelProperty(value = "服务商标识")
+    private String mchId;
+        @ApiModelProperty(value = "服务商模式下子公众号APPID")
+    private String subAppId;
+        @ApiModelProperty(value = "服务商模式下子商户号id")
+    private String subMchId;
+        @ApiModelProperty(value = "支付宝授权token")
+    private String appAuthToken;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/base/entity/TripInfo.java

@@ -0,0 +1,67 @@
+package com.jpsoft.bus.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_trip_info的实体类
+ */
+@Data
+@ApiModel(value = "base_trip_info的实体类")
+public class TripInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "设备传来的人员标识")
+    private String personNo;
+        @ApiModelProperty(value = "上车时照片地址")
+    private String upFaceImage;
+        @ApiModelProperty(value = "下车时照片地址")
+    private String downFaceImage;
+        @ApiModelProperty(value = "所乘车辆id")
+    private String vehicleId;
+        @ApiModelProperty(value = "所走线路id")
+    private String routeId;
+        @ApiModelProperty(value = "上车站点id")
+    private String upStationId;
+        @ApiModelProperty(value = "下车站点id")
+    private String downStationId;
+        @ApiModelProperty(value = "司机id")
+    private String driverId;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "上车时间")
+    private Date upTime;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "下车时间")
+    private Date downTime;
+        @ApiModelProperty(value = "订单id")
+    private String orderId;
+        @ApiModelProperty(value = "关联的行程id，补票的时候保存的上个行程id")
+    private String tripId;
+        @ApiModelProperty(value = "备注")
+    private String remark;
+        @ApiModelProperty(value = "乘车状态（1：乘车中，2：已下车）")
+    private Integer status;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/OrderInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.base.entity.OrderInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface OrderInfoService {
+	OrderInfo get(String id);
+	boolean exist(String id);
+	int insert(OrderInfo model);
+	int update(OrderInfo model);
+	int delete(String id);
+	List<OrderInfo> list();
+	Page<OrderInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/PaymentInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.base.entity.PaymentInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface PaymentInfoService {
+	PaymentInfo get(String id);
+	boolean exist(String id);
+	int insert(PaymentInfo model);
+	int update(PaymentInfo model);
+	int delete(String id);
+	List<PaymentInfo> list();
+	Page<PaymentInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/TripInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.base.entity.TripInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface TripInfoService {
+	TripInfo get(String id);
+	boolean exist(String id);
+	int insert(TripInfo model);
+	int update(TripInfo model);
+	int delete(String id);
+	List<TripInfo> list();
+	Page<TripInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/impl/OrderInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.base.dao.OrderInfoDAO;
+import com.jpsoft.bus.modules.base.entity.OrderInfo;
+import com.jpsoft.bus.modules.base.service.OrderInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="orderInfoService")
+public class OrderInfoServiceImpl implements OrderInfoService {
+	@Resource(name="orderInfoDAO")
+	private OrderInfoDAO orderInfoDAO;
+
+	@Override
+	public OrderInfo get(String id) {
+		// TODO Auto-generated method stub
+		return orderInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(OrderInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return orderInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(OrderInfo model) {
+		// TODO Auto-generated method stub
+		return orderInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return orderInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = orderInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<OrderInfo> list() {
+		// TODO Auto-generated method stub
+		return orderInfoDAO.list();
+	}
+		
+	@Override
+	public Page<OrderInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<OrderInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            orderInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/impl/PaymentInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.base.dao.PaymentInfoDAO;
+import com.jpsoft.bus.modules.base.entity.PaymentInfo;
+import com.jpsoft.bus.modules.base.service.PaymentInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="paymentInfoService")
+public class PaymentInfoServiceImpl implements PaymentInfoService {
+	@Resource(name="paymentInfoDAO")
+	private PaymentInfoDAO paymentInfoDAO;
+
+	@Override
+	public PaymentInfo get(String id) {
+		// TODO Auto-generated method stub
+		return paymentInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(PaymentInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return paymentInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(PaymentInfo model) {
+		// TODO Auto-generated method stub
+		return paymentInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return paymentInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = paymentInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<PaymentInfo> list() {
+		// TODO Auto-generated method stub
+		return paymentInfoDAO.list();
+	}
+		
+	@Override
+	public Page<PaymentInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<PaymentInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            paymentInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/impl/TripInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.base.dao.TripInfoDAO;
+import com.jpsoft.bus.modules.base.entity.TripInfo;
+import com.jpsoft.bus.modules.base.service.TripInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="tripInfoService")
+public class TripInfoServiceImpl implements TripInfoService {
+	@Resource(name="tripInfoDAO")
+	private TripInfoDAO tripInfoDAO;
+
+	@Override
+	public TripInfo get(String id) {
+		// TODO Auto-generated method stub
+		return tripInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(TripInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return tripInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(TripInfo model) {
+		// TODO Auto-generated method stub
+		return tripInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return tripInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = tripInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<TripInfo> list() {
+		// TODO Auto-generated method stub
+		return tripInfoDAO.list();
+	}
+		
+	@Override
+	public Page<TripInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<TripInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            tripInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/DriverInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface DriverInfoDAO {
+	int insert(DriverInfo entity);
+	int update(DriverInfo entity);
+	int exist(String id);
+	DriverInfo get(String id);
+	int delete(String id);
+	List<DriverInfo> list();
+	List<DriverInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/PriceInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.PriceInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface PriceInfoDAO {
+	int insert(PriceInfo entity);
+	int update(PriceInfo entity);
+	int exist(String id);
+	PriceInfo get(String id);
+	int delete(String id);
+	List<PriceInfo> list();
+	List<PriceInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/RouteInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.RouteInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface RouteInfoDAO {
+	int insert(RouteInfo entity);
+	int update(RouteInfo entity);
+	int exist(String id);
+	RouteInfo get(String id);
+	int delete(String id);
+	List<RouteInfo> list();
+	List<RouteInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/StationInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.StationInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface StationInfoDAO {
+	int insert(StationInfo entity);
+	int update(StationInfo entity);
+	int exist(String id);
+	StationInfo get(String id);
+	int delete(String id);
+	List<StationInfo> list();
+	List<StationInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/VehicleInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.VehicleInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface VehicleInfoDAO {
+	int insert(VehicleInfo entity);
+	int update(VehicleInfo entity);
+	int exist(String id);
+	VehicleInfo get(String id);
+	int delete(String id);
+	List<VehicleInfo> list();
+	List<VehicleInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/DriverInfo.java

@@ -0,0 +1,47 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_driver_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_driver_info的实体类")
+public class DriverInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "对应车辆id")
+    private String vehicleId;
+        @ApiModelProperty(value = "司机姓名")
+    private String name;
+        @ApiModelProperty(value = "身份证号码")
+    private String idCard;
+        @ApiModelProperty(value = "手机号码")
+    private String phone;
+        @ApiModelProperty(value = "照片地址")
+    private String faceImage;
+        @ApiModelProperty(value = "备注")
+    private String remark;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/PriceInfo.java

@@ -0,0 +1,43 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_price_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_price_info的实体类")
+public class PriceInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "开始计费站点")
+    private String startStationId;
+        @ApiModelProperty(value = "计算计费站点")
+    private String endStationId;
+        @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+        @ApiModelProperty(value = "价格")
+    private BigDecimal price;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/RouteInfo.java

@@ -0,0 +1,47 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_route_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_route_info的实体类")
+public class RouteInfo {
+        @ApiModelProperty(value = "主键")
+    private String id;
+        @ApiModelProperty(value = "路线")
+    private String name;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "地图路线(坐标用|分隔，经纬度用,)")
+    private String mapPath;
+        @ApiModelProperty(value = "单位编号")
+    private String companyId;
+        @ApiModelProperty(value = "商品编号")
+    private String goodsId;
+        @ApiModelProperty(value = "开始时间")
+    private String startTime;
+        @ApiModelProperty(value = "结束时间")
+    private String endTime;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/StationInfo.java

@@ -0,0 +1,47 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_station_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_station_info的实体类")
+public class StationInfo {
+        @ApiModelProperty(value = "主键")
+    private String id;
+        @ApiModelProperty(value = "序号")
+    private Integer sortNo;
+        @ApiModelProperty(value = "路线编号")
+    private String routeId;
+        @ApiModelProperty(value = "站点名称")
+    private String name;
+        @ApiModelProperty(value = "经度")
+    private String longitude;
+        @ApiModelProperty(value = "纬度")
+    private String latitude;
+        @ApiModelProperty(value = "1-起点,2-途径,3-终点")
+    private Integer classify;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/VehicleInfo.java

@@ -0,0 +1,63 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_vehicle_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_vehicle_info的实体类")
+public class VehicleInfo {
+        @ApiModelProperty(value = "uuid")
+    private String id;
+        @ApiModelProperty(value = "运行线路id")
+    private String routeId;
+        @ApiModelProperty(value = "车牌号")
+    private String licensePlateNumber;
+        @ApiModelProperty(value = "gps设备编号")
+    private String gpsDeviceNo;
+        @ApiModelProperty(value = "门禁设备编号")
+    private String deviceNo;
+        @ApiModelProperty(value = "车辆照片")
+    private String picture;
+        @ApiModelProperty(value = "荷载人数")
+    private Integer loadNumber;
+        @ApiModelProperty(value = "最新的经度")
+    private String longitude;
+        @ApiModelProperty(value = "最新的纬度")
+    private String latitude;
+        @ApiModelProperty(value = "状态(1-正常,2-异常)")
+    private String status;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "所属单位编号")
+    private String companyId;
+        @ApiModelProperty(value = "是否运行(0-停车，1-行驶中)")
+    private Boolean running;
+        @ApiModelProperty(value = "ACC状态")
+    private Boolean acc;
+        @ApiModelProperty(value = "在线状态")
+    private Boolean online;
+        @ApiModelProperty(value = "最后所在位置")
+    private String latestAddress;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/DriverInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface DriverInfoService {
+	DriverInfo get(String id);
+	boolean exist(String id);
+	int insert(DriverInfo model);
+	int update(DriverInfo model);
+	int delete(String id);
+	List<DriverInfo> list();
+	Page<DriverInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/PriceInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.PriceInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface PriceInfoService {
+	PriceInfo get(String id);
+	boolean exist(String id);
+	int insert(PriceInfo model);
+	int update(PriceInfo model);
+	int delete(String id);
+	List<PriceInfo> list();
+	Page<PriceInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/RouteInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.RouteInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface RouteInfoService {
+	RouteInfo get(String id);
+	boolean exist(String id);
+	int insert(RouteInfo model);
+	int update(RouteInfo model);
+	int delete(String id);
+	List<RouteInfo> list();
+	Page<RouteInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/StationInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.StationInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface StationInfoService {
+	StationInfo get(String id);
+	boolean exist(String id);
+	int insert(StationInfo model);
+	int update(StationInfo model);
+	int delete(String id);
+	List<StationInfo> list();
+	Page<StationInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/VehicleInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.VehicleInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface VehicleInfoService {
+	VehicleInfo get(String id);
+	boolean exist(String id);
+	int insert(VehicleInfo model);
+	int update(VehicleInfo model);
+	int delete(String id);
+	List<VehicleInfo> list();
+	Page<VehicleInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/DriverInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.DriverInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
+import com.jpsoft.bus.modules.bus.service.DriverInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="driverInfoService")
+public class DriverInfoServiceImpl implements DriverInfoService {
+	@Resource(name="driverInfoDAO")
+	private DriverInfoDAO driverInfoDAO;
+
+	@Override
+	public DriverInfo get(String id) {
+		// TODO Auto-generated method stub
+		return driverInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(DriverInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return driverInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(DriverInfo model) {
+		// TODO Auto-generated method stub
+		return driverInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return driverInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = driverInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<DriverInfo> list() {
+		// TODO Auto-generated method stub
+		return driverInfoDAO.list();
+	}
+		
+	@Override
+	public Page<DriverInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<DriverInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            driverInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/PriceInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.PriceInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.PriceInfo;
+import com.jpsoft.bus.modules.bus.service.PriceInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="priceInfoService")
+public class PriceInfoServiceImpl implements PriceInfoService {
+	@Resource(name="priceInfoDAO")
+	private PriceInfoDAO priceInfoDAO;
+
+	@Override
+	public PriceInfo get(String id) {
+		// TODO Auto-generated method stub
+		return priceInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(PriceInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return priceInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(PriceInfo model) {
+		// TODO Auto-generated method stub
+		return priceInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return priceInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = priceInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<PriceInfo> list() {
+		// TODO Auto-generated method stub
+		return priceInfoDAO.list();
+	}
+		
+	@Override
+	public Page<PriceInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<PriceInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            priceInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/RouteInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.RouteInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.RouteInfo;
+import com.jpsoft.bus.modules.bus.service.RouteInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="routeInfoService")
+public class RouteInfoServiceImpl implements RouteInfoService {
+	@Resource(name="routeInfoDAO")
+	private RouteInfoDAO routeInfoDAO;
+
+	@Override
+	public RouteInfo get(String id) {
+		// TODO Auto-generated method stub
+		return routeInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(RouteInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return routeInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(RouteInfo model) {
+		// TODO Auto-generated method stub
+		return routeInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return routeInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = routeInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<RouteInfo> list() {
+		// TODO Auto-generated method stub
+		return routeInfoDAO.list();
+	}
+		
+	@Override
+	public Page<RouteInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<RouteInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            routeInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/StationInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.StationInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.StationInfo;
+import com.jpsoft.bus.modules.bus.service.StationInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="stationInfoService")
+public class StationInfoServiceImpl implements StationInfoService {
+	@Resource(name="stationInfoDAO")
+	private StationInfoDAO stationInfoDAO;
+
+	@Override
+	public StationInfo get(String id) {
+		// TODO Auto-generated method stub
+		return stationInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(StationInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return stationInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(StationInfo model) {
+		// TODO Auto-generated method stub
+		return stationInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return stationInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = stationInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<StationInfo> list() {
+		// TODO Auto-generated method stub
+		return stationInfoDAO.list();
+	}
+		
+	@Override
+	public Page<StationInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<StationInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            stationInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/VehicleInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.VehicleInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.VehicleInfo;
+import com.jpsoft.bus.modules.bus.service.VehicleInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="vehicleInfoService")
+public class VehicleInfoServiceImpl implements VehicleInfoService {
+	@Resource(name="vehicleInfoDAO")
+	private VehicleInfoDAO vehicleInfoDAO;
+
+	@Override
+	public VehicleInfo get(String id) {
+		// TODO Auto-generated method stub
+		return vehicleInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(VehicleInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return vehicleInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(VehicleInfo model) {
+		// TODO Auto-generated method stub
+		return vehicleInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return vehicleInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = vehicleInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<VehicleInfo> list() {
+		// TODO Auto-generated method stub
+		return vehicleInfoDAO.list();
+	}
+		
+	@Override
+	public Page<VehicleInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<VehicleInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            vehicleInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/OrderInfo.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.base.dao.OrderInfoDAO">
+	<resultMap id="OrderInfoMap" type="com.jpsoft.bus.modules.base.entity.OrderInfo">
+		<id property="id" column="id_" />
+			<result property="totalFee" column="total_fee" />
+			<result property="body" column="body_" />
+			<result property="payStatus" column="pay_status" />
+			<result property="payName" column="pay_name" />
+			<result property="payFee" column="pay_fee" />
+			<result property="refundFee" column="refund_fee" />
+			<result property="payTime" column="pay_time" />
+			<result property="outOrderNo" column="out_order_no" />
+			<result property="transactionId" column="transaction_id" />
+			<result property="openId" column="open_id" />
+			<result property="paymentId" column="payment_id" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.OrderInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_order_info
+	    (id_,total_fee,body_,pay_status,pay_name,pay_fee,refund_fee,pay_time,out_order_no,transaction_id,open_id,payment_id,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{totalFee,jdbcType= NUMERIC }
+,#{body,jdbcType=VARCHAR}
+,#{payStatus,jdbcType= NUMERIC }
+,#{payName,jdbcType=VARCHAR}
+,#{payFee,jdbcType= NUMERIC }
+,#{refundFee,jdbcType= NUMERIC }
+,#{payTime,jdbcType= TIMESTAMP }
+,#{outOrderNo,jdbcType=VARCHAR}
+,#{transactionId,jdbcType=VARCHAR}
+,#{openId,jdbcType=VARCHAR}
+,#{paymentId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_order_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.base.entity.OrderInfo">
+		update base_order_info
+		<set>
+				<if test="totalFee!=null">
+		total_fee=#{totalFee,jdbcType= NUMERIC },
+		</if>
+				<if test="body!=null">
+		body_=#{body,jdbcType=VARCHAR},
+		</if>
+				<if test="payStatus!=null">
+		pay_status=#{payStatus,jdbcType= NUMERIC },
+		</if>
+				<if test="payName!=null">
+		pay_name=#{payName,jdbcType=VARCHAR},
+		</if>
+				<if test="payFee!=null">
+		pay_fee=#{payFee,jdbcType= NUMERIC },
+		</if>
+				<if test="refundFee!=null">
+		refund_fee=#{refundFee,jdbcType= NUMERIC },
+		</if>
+				<if test="payTime!=null">
+		pay_time=#{payTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="outOrderNo!=null">
+		out_order_no=#{outOrderNo,jdbcType=VARCHAR},
+		</if>
+				<if test="transactionId!=null">
+		transaction_id=#{transactionId,jdbcType=VARCHAR},
+		</if>
+				<if test="openId!=null">
+		open_id=#{openId,jdbcType=VARCHAR},
+		</if>
+				<if test="paymentId!=null">
+		payment_id=#{paymentId,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="OrderInfoMap">
+		select 
+id_,total_fee,body_,pay_status,pay_name,pay_fee,refund_fee,pay_time,out_order_no,transaction_id,open_id,payment_id,create_by,create_time,update_by,update_time,del_flag		from base_order_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_order_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="OrderInfoMap">
+		select * from base_order_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="OrderInfoMap">
+		<![CDATA[
+			select * from base_order_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/base/PaymentInfo.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.base.dao.PaymentInfoDAO">
+	<resultMap id="PaymentInfoMap" type="com.jpsoft.bus.modules.base.entity.PaymentInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="wechatNotifyUrl" column="wechat_notify_url" />
+			<result property="alipayNotifyUrl" column="alipay_notify_url" />
+			<result property="appId" column="app_id" />
+			<result property="subAppSecret" column="sub_app_secret" />
+			<result property="mchId" column="mch_id" />
+			<result property="subAppId" column="sub_app_id" />
+			<result property="subMchId" column="sub_mch_id" />
+			<result property="appAuthToken" column="app_auth_token" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.PaymentInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_payment_info
+	    (id_,name_,wechat_notify_url,alipay_notify_url,app_id,sub_app_secret,mch_id,sub_app_id,sub_mch_id,app_auth_token,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{wechatNotifyUrl,jdbcType=VARCHAR}
+,#{alipayNotifyUrl,jdbcType=VARCHAR}
+,#{appId,jdbcType=VARCHAR}
+,#{subAppSecret,jdbcType=VARCHAR}
+,#{mchId,jdbcType=VARCHAR}
+,#{subAppId,jdbcType=VARCHAR}
+,#{subMchId,jdbcType=VARCHAR}
+,#{appAuthToken,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_payment_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.base.entity.PaymentInfo">
+		update base_payment_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="wechatNotifyUrl!=null">
+		wechat_notify_url=#{wechatNotifyUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="alipayNotifyUrl!=null">
+		alipay_notify_url=#{alipayNotifyUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="appId!=null">
+		app_id=#{appId,jdbcType=VARCHAR},
+		</if>
+				<if test="subAppSecret!=null">
+		sub_app_secret=#{subAppSecret,jdbcType=VARCHAR},
+		</if>
+				<if test="mchId!=null">
+		mch_id=#{mchId,jdbcType=VARCHAR},
+		</if>
+				<if test="subAppId!=null">
+		sub_app_id=#{subAppId,jdbcType=VARCHAR},
+		</if>
+				<if test="subMchId!=null">
+		sub_mch_id=#{subMchId,jdbcType=VARCHAR},
+		</if>
+				<if test="appAuthToken!=null">
+		app_auth_token=#{appAuthToken,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="PaymentInfoMap">
+		select 
+id_,name_,wechat_notify_url,alipay_notify_url,app_id,sub_app_secret,mch_id,sub_app_id,sub_mch_id,app_auth_token,create_by,create_time,update_by,update_time,del_flag		from base_payment_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_payment_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="PaymentInfoMap">
+		select * from base_payment_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PaymentInfoMap">
+		<![CDATA[
+			select * from base_payment_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/base/TripInfo.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.base.dao.TripInfoDAO">
+	<resultMap id="TripInfoMap" type="com.jpsoft.bus.modules.base.entity.TripInfo">
+		<id property="id" column="id_" />
+			<result property="personNo" column="person_no" />
+			<result property="upFaceImage" column="up_face_image" />
+			<result property="downFaceImage" column="down_face_image" />
+			<result property="vehicleId" column="vehicle_id" />
+			<result property="routeId" column="route_id" />
+			<result property="upStationId" column="up_station_id" />
+			<result property="downStationId" column="down_station_id" />
+			<result property="driverId" column="driver_id" />
+			<result property="upTime" column="up_time" />
+			<result property="downTime" column="down_time" />
+			<result property="orderId" column="order_id" />
+			<result property="tripId" column="trip_id" />
+			<result property="remark" column="remark_" />
+			<result property="status" column="status_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.TripInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_trip_info
+	    (id_,person_no,up_face_image,down_face_image,vehicle_id,route_id,up_station_id,down_station_id,driver_id,up_time,down_time,order_id,trip_id,remark_,status_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{personNo,jdbcType=VARCHAR}
+,#{upFaceImage,jdbcType=VARCHAR}
+,#{downFaceImage,jdbcType=VARCHAR}
+,#{vehicleId,jdbcType=VARCHAR}
+,#{routeId,jdbcType=VARCHAR}
+,#{upStationId,jdbcType=VARCHAR}
+,#{downStationId,jdbcType=VARCHAR}
+,#{driverId,jdbcType=VARCHAR}
+,#{upTime,jdbcType= TIMESTAMP }
+,#{downTime,jdbcType= TIMESTAMP }
+,#{orderId,jdbcType=VARCHAR}
+,#{tripId,jdbcType=VARCHAR}
+,#{remark,jdbcType=VARCHAR}
+,#{status,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_trip_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.base.entity.TripInfo">
+		update base_trip_info
+		<set>
+				<if test="personNo!=null">
+		person_no=#{personNo,jdbcType=VARCHAR},
+		</if>
+				<if test="upFaceImage!=null">
+		up_face_image=#{upFaceImage,jdbcType=VARCHAR},
+		</if>
+				<if test="downFaceImage!=null">
+		down_face_image=#{downFaceImage,jdbcType=VARCHAR},
+		</if>
+				<if test="vehicleId!=null">
+		vehicle_id=#{vehicleId,jdbcType=VARCHAR},
+		</if>
+				<if test="routeId!=null">
+		route_id=#{routeId,jdbcType=VARCHAR},
+		</if>
+				<if test="upStationId!=null">
+		up_station_id=#{upStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="downStationId!=null">
+		down_station_id=#{downStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="driverId!=null">
+		driver_id=#{driverId,jdbcType=VARCHAR},
+		</if>
+				<if test="upTime!=null">
+		up_time=#{upTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="downTime!=null">
+		down_time=#{downTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="orderId!=null">
+		order_id=#{orderId,jdbcType=VARCHAR},
+		</if>
+				<if test="tripId!=null">
+		trip_id=#{tripId,jdbcType=VARCHAR},
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="TripInfoMap">
+		select 
+id_,person_no,up_face_image,down_face_image,vehicle_id,route_id,up_station_id,down_station_id,driver_id,up_time,down_time,order_id,trip_id,remark_,status_,create_by,create_time,update_by,update_time,del_flag		from base_trip_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_trip_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="TripInfoMap">
+		select * from base_trip_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="TripInfoMap">
+		<![CDATA[
+			select * from base_trip_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/DriverInfo.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.DriverInfoDAO">
+	<resultMap id="DriverInfoMap" type="com.jpsoft.bus.modules.bus.entity.DriverInfo">
+		<id property="id" column="id_" />
+			<result property="vehicleId" column="vehicle_id" />
+			<result property="name" column="name_" />
+			<result property="idCard" column="id_card" />
+			<result property="phone" column="phone_" />
+			<result property="faceImage" column="face_image" />
+			<result property="remark" column="remark_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.DriverInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_driver_info
+	    (id_,vehicle_id,name_,id_card,phone_,face_image,remark_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{vehicleId,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{idCard,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{faceImage,jdbcType=VARCHAR}
+,#{remark,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_driver_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.DriverInfo">
+		update bus_driver_info
+		<set>
+				<if test="vehicleId!=null">
+		vehicle_id=#{vehicleId,jdbcType=VARCHAR},
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="idCard!=null">
+		id_card=#{idCard,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="faceImage!=null">
+		face_image=#{faceImage,jdbcType=VARCHAR},
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="DriverInfoMap">
+		select 
+id_,vehicle_id,name_,id_card,phone_,face_image,remark_,create_by,create_time,update_by,update_time,del_flag		from bus_driver_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_driver_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="DriverInfoMap">
+		select * from bus_driver_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="DriverInfoMap">
+		<![CDATA[
+			select * from bus_driver_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/PriceInfo.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.PriceInfoDAO">
+	<resultMap id="PriceInfoMap" type="com.jpsoft.bus.modules.bus.entity.PriceInfo">
+		<id property="id" column="id_" />
+			<result property="startStationId" column="start_station_id" />
+			<result property="endStationId" column="end_station_id" />
+			<result property="distance" column="distance_" />
+			<result property="price" column="price_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.PriceInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_price_info
+	    (id_,start_station_id,end_station_id,distance_,price_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{startStationId,jdbcType=VARCHAR}
+,#{endStationId,jdbcType=VARCHAR}
+,#{distance,jdbcType= NUMERIC }
+,#{price,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_price_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.PriceInfo">
+		update bus_price_info
+		<set>
+				<if test="startStationId!=null">
+		start_station_id=#{startStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="endStationId!=null">
+		end_station_id=#{endStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="distance!=null">
+		distance_=#{distance,jdbcType= NUMERIC },
+		</if>
+				<if test="price!=null">
+		price_=#{price,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="PriceInfoMap">
+		select 
+id_,start_station_id,end_station_id,distance_,price_,create_by,create_time,update_by,update_time,del_flag		from bus_price_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_price_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="PriceInfoMap">
+		select * from bus_price_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PriceInfoMap">
+		<![CDATA[
+			select * from bus_price_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/RouteInfo.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.RouteInfoDAO">
+	<resultMap id="RouteInfoMap" type="com.jpsoft.bus.modules.bus.entity.RouteInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="mapPath" column="map_path" />
+			<result property="companyId" column="company_id" />
+			<result property="goodsId" column="goods_id" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.RouteInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_route_info
+	    (id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{mapPath,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{goodsId,jdbcType=VARCHAR}
+,#{startTime,jdbcType=VARCHAR}
+,#{endTime,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_route_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.RouteInfo">
+		update bus_route_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="mapPath!=null">
+		map_path=#{mapPath,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="goodsId!=null">
+		goods_id=#{goodsId,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType=VARCHAR},
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="RouteInfoMap">
+		select 
+id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time		from bus_route_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_route_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="RouteInfoMap">
+		select * from bus_route_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="RouteInfoMap">
+		<![CDATA[
+			select * from bus_route_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/StationInfo.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.StationInfoDAO">
+	<resultMap id="StationInfoMap" type="com.jpsoft.bus.modules.bus.entity.StationInfo">
+		<id property="id" column="id_" />
+			<result property="sortNo" column="sort_no" />
+			<result property="routeId" column="route_id" />
+			<result property="name" column="name_" />
+			<result property="longitude" column="longitude_" />
+			<result property="latitude" column="latitude_" />
+			<result property="classify" column="classify_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.StationInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_station_info
+	    (id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{sortNo,jdbcType= NUMERIC }
+,#{routeId,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{longitude,jdbcType=VARCHAR}
+,#{latitude,jdbcType=VARCHAR}
+,#{classify,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_station_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.StationInfo">
+		update bus_station_info
+		<set>
+				<if test="sortNo!=null">
+		sort_no=#{sortNo,jdbcType= NUMERIC },
+		</if>
+				<if test="routeId!=null">
+		route_id=#{routeId,jdbcType=VARCHAR},
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="longitude!=null">
+		longitude_=#{longitude,jdbcType=VARCHAR},
+		</if>
+				<if test="latitude!=null">
+		latitude_=#{latitude,jdbcType=VARCHAR},
+		</if>
+				<if test="classify!=null">
+		classify_=#{classify,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="StationInfoMap">
+		select 
+id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,update_by,update_time,del_flag		from bus_station_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_station_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="StationInfoMap">
+		select * from bus_station_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="StationInfoMap">
+		<![CDATA[
+			select * from bus_station_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/VehicleInfo.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.VehicleInfoDAO">
+	<resultMap id="VehicleInfoMap" type="com.jpsoft.bus.modules.bus.entity.VehicleInfo">
+		<id property="id" column="id_" />
+			<result property="routeId" column="route_id" />
+			<result property="licensePlateNumber" column="license_plate_number" />
+			<result property="gpsDeviceNo" column="gps_device_no" />
+			<result property="deviceNo" column="device_no" />
+			<result property="picture" column="picture_" />
+			<result property="loadNumber" column="load_number" />
+			<result property="longitude" column="longitude_" />
+			<result property="latitude" column="latitude_" />
+			<result property="status" column="status_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="companyId" column="company_id" />
+			<result property="running" column="running_" />
+			<result property="acc" column="acc_" />
+			<result property="online" column="online_" />
+			<result property="latestAddress" column="latest_address" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.VehicleInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_vehicle_info
+	    (id_,route_id,license_plate_number,gps_device_no,device_no,picture_,load_number,longitude_,latitude_,status_,create_by,create_time,update_by,update_time,del_flag,company_id,running_,acc_,online_,latest_address)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{routeId,jdbcType=VARCHAR}
+,#{licensePlateNumber,jdbcType=VARCHAR}
+,#{gpsDeviceNo,jdbcType=VARCHAR}
+,#{deviceNo,jdbcType=VARCHAR}
+,#{picture,jdbcType=VARCHAR}
+,#{loadNumber,jdbcType= NUMERIC }
+,#{longitude,jdbcType=VARCHAR}
+,#{latitude,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{companyId,jdbcType=VARCHAR}
+,#{running,jdbcType= NUMERIC }
+,#{acc,jdbcType= NUMERIC }
+,#{online,jdbcType= NUMERIC }
+,#{latestAddress,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_vehicle_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.VehicleInfo">
+		update bus_vehicle_info
+		<set>
+				<if test="routeId!=null">
+		route_id=#{routeId,jdbcType=VARCHAR},
+		</if>
+				<if test="licensePlateNumber!=null">
+		license_plate_number=#{licensePlateNumber,jdbcType=VARCHAR},
+		</if>
+				<if test="gpsDeviceNo!=null">
+		gps_device_no=#{gpsDeviceNo,jdbcType=VARCHAR},
+		</if>
+				<if test="deviceNo!=null">
+		device_no=#{deviceNo,jdbcType=VARCHAR},
+		</if>
+				<if test="picture!=null">
+		picture_=#{picture,jdbcType=VARCHAR},
+		</if>
+				<if test="loadNumber!=null">
+		load_number=#{loadNumber,jdbcType= NUMERIC },
+		</if>
+				<if test="longitude!=null">
+		longitude_=#{longitude,jdbcType=VARCHAR},
+		</if>
+				<if test="latitude!=null">
+		latitude_=#{latitude,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="running!=null">
+		running_=#{running,jdbcType= NUMERIC },
+		</if>
+				<if test="acc!=null">
+		acc_=#{acc,jdbcType= NUMERIC },
+		</if>
+				<if test="online!=null">
+		online_=#{online,jdbcType= NUMERIC },
+		</if>
+				<if test="latestAddress!=null">
+		latest_address=#{latestAddress,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="VehicleInfoMap">
+		select 
+id_,route_id,license_plate_number,gps_device_no,device_no,picture_,load_number,longitude_,latitude_,status_,create_by,create_time,update_by,update_time,del_flag,company_id,running_,acc_,online_,latest_address		from bus_vehicle_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_vehicle_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="VehicleInfoMap">
+		select * from bus_vehicle_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="VehicleInfoMap">
+		<![CDATA[
+			select * from bus_vehicle_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/bus/modules/base/controller/OrderInfoController.java

@@ -0,0 +1,229 @@
+package com.jpsoft.bus.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.base.entity.OrderInfo;
+import com.jpsoft.bus.modules.base.service.OrderInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/***
+ *账单
+ */
+
+@RestController
+@RequestMapping("/base/orderInfo")
+@Api(description = "orderInfo")
+public class OrderInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<OrderInfo> create(){
+        MessageResult<OrderInfo> msgResult = new MessageResult<>();
+
+        OrderInfo orderInfo = new OrderInfo();
+
+        msgResult.setData(orderInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<OrderInfo> add(@RequestBody OrderInfo orderInfo,@RequestAttribute String subject){
+        MessageResult<OrderInfo> msgResult = new MessageResult<>();
+
+        try {
+            orderInfo.setId(UUID.randomUUID().toString());
+            orderInfo.setDelFlag(false);
+            orderInfo.setCreateBy(subject);
+            orderInfo.setCreateTime(new Date());
+            
+            int affectCount = orderInfoService.insert(orderInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(orderInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<OrderInfo> edit(@PathVariable("id") String id){
+        MessageResult<OrderInfo> msgResult = new MessageResult<>();
+
+        try {
+            OrderInfo orderInfo = orderInfoService.get(id);
+
+            if (orderInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(orderInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<OrderInfo> update(@RequestBody OrderInfo orderInfo,@RequestAttribute String subject){
+        MessageResult<OrderInfo> msgResult = new MessageResult<>();
+
+        try {
+            orderInfo.setUpdateBy(subject);
+            orderInfo.setUpdateTime(new Date());
+            
+            int affectCount = orderInfoService.update(orderInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(orderInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            OrderInfo orderInfo = orderInfoService.get(id);
+            orderInfo.setDelFlag(true);
+            orderInfo.setUpdateBy(subject);
+            orderInfo.setUpdateTime(new Date());
+
+            int affectCount = orderInfoService.update(orderInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                OrderInfo orderInfo = orderInfoService.get(id);
+                orderInfo.setDelFlag(true);
+                orderInfo.setUpdateBy(subject);
+                orderInfo.setUpdateTime(new Date());
+
+                affectCount += orderInfoService.update(orderInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<OrderInfo> page = orderInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/base/controller/PaymentInfoController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.bus.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.base.entity.PaymentInfo;
+import com.jpsoft.bus.modules.base.service.PaymentInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/paymentInfo")
+@Api(description = "paymentInfo")
+public class PaymentInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PaymentInfoService paymentInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<PaymentInfo> create(){
+        MessageResult<PaymentInfo> msgResult = new MessageResult<>();
+
+        PaymentInfo paymentInfo = new PaymentInfo();
+
+        msgResult.setData(paymentInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<PaymentInfo> add(@RequestBody PaymentInfo paymentInfo,@RequestAttribute String subject){
+        MessageResult<PaymentInfo> msgResult = new MessageResult<>();
+
+        try {
+            paymentInfo.setId(UUID.randomUUID().toString());
+            paymentInfo.setDelFlag(false);
+            paymentInfo.setCreateBy(subject);
+            paymentInfo.setCreateTime(new Date());
+            
+            int affectCount = paymentInfoService.insert(paymentInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(paymentInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<PaymentInfo> edit(@PathVariable("id") String id){
+        MessageResult<PaymentInfo> msgResult = new MessageResult<>();
+
+        try {
+            PaymentInfo paymentInfo = paymentInfoService.get(id);
+
+            if (paymentInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(paymentInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<PaymentInfo> update(@RequestBody PaymentInfo paymentInfo,@RequestAttribute String subject){
+        MessageResult<PaymentInfo> msgResult = new MessageResult<>();
+
+        try {
+            paymentInfo.setUpdateBy(subject);
+            paymentInfo.setUpdateTime(new Date());
+            
+            int affectCount = paymentInfoService.update(paymentInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(paymentInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            PaymentInfo paymentInfo = paymentInfoService.get(id);
+            paymentInfo.setDelFlag(true);
+            paymentInfo.setUpdateBy(subject);
+            paymentInfo.setUpdateTime(new Date());
+
+            int affectCount = paymentInfoService.update(paymentInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                PaymentInfo paymentInfo = paymentInfoService.get(id);
+                paymentInfo.setDelFlag(true);
+                paymentInfo.setUpdateBy(subject);
+                paymentInfo.setUpdateTime(new Date());
+
+                affectCount += paymentInfoService.update(paymentInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<PaymentInfo> page = paymentInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/base/controller/TripInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.base.entity.TripInfo;
+import com.jpsoft.bus.modules.base.service.TripInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 乘客乘车记录
+ */
+@RestController
+@RequestMapping("/base/tripInfo")
+@Api(description = "tripInfo")
+public class TripInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private TripInfoService tripInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<TripInfo> create(){
+        MessageResult<TripInfo> msgResult = new MessageResult<>();
+
+        TripInfo tripInfo = new TripInfo();
+
+        msgResult.setData(tripInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<TripInfo> add(@RequestBody TripInfo tripInfo,@RequestAttribute String subject){
+        MessageResult<TripInfo> msgResult = new MessageResult<>();
+
+        try {
+            tripInfo.setId(UUID.randomUUID().toString());
+            tripInfo.setDelFlag(false);
+            tripInfo.setCreateBy(subject);
+            tripInfo.setCreateTime(new Date());
+            
+            int affectCount = tripInfoService.insert(tripInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(tripInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<TripInfo> edit(@PathVariable("id") String id){
+        MessageResult<TripInfo> msgResult = new MessageResult<>();
+
+        try {
+            TripInfo tripInfo = tripInfoService.get(id);
+
+            if (tripInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(tripInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<TripInfo> update(@RequestBody TripInfo tripInfo,@RequestAttribute String subject){
+        MessageResult<TripInfo> msgResult = new MessageResult<>();
+
+        try {
+            tripInfo.setUpdateBy(subject);
+            tripInfo.setUpdateTime(new Date());
+            
+            int affectCount = tripInfoService.update(tripInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(tripInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TripInfo tripInfo = tripInfoService.get(id);
+            tripInfo.setDelFlag(true);
+            tripInfo.setUpdateBy(subject);
+            tripInfo.setUpdateTime(new Date());
+
+            int affectCount = tripInfoService.update(tripInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                TripInfo tripInfo = tripInfoService.get(id);
+                tripInfo.setDelFlag(true);
+                tripInfo.setUpdateBy(subject);
+                tripInfo.setUpdateTime(new Date());
+
+                affectCount += tripInfoService.update(tripInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<TripInfo> page = tripInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/bus/controller/DriverInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
+import com.jpsoft.bus.modules.bus.service.DriverInfoService;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.jpsoft.bus.modules.common.dto.Sort;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 司机详情表
+ */
+@RestController
+@RequestMapping("/bus/driverInfo")
+@Api(description = "driverInfo")
+public class DriverInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private DriverInfoService driverInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<DriverInfo> create(){
+        MessageResult<DriverInfo> msgResult = new MessageResult<>();
+
+        DriverInfo driverInfo = new DriverInfo();
+
+        msgResult.setData(driverInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<DriverInfo> add(@RequestBody DriverInfo driverInfo,@RequestAttribute String subject){
+        MessageResult<DriverInfo> msgResult = new MessageResult<>();
+
+        try {
+            driverInfo.setId(UUID.randomUUID().toString());
+            driverInfo.setDelFlag(false);
+            driverInfo.setCreateBy(subject);
+            driverInfo.setCreateTime(new Date());
+            
+            int affectCount = driverInfoService.insert(driverInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(driverInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<DriverInfo> edit(@PathVariable("id") String id){
+        MessageResult<DriverInfo> msgResult = new MessageResult<>();
+
+        try {
+            DriverInfo driverInfo = driverInfoService.get(id);
+
+            if (driverInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(driverInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<DriverInfo> update(@RequestBody DriverInfo driverInfo,@RequestAttribute String subject){
+        MessageResult<DriverInfo> msgResult = new MessageResult<>();
+
+        try {
+            driverInfo.setUpdateBy(subject);
+            driverInfo.setUpdateTime(new Date());
+            
+            int affectCount = driverInfoService.update(driverInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(driverInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            DriverInfo driverInfo = driverInfoService.get(id);
+            driverInfo.setDelFlag(true);
+            driverInfo.setUpdateBy(subject);
+            driverInfo.setUpdateTime(new Date());
+
+            int affectCount = driverInfoService.update(driverInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                DriverInfo driverInfo = driverInfoService.get(id);
+                driverInfo.setDelFlag(true);
+                driverInfo.setUpdateBy(subject);
+                driverInfo.setUpdateTime(new Date());
+
+                affectCount += driverInfoService.update(driverInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<DriverInfo> page = driverInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/bus/controller/PriceInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.bus.entity.PriceInfo;
+import com.jpsoft.bus.modules.bus.service.PriceInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 站点之间的价格
+ */
+@RestController
+@RequestMapping("/bus/priceInfo")
+@Api(description = "priceInfo")
+public class PriceInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PriceInfoService priceInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<PriceInfo> create(){
+        MessageResult<PriceInfo> msgResult = new MessageResult<>();
+
+        PriceInfo priceInfo = new PriceInfo();
+
+        msgResult.setData(priceInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<PriceInfo> add(@RequestBody PriceInfo priceInfo,@RequestAttribute String subject){
+        MessageResult<PriceInfo> msgResult = new MessageResult<>();
+
+        try {
+            priceInfo.setId(UUID.randomUUID().toString());
+            priceInfo.setDelFlag(false);
+            priceInfo.setCreateBy(subject);
+            priceInfo.setCreateTime(new Date());
+            
+            int affectCount = priceInfoService.insert(priceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(priceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<PriceInfo> edit(@PathVariable("id") String id){
+        MessageResult<PriceInfo> msgResult = new MessageResult<>();
+
+        try {
+            PriceInfo priceInfo = priceInfoService.get(id);
+
+            if (priceInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(priceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<PriceInfo> update(@RequestBody PriceInfo priceInfo,@RequestAttribute String subject){
+        MessageResult<PriceInfo> msgResult = new MessageResult<>();
+
+        try {
+            priceInfo.setUpdateBy(subject);
+            priceInfo.setUpdateTime(new Date());
+            
+            int affectCount = priceInfoService.update(priceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(priceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            PriceInfo priceInfo = priceInfoService.get(id);
+            priceInfo.setDelFlag(true);
+            priceInfo.setUpdateBy(subject);
+            priceInfo.setUpdateTime(new Date());
+
+            int affectCount = priceInfoService.update(priceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                PriceInfo priceInfo = priceInfoService.get(id);
+                priceInfo.setDelFlag(true);
+                priceInfo.setUpdateBy(subject);
+                priceInfo.setUpdateTime(new Date());
+
+                affectCount += priceInfoService.update(priceInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<PriceInfo> page = priceInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/bus/controller/RouteInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.bus.entity.RouteInfo;
+import com.jpsoft.bus.modules.bus.service.RouteInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 车辆表
+ */
+@RestController
+@RequestMapping("/bus/routeInfo")
+@Api(description = "routeInfo")
+public class RouteInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private RouteInfoService routeInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<RouteInfo> create(){
+        MessageResult<RouteInfo> msgResult = new MessageResult<>();
+
+        RouteInfo routeInfo = new RouteInfo();
+
+        msgResult.setData(routeInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<RouteInfo> add(@RequestBody RouteInfo routeInfo,@RequestAttribute String subject){
+        MessageResult<RouteInfo> msgResult = new MessageResult<>();
+
+        try {
+            routeInfo.setId(UUID.randomUUID().toString());
+            routeInfo.setDelFlag(false);
+            routeInfo.setCreateBy(subject);
+            routeInfo.setCreateTime(new Date());
+            
+            int affectCount = routeInfoService.insert(routeInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(routeInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<RouteInfo> edit(@PathVariable("id") String id){
+        MessageResult<RouteInfo> msgResult = new MessageResult<>();
+
+        try {
+            RouteInfo routeInfo = routeInfoService.get(id);
+
+            if (routeInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(routeInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<RouteInfo> update(@RequestBody RouteInfo routeInfo,@RequestAttribute String subject){
+        MessageResult<RouteInfo> msgResult = new MessageResult<>();
+
+        try {
+            routeInfo.setUpdateBy(subject);
+            routeInfo.setUpdateTime(new Date());
+            
+            int affectCount = routeInfoService.update(routeInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(routeInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            RouteInfo routeInfo = routeInfoService.get(id);
+            routeInfo.setDelFlag(true);
+            routeInfo.setUpdateBy(subject);
+            routeInfo.setUpdateTime(new Date());
+
+            int affectCount = routeInfoService.update(routeInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                RouteInfo routeInfo = routeInfoService.get(id);
+                routeInfo.setDelFlag(true);
+                routeInfo.setUpdateBy(subject);
+                routeInfo.setUpdateTime(new Date());
+
+                affectCount += routeInfoService.update(routeInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<RouteInfo> page = routeInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/bus/controller/StationInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.bus.entity.StationInfo;
+import com.jpsoft.bus.modules.bus.service.StationInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 车辆站点
+ */
+@RestController
+@RequestMapping("/bus/stationInfo")
+@Api(description = "stationInfo")
+public class StationInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private StationInfoService stationInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<StationInfo> create(){
+        MessageResult<StationInfo> msgResult = new MessageResult<>();
+
+        StationInfo stationInfo = new StationInfo();
+
+        msgResult.setData(stationInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<StationInfo> add(@RequestBody StationInfo stationInfo,@RequestAttribute String subject){
+        MessageResult<StationInfo> msgResult = new MessageResult<>();
+
+        try {
+            stationInfo.setId(UUID.randomUUID().toString());
+            stationInfo.setDelFlag(false);
+            stationInfo.setCreateBy(subject);
+            stationInfo.setCreateTime(new Date());
+            
+            int affectCount = stationInfoService.insert(stationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(stationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<StationInfo> edit(@PathVariable("id") String id){
+        MessageResult<StationInfo> msgResult = new MessageResult<>();
+
+        try {
+            StationInfo stationInfo = stationInfoService.get(id);
+
+            if (stationInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(stationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<StationInfo> update(@RequestBody StationInfo stationInfo,@RequestAttribute String subject){
+        MessageResult<StationInfo> msgResult = new MessageResult<>();
+
+        try {
+            stationInfo.setUpdateBy(subject);
+            stationInfo.setUpdateTime(new Date());
+            
+            int affectCount = stationInfoService.update(stationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(stationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            StationInfo stationInfo = stationInfoService.get(id);
+            stationInfo.setDelFlag(true);
+            stationInfo.setUpdateBy(subject);
+            stationInfo.setUpdateTime(new Date());
+
+            int affectCount = stationInfoService.update(stationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                StationInfo stationInfo = stationInfoService.get(id);
+                stationInfo.setDelFlag(true);
+                stationInfo.setUpdateBy(subject);
+                stationInfo.setUpdateTime(new Date());
+
+                affectCount += stationInfoService.update(stationInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<StationInfo> page = stationInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/bus/modules/bus/controller/VehicleInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.bus.entity.VehicleInfo;
+import com.jpsoft.bus.modules.bus.service.VehicleInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 车辆表
+ */
+@RestController
+@RequestMapping("/bus/vehicleInfo")
+@Api(description = "vehicleInfo")
+public class VehicleInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private VehicleInfoService vehicleInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<VehicleInfo> create(){
+        MessageResult<VehicleInfo> msgResult = new MessageResult<>();
+
+        VehicleInfo vehicleInfo = new VehicleInfo();
+
+        msgResult.setData(vehicleInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<VehicleInfo> add(@RequestBody VehicleInfo vehicleInfo,@RequestAttribute String subject){
+        MessageResult<VehicleInfo> msgResult = new MessageResult<>();
+
+        try {
+            vehicleInfo.setId(UUID.randomUUID().toString());
+            vehicleInfo.setDelFlag(false);
+            vehicleInfo.setCreateBy(subject);
+            vehicleInfo.setCreateTime(new Date());
+            
+            int affectCount = vehicleInfoService.insert(vehicleInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(vehicleInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<VehicleInfo> edit(@PathVariable("id") String id){
+        MessageResult<VehicleInfo> msgResult = new MessageResult<>();
+
+        try {
+            VehicleInfo vehicleInfo = vehicleInfoService.get(id);
+
+            if (vehicleInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(vehicleInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<VehicleInfo> update(@RequestBody VehicleInfo vehicleInfo,@RequestAttribute String subject){
+        MessageResult<VehicleInfo> msgResult = new MessageResult<>();
+
+        try {
+            vehicleInfo.setUpdateBy(subject);
+            vehicleInfo.setUpdateTime(new Date());
+            
+            int affectCount = vehicleInfoService.update(vehicleInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(vehicleInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            VehicleInfo vehicleInfo = vehicleInfoService.get(id);
+            vehicleInfo.setDelFlag(true);
+            vehicleInfo.setUpdateBy(subject);
+            vehicleInfo.setUpdateTime(new Date());
+
+            int affectCount = vehicleInfoService.update(vehicleInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                VehicleInfo vehicleInfo = vehicleInfoService.get(id);
+                vehicleInfo.setDelFlag(true);
+                vehicleInfo.setUpdateBy(subject);
+                vehicleInfo.setUpdateTime(new Date());
+
+                affectCount += vehicleInfoService.update(vehicleInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<VehicleInfo> page = vehicleInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}