Merge remote-tracking branch 'origin/master'

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

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

@@ -0,0 +1,41 @@
+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_message的实体类
+ */
+@Data
+@ApiModel(value = "bus_passenger_message的实体类")
+public class PassengerMessage {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "openId")
+    private String openId;
+        @ApiModelProperty(value = "乘客id")
+    private String passengerId;
+        @ApiModelProperty(value = "阅读状态")
+    private Boolean readStatus;
+        @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

@@ -63,6 +63,8 @@ public class VehicleInfo {
     private Boolean online;
     @ApiModelProperty(value = "最后所在位置")
     private String latestAddress;
+    @ApiModelProperty(value = "运行线路名称")
+    private String routeName;
 
     private String companyName;
 }

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

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

@@ -0,0 +1,96 @@
+<?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.PassengerMessageDAO">
+	<resultMap id="PassengerMessageMap" type="com.jpsoft.bus.modules.bus.entity.PassengerMessage">
+		<id property="id" column="id_" />
+			<result property="openId" column="open_id" />
+			<result property="passengerId" column="passenger_id" />
+			<result property="readStatus" column="read_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.PassengerMessage">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_passenger_message
+	    (id_,open_id,passenger_id,read_status,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{openId,jdbcType=VARCHAR}
+,#{passengerId,jdbcType=VARCHAR}
+,#{readStatus,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_passenger_message where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.PassengerMessage">
+		update bus_passenger_message
+		<set>
+				<if test="openId!=null">
+		open_id=#{openId,jdbcType=VARCHAR},
+		</if>
+				<if test="passengerId!=null">
+		passenger_id=#{passengerId,jdbcType=VARCHAR},
+		</if>
+				<if test="readStatus!=null">
+		read_status=#{readStatus,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="PassengerMessageMap">
+		select 
+id_,open_id,passenger_id,read_status,create_by,create_time,update_by,update_time,del_flag		from bus_passenger_message where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_passenger_message where id_=#{0}
+	</select>
+	<select id="list" resultMap="PassengerMessageMap">
+		select * from bus_passenger_message
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PassengerMessageMap">
+		<![CDATA[
+			select * from bus_passenger_message
+		]]>
+		<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

@@ -86,8 +86,7 @@
 	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 * from bus_route_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from bus_route_info where id_=#{0}

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

@@ -25,6 +25,7 @@
 			<result property="acc" column="acc_" />
 			<result property="online" column="online_" />
 			<result property="latestAddress" column="latest_address" />
+			<result property="routeName" column="route_name" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.VehicleInfo">
 	<!--
@@ -141,21 +142,26 @@
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="VehicleInfoMap">
 		<![CDATA[
-			select * from bus_vehicle_info
+			SELECT
+				a.*,
+				b.name_ AS route_name
+			FROM
+				bus_vehicle_info a
+				LEFT JOIN bus_route_info b ON a.route_id = b.id_
 		]]>
 		<where>
-			del_flag=false
+			a.del_flag=false
 			<if test="searchParams.licensePlateNumber != null">
-				and license_plate_number like #{searchParams.licensePlateNumber}
+				and a.license_plate_number like #{searchParams.licensePlateNumber}
 			</if>
 			<if test="searchParams.companyId != null">
-				and company_id = #{searchParams.companyId}
+				and a.company_id = #{searchParams.companyId}
 			</if>
 			<if test="searchParams.gpsDeviceNo != null">
-				and gps_device_no like #{searchParams.gpsDeviceNo}
+				and a.gps_device_no like #{searchParams.gpsDeviceNo}
 			</if>
 			<if test="searchParams.deviceNo != null">
-				and device_no like #{searchParams.deviceNo}
+				and a.device_no like #{searchParams.deviceNo}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -17,7 +17,9 @@ import com.jpsoft.bus.modules.bus.service.RouteInfoService;
 import com.jpsoft.bus.modules.common.utils.OSSUtil;
 import com.jpsoft.bus.modules.common.utils.POIUtils;
 import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import com.jpsoft.bus.modules.sys.entity.User;
 import com.jpsoft.bus.modules.sys.service.DataDictionaryService;
+import com.jpsoft.bus.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -63,6 +65,9 @@ public class RouteInfoController {
     @Autowired
     private DataDictionaryService dataDictionaryService;
 
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<RouteInfoDTO> create(){
@@ -554,4 +559,38 @@ public class RouteInfoController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="路线")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<RouteInfo>> list(String companyId,@RequestAttribute String subject){
+
+        MessageResult<List<RouteInfo>> msgResult = new MessageResult<>();
+        User user = userService.get(subject);
+
+        CompanyInfo companyInfo = companyInfoService.get(companyId);
+
+        String queryCompanyId = "";
+        if(companyInfo != null){
+            if("1".equals(companyInfo.getType())){
+                //公司
+                queryCompanyId = companyId;
+            }else if("2".equals(companyInfo.getType())){
+                //车队 查上级
+                queryCompanyId = companyInfo.getParentId();
+            }
+        }
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("companyId",queryCompanyId);
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        Page<RouteInfo> page = routeInfoService.pageSearch(searchParams,0,1000,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
 }

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

@@ -231,7 +231,8 @@ public class VehicleInfoController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("b.name_","asc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
         if (StringUtils.isNotEmpty(licensePlateNumber)) {
             searchParams.put("licensePlateNumber","%" + licensePlateNumber + "%");