乘客 班次

common/src/main/java/com/jpsoft/bus/modules/bus/dao/PassengerInfoDAO.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.PassengerInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface PassengerInfoDAO {
+	int insert(PassengerInfo entity);
+	int update(PassengerInfo entity);
+	int exist(String id);
+	PassengerInfo get(String id);
+	int delete(String id);
+	List<PassengerInfo> list();
+	List<PassengerInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dao/ShiftInfoDAO.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.ShiftInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface ShiftInfoDAO {
+	int insert(ShiftInfo entity);
+	int update(ShiftInfo entity);
+	int exist(String id);
+	ShiftInfo get(String id);
+	int delete(String id);
+	List<ShiftInfo> list();
+	List<ShiftInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

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

@@ -0,0 +1,59 @@
+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_passenger_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_passenger_info的实体类")
+public class PassengerInfo {
+        @ApiModelProperty(value = "乘客表主键")
+    private String id;
+        @ApiModelProperty(value = "车辆班次编号")
+    private String vehicleShiftId;
+        @ApiModelProperty(value = "车辆人员设备编号")
+    private Long  vehiclePersonId;
+        @ApiModelProperty(value = "注册用户编号")
+    private Long userId;
+        @ApiModelProperty(value = "乘车人照片")
+    private String imageUrl;
+        @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 = "上车站点")
+    private String upStationId;
+        @ApiModelProperty(value = "下车站点")
+    private String downStationId;
+        @ApiModelProperty(value = "0-未乘车、1-上车、2-下车")
+    private String status;
+        @ApiModelProperty(value = "0-未购票、1-已购票，2-已过站，3-已补票")
+    private String payStatus;
+        @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/ShiftInfo.java

@@ -0,0 +1,53 @@
+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_shift_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_shift_info的实体类")
+public class ShiftInfo {
+        @ApiModelProperty(value = "车辆班次编号")
+    private String id;
+        @ApiModelProperty(value = "司机")
+    private Long  driverId;
+        @ApiModelProperty(value = "车辆编号")
+    private String vehicleId;
+        @ApiModelProperty(value = "路线编号")
+    private String routeId;
+        @ApiModelProperty(value = "起始站")
+    private String startStationId;
+        @ApiModelProperty(value = "当前站点")
+    private String currentStationId;
+        @ApiModelProperty(value = "状态值")
+    private String status;
+        @ApiModelProperty(value = "终点站")
+    private String endStationId;
+        @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;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "是否收班（到达终点站，乘客全部下车）")
+    private Date finishTime;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/PassengerInfoService.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.PassengerInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface PassengerInfoService {
+	PassengerInfo get(String id);
+	boolean exist(String id);
+	int insert(PassengerInfo model);
+	int update(PassengerInfo model);
+	int delete(String id);
+	List<PassengerInfo> list();
+	Page<PassengerInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/ShiftInfoService.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.ShiftInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface ShiftInfoService {
+	ShiftInfo get(String id);
+	boolean exist(String id);
+	int insert(ShiftInfo model);
+	int update(ShiftInfo model);
+	int delete(String id);
+	List<ShiftInfo> list();
+	Page<ShiftInfo> 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/PassengerInfoServiceImpl.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.PassengerInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.PassengerInfo;
+import com.jpsoft.bus.modules.bus.service.PassengerInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="passengerInfoService")
+public class PassengerInfoServiceImpl implements PassengerInfoService {
+	@Resource(name="passengerInfoDAO")
+	private PassengerInfoDAO passengerInfoDAO;
+
+	@Override
+	public PassengerInfo get(String id) {
+		// TODO Auto-generated method stub
+		return passengerInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(PassengerInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return passengerInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(PassengerInfo model) {
+		// TODO Auto-generated method stub
+		return passengerInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return passengerInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = passengerInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<PassengerInfo> list() {
+		// TODO Auto-generated method stub
+		return passengerInfoDAO.list();
+	}
+		
+	@Override
+	public Page<PassengerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<PassengerInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            passengerInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/ShiftInfoServiceImpl.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.ShiftInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.ShiftInfo;
+import com.jpsoft.bus.modules.bus.service.ShiftInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="shiftInfoService")
+public class ShiftInfoServiceImpl implements ShiftInfoService {
+	@Resource(name="shiftInfoDAO")
+	private ShiftInfoDAO shiftInfoDAO;
+
+	@Override
+	public ShiftInfo get(String id) {
+		// TODO Auto-generated method stub
+		return shiftInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(ShiftInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return shiftInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(ShiftInfo model) {
+		// TODO Auto-generated method stub
+		return shiftInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return shiftInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = shiftInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<ShiftInfo> list() {
+		// TODO Auto-generated method stub
+		return shiftInfoDAO.list();
+	}
+		
+	@Override
+	public Page<ShiftInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<ShiftInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            shiftInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -0,0 +1,131 @@
+<?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.PassengerInfoDAO">
+	<resultMap id="PassengerInfoMap" type="com.jpsoft.bus.modules.bus.entity.PassengerInfo">
+		<id property="id" column="id_" />
+			<result property="vehicleShiftId" column="vehicle_shift_id" />
+			<result property="vehiclePersonId" column="vehicle_person_id" />
+			<result property="userId" column="user_id" />
+			<result property="imageUrl" column="image_url" />
+			<result property="upTime" column="up_time" />
+			<result property="downTime" column="down_time" />
+			<result property="upStationId" column="up_station_id" />
+			<result property="downStationId" column="down_station_id" />
+			<result property="status" column="status_" />
+			<result property="payStatus" column="pay_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.bus.entity.PassengerInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_passenger_info
+	    (id_,vehicle_shift_id,vehicle_person_id,user_id,image_url,up_time,down_time,up_station_id,down_station_id,status_,pay_status,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{vehicleShiftId,jdbcType=VARCHAR}
+,#{vehiclePersonId,jdbcType= NUMERIC }
+,#{userId,jdbcType= NUMERIC }
+,#{imageUrl,jdbcType=VARCHAR}
+,#{upTime,jdbcType= TIMESTAMP }
+,#{downTime,jdbcType= TIMESTAMP }
+,#{upStationId,jdbcType=VARCHAR}
+,#{downStationId,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{payStatus,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_passenger_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.PassengerInfo">
+		update bus_passenger_info
+		<set>
+				<if test="vehicleShiftId!=null">
+		vehicle_shift_id=#{vehicleShiftId,jdbcType=VARCHAR},
+		</if>
+				<if test="vehiclePersonId!=null">
+		vehicle_person_id=#{vehiclePersonId,jdbcType= NUMERIC },
+		</if>
+				<if test="userId!=null">
+		user_id=#{userId,jdbcType= NUMERIC },
+		</if>
+				<if test="imageUrl!=null">
+		image_url=#{imageUrl,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="upStationId!=null">
+		up_station_id=#{upStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="downStationId!=null">
+		down_station_id=#{downStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType=VARCHAR},
+		</if>
+				<if test="payStatus!=null">
+		pay_status=#{payStatus,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="PassengerInfoMap">
+		select * from bus_passenger_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_passenger_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="PassengerInfoMap">
+		select * from bus_passenger_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PassengerInfoMap">
+		<![CDATA[
+			select * from bus_passenger_info
+		]]>
+		<where>
+			del_flag = 0
+			<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/ShiftInfo.xml

@@ -0,0 +1,121 @@
+<?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.ShiftInfoDAO">
+	<resultMap id="ShiftInfoMap" type="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
+		<id property="id" column="id_" />
+			<result property="driverId" column="driver_id" />
+			<result property="vehicleId" column="vehicle_id" />
+			<result property="routeId" column="route_id" />
+			<result property="startStationId" column="start_station_id" />
+			<result property="currentStationId" column="current_station_id" />
+			<result property="status" column="status_" />
+			<result property="endStationId" column="end_station_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" />
+			<result property="finishTime" column="finish_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_shift_info
+	    (id_,driver_id,vehicle_id,route_id,start_station_id,current_station_id,status_,end_station_id,create_by,create_time,update_by,update_time,del_flag,finish_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{driverId,jdbcType= NUMERIC }
+,#{vehicleId,jdbcType=VARCHAR}
+,#{routeId,jdbcType=VARCHAR}
+,#{startStationId,jdbcType=VARCHAR}
+,#{currentStationId,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{endStationId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{finishTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_shift_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
+		update bus_shift_info
+		<set>
+				<if test="driverId!=null">
+		driver_id=#{driverId,jdbcType= NUMERIC },
+		</if>
+				<if test="vehicleId!=null">
+		vehicle_id=#{vehicleId,jdbcType=VARCHAR},
+		</if>
+				<if test="routeId!=null">
+		route_id=#{routeId,jdbcType=VARCHAR},
+		</if>
+				<if test="startStationId!=null">
+		start_station_id=#{startStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="currentStationId!=null">
+		current_station_id=#{currentStationId,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType=VARCHAR},
+		</if>
+				<if test="endStationId!=null">
+		end_station_id=#{endStationId,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="finishTime!=null">
+		finish_time=#{finishTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="ShiftInfoMap">
+		select * from bus_shift_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_shift_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="ShiftInfoMap">
+		select * from bus_shift_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="ShiftInfoMap">
+		<![CDATA[
+			select * from bus_shift_info
+		]]>
+		<where>
+			del_flag = 0
+			<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/bus/controller/PassengerInfoController.java

@@ -0,0 +1,229 @@
+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.PassengerInfo;
+import com.jpsoft.bus.modules.bus.service.PassengerInfoService;
+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/passengerInfo")
+@Api(description = "passengerInfo")
+public class PassengerInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PassengerInfoService passengerInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<PassengerInfo> create(){
+        MessageResult<PassengerInfo> msgResult = new MessageResult<>();
+
+        PassengerInfo passengerInfo = new PassengerInfo();
+
+        msgResult.setData(passengerInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<PassengerInfo> add(@RequestBody PassengerInfo passengerInfo,@RequestAttribute String subject){
+        MessageResult<PassengerInfo> msgResult = new MessageResult<>();
+
+        try {
+            passengerInfo.setId(UUID.randomUUID().toString());
+            passengerInfo.setDelFlag(false);
+            passengerInfo.setCreateBy(subject);
+            passengerInfo.setCreateTime(new Date());
+            
+            int affectCount = passengerInfoService.insert(passengerInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(passengerInfo);
+            } 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<PassengerInfo> edit(@PathVariable("id") String id){
+        MessageResult<PassengerInfo> msgResult = new MessageResult<>();
+
+        try {
+            PassengerInfo passengerInfo = passengerInfoService.get(id);
+
+            if (passengerInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(passengerInfo);
+            } 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<PassengerInfo> update(@RequestBody PassengerInfo passengerInfo,@RequestAttribute String subject){
+        MessageResult<PassengerInfo> msgResult = new MessageResult<>();
+
+        try {
+            passengerInfo.setUpdateBy(subject);
+            passengerInfo.setUpdateTime(new Date());
+            
+            int affectCount = passengerInfoService.update(passengerInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(passengerInfo);
+            } 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 {
+            PassengerInfo passengerInfo = passengerInfoService.get(id);
+            passengerInfo.setDelFlag(true);
+            passengerInfo.setUpdateBy(subject);
+            passengerInfo.setUpdateTime(new Date());
+
+            int affectCount = passengerInfoService.update(passengerInfo);
+
+            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) {
+                PassengerInfo passengerInfo = passengerInfoService.get(id);
+                passengerInfo.setDelFlag(true);
+                passengerInfo.setUpdateBy(subject);
+                passengerInfo.setUpdateTime(new Date());
+
+                affectCount += passengerInfoService.update(passengerInfo);
+            }
+
+            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<PassengerInfo> page = passengerInfoService.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/ShiftInfoController.java

@@ -0,0 +1,229 @@
+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.ShiftInfo;
+import com.jpsoft.bus.modules.bus.service.ShiftInfoService;
+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/shiftInfo")
+@Api(description = "shiftInfo")
+public class ShiftInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ShiftInfoService shiftInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<ShiftInfo> create(){
+        MessageResult<ShiftInfo> msgResult = new MessageResult<>();
+
+        ShiftInfo shiftInfo = new ShiftInfo();
+
+        msgResult.setData(shiftInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<ShiftInfo> add(@RequestBody ShiftInfo shiftInfo,@RequestAttribute String subject){
+        MessageResult<ShiftInfo> msgResult = new MessageResult<>();
+
+        try {
+            shiftInfo.setId(UUID.randomUUID().toString());
+            shiftInfo.setDelFlag(false);
+            shiftInfo.setCreateBy(subject);
+            shiftInfo.setCreateTime(new Date());
+            
+            int affectCount = shiftInfoService.insert(shiftInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(shiftInfo);
+            } 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<ShiftInfo> edit(@PathVariable("id") String id){
+        MessageResult<ShiftInfo> msgResult = new MessageResult<>();
+
+        try {
+            ShiftInfo shiftInfo = shiftInfoService.get(id);
+
+            if (shiftInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(shiftInfo);
+            } 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<ShiftInfo> update(@RequestBody ShiftInfo shiftInfo,@RequestAttribute String subject){
+        MessageResult<ShiftInfo> msgResult = new MessageResult<>();
+
+        try {
+            shiftInfo.setUpdateBy(subject);
+            shiftInfo.setUpdateTime(new Date());
+            
+            int affectCount = shiftInfoService.update(shiftInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(shiftInfo);
+            } 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 {
+            ShiftInfo shiftInfo = shiftInfoService.get(id);
+            shiftInfo.setDelFlag(true);
+            shiftInfo.setUpdateBy(subject);
+            shiftInfo.setUpdateTime(new Date());
+
+            int affectCount = shiftInfoService.update(shiftInfo);
+
+            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) {
+                ShiftInfo shiftInfo = shiftInfoService.get(id);
+                shiftInfo.setDelFlag(true);
+                shiftInfo.setUpdateBy(subject);
+                shiftInfo.setUpdateTime(new Date());
+
+                affectCount += shiftInfoService.update(shiftInfo);
+            }
+
+            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<ShiftInfo> page = shiftInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}