帮助中心

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

@@ -0,0 +1,24 @@
+package com.jpsoft.bus.modules.base.dao;
+
+import com.jpsoft.bus.modules.base.entity.HelpCenter;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-25 17:52
+ */
+@Repository
+public interface HelpCenterDAO {
+
+    int insert(HelpCenter entity);
+    int update(HelpCenter entity);
+    int exist(String id);
+    HelpCenter get(String id);
+    int delete(String id);
+    List<HelpCenter> list();
+    List<HelpCenter> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

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

@@ -0,0 +1,37 @@
+package com.jpsoft.bus.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-25 17:45
+ */
+@Data
+public class HelpCenter {
+
+    private String id;
+
+    private String titleName;
+
+    private String desc;
+
+    @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 = false;
+}

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

@@ -0,0 +1,23 @@
+package com.jpsoft.bus.modules.base.service;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.base.entity.HelpCenter;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-25 17:46
+ */
+public interface HelpCenterService {
+
+    HelpCenter get(String id);
+    boolean exist(String id);
+    int insert(HelpCenter model);
+    int update(HelpCenter model);
+    int delete(String id);
+    List<HelpCenter> list();
+    Page<HelpCenter> 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/HelpCenterServiceImpl.java

@@ -0,0 +1,75 @@
+package com.jpsoft.bus.modules.base.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.jpsoft.bus.modules.base.dao.HelpCenterDAO;
+import com.jpsoft.bus.modules.base.entity.HelpCenter;
+import com.jpsoft.bus.modules.base.service.HelpCenterService;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-25 17:47
+ */
+@Transactional
+@Component(value="helpCenterService")
+public class HelpCenterServiceImpl implements HelpCenterService {
+
+    @Resource(name="helpCenterDAO")
+    private HelpCenterDAO helpCenterDAO;
+
+    @Override
+    public HelpCenter get(String id) {
+        // TODO Auto-generated method stub
+        return helpCenterDAO.get(id);
+    }
+
+    @Override
+    public int insert(HelpCenter model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
+
+        return helpCenterDAO.insert(model);
+    }
+
+    @Override
+    public int update(HelpCenter model) {
+        // TODO Auto-generated method stub
+        return helpCenterDAO.update(model);
+    }
+
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return helpCenterDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = helpCenterDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<HelpCenter> list() {
+        // TODO Auto-generated method stub
+        return helpCenterDAO.list();
+    }
+
+    @Override
+    public Page<HelpCenter> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count, List<Sort> sortList) {
+        Page<HelpCenter> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            helpCenterDAO.search(searchParams,sortList);
+        });
+
+        return page;
+    }
+}

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

@@ -16,5 +16,7 @@ public interface StationRemindDAO {
 	List<StationRemind> list();
 	List<StationRemind> search(Map<String, Object> searchParams, List<Sort> sortList);
     List<StationRemind> findByAdvanceStationId(String currentStationId);
-	StationRemind findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId);
+	List<StationRemind>  findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId);
+
+	List<StationRemind> findByOpenId(String openId);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/dto/NearbyStationDTO.java

@@ -15,5 +15,7 @@ public class NearbyStationDTO {
 
     private String stationId;
 
+    private Integer distance;
+
     private List<NearbyShiftDTO> nearbyShiftDTOList;
 }

common/src/main/java/com/jpsoft/bus/modules/bus/dto/PassengerRecordDetailDTO.java

@@ -0,0 +1,46 @@
+package com.jpsoft.bus.modules.bus.dto;
+
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
+import com.jpsoft.bus.modules.bus.entity.RouteInfo;
+import com.jpsoft.bus.modules.bus.entity.ShiftInfo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2021-4-25 11:45
+ */
+@Data
+public class PassengerRecordDetailDTO {
+
+    private DriverInfo driverInfo;
+
+    private ShiftInfo shiftInfo;
+
+    private RouteInfo routeInfo;
+
+    private String tripName;
+
+    private String ticketDes;
+
+    private String goodsTicket;
+
+    private BigDecimal totalFee;
+
+    private String payTime;
+
+    private String ticketStatus;
+
+    private String ticketStatusName;
+
+    public String getTicketStatusName(String ticketStatus){
+        String ticketStatusName = "乘车中";
+
+        if ("2".equals(ticketStatus)){
+            ticketStatusName = "已过期";
+        }
+        return ticketStatusName;
+
+    }
+}

common/src/main/java/com/jpsoft/bus/modules/bus/dto/RouteShiftDTO.java

@@ -1,5 +1,6 @@
 package com.jpsoft.bus.modules.bus.dto;
 
+import com.jpsoft.bus.modules.bus.entity.DriverInfo;
 import lombok.Data;
 
 /**
@@ -16,4 +17,9 @@ public class RouteShiftDTO {
     private String longitude;
 
     private String latitude;
+
+    private String licensePlateNumber;
+
+    private DriverInfo driverInfo;
+
 }

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

@@ -15,5 +15,7 @@ public interface StationRemindService {
 	List<StationRemind> list();
 	Page<StationRemind> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
     List<StationRemind> findByAdvanceStationId(String currentStationId);
-    StationRemind findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId);
+    List<StationRemind> findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId);
+
+    List<StationRemind> findByOpenId(String openId);
 }

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

@@ -29,14 +29,14 @@ public class StationRemindServiceImpl implements StationRemindService {
 	public int insert(StationRemind model) {
 		// TODO Auto-generated method stub
 		//model.setId(UUID.randomUUID().toString());
-		
+
 		return stationRemindDAO.insert(model);
 	}
 
 	@Override
 	public int update(StationRemind model) {
 		// TODO Auto-generated method stub
-		return stationRemindDAO.update(model);		
+		return stationRemindDAO.update(model);
 	}
 
 	@Override
@@ -49,22 +49,22 @@ public class StationRemindServiceImpl implements StationRemindService {
 	public boolean exist(String id) {
 		// TODO Auto-generated method stub
 		int count = stationRemindDAO.exist(id);
-		
+
 		return count > 0 ? true : false;
 	}
-	
+
 	@Override
 	public List<StationRemind> list() {
 		// TODO Auto-generated method stub
 		return stationRemindDAO.list();
 	}
-		
+
 	@Override
 	public Page<StationRemind> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
         Page<StationRemind> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
             stationRemindDAO.search(searchParams,sortList);
         });
-        
+
         return page;
 	}
 
@@ -74,7 +74,12 @@ public class StationRemindServiceImpl implements StationRemindService {
 	}
 
 	@Override
-	public StationRemind findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId) {
+	public List<StationRemind> findByOpenIdAndVehicleShiftId(String openId, String vehicleShiftId) {
 		return stationRemindDAO.findByOpenIdAndVehicleShiftId(openId,vehicleShiftId);
 	}
+
+	@Override
+	public List<StationRemind> findByOpenId(String openId) {
+		return stationRemindDAO.findByOpenId(openId);
+	}
 }

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

@@ -0,0 +1,90 @@
+<?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.HelpCenterDAO">
+    <resultMap id="HelpCenterMap" type="com.jpsoft.bus.modules.base.entity.HelpCenter">
+        <id property="id" column="id_" />
+        <result property="titleName" column="title_name" />
+        <result property="desc" column="desc_" />
+        <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.HelpCenter">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
+		insert into base_help_center
+	    (id_,title_name,desc_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{titleName,jdbcType=VARCHAR}
+,#{desc,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_help_center where id_=#{id,jdbcType=VARCHAR}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.bus.modules.base.entity.HelpCenter">
+        update base_help_center
+        <set>
+            <if test="titleName!=null">
+                title_name=#{titleName,jdbcType=VARCHAR},
+            </if>
+            <if test="desc!=null">
+                desc_=#{desc,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="HelpCenterMap">
+        select * from base_help_center where id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from base_help_center where id_=#{0}
+    </select>
+    <select id="list" resultMap="HelpCenterMap">
+		select * from base_help_center where del_flag = 0
+	</select>
+    <select id="search" parameterType="hashmap" resultMap="HelpCenterMap">
+        <![CDATA[
+			select * from base_help_center
+		]]>
+        <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/StationRemind.xml

@@ -133,4 +133,13 @@
         and vehicle_shift_id = #{vehicleShiftId}
         order by create_time asc
     </select>
+
+    <select id="findByOpenId" resultMap="StationRemindMap">
+        <![CDATA[
+        select * from bus_station_remind
+        where del_flag = 0
+        and open_id = #{openId}
+        order by create_time desc
+        ]]>
+    </select>
 </mapper>

web/src/main/java/com/jpsoft/bus/config/WebMvcConfig.java

@@ -83,6 +83,14 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/passengerApi/passengerRecordList")
 				.excludePathPatterns("/mobile/passengerApi/routeShiftList")
 				.excludePathPatterns("/mobile/stationRemindApi/**")
-				.excludePathPatterns("/mobile/passengerApi/findCurrentVehicle");
+				.excludePathPatterns("/mobile/passengerApi/findCurrentVehicle")
+				.excludePathPatterns("/mobile/passengerApi/nearbyStationInfo")
+				.excludePathPatterns("/mobile/passengerApi/passengerRecordDetail")
+				.excludePathPatterns("/mobile/passengerApi/passengerRemindList")
+				.excludePathPatterns("/mobile/passengerApi/passengerShiftRemindList")
+				.excludePathPatterns("/mobile/passengerApi/helpCenterList")
+
+
+		;
 	}
 }

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/StationRemindApiController.java

@@ -51,7 +51,7 @@ public class StationRemindApiController {
     @Autowired
     private PassengerInfoService passengerInfoService;
 
-    @ApiOperation(value="添加订阅")
+    @ApiOperation(value = "添加订阅")
     @PostMapping("add")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startStationId", value = "起始站点编号", paramType = "form"),
@@ -61,8 +61,8 @@ public class StationRemindApiController {
             @ApiImplicitParam(name = "vehicleShiftId", value = "车辆班次编号", paramType = "form", allowEmptyValue = true),
             @ApiImplicitParam(name = "openId", value = "微信openId", paramType = "form")
     })
-    public MessageResult<StationRemind> add(String startStationId,String remindStationId,Integer stopInAdvance,
-                                            Integer remindType,String vehicleShiftId,String openId){
+    public MessageResult<StationRemind> add(String startStationId, String remindStationId, Integer stopInAdvance,
+                                            Integer remindType, String vehicleShiftId, String openId) {
         MessageResult<StationRemind> msgResult = new MessageResult<>();
 
         try {
@@ -74,7 +74,7 @@ public class StationRemindApiController {
 
             StationInfo advanceStation = getAdvanceStation(startStationId, remindStationId, stopInAdvance);
 
-            if(advanceStation!=null) {
+            if (advanceStation != null) {
                 stationRemind.setAdvanceStationId(advanceStation.getId());
             }
 
@@ -84,7 +84,7 @@ public class StationRemindApiController {
             stationRemind.setDelFlag(false);
             stationRemind.setCreateBy(openId);
             stationRemind.setCreateTime(new Date());
-            
+
             int affectCount = stationRemindService.insert(stationRemind);
 
             if (affectCount > 0) {
@@ -94,9 +94,8 @@ public class StationRemindApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("订阅失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -105,7 +104,7 @@ public class StationRemindApiController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新订阅")
+    @ApiOperation(value = "更新订阅")
     @PostMapping("update")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "remindId", value = "订阅编号", paramType = "form"),
@@ -116,8 +115,8 @@ public class StationRemindApiController {
             @ApiImplicitParam(name = "vehicleShiftId", value = "车辆班次编号", paramType = "form", allowEmptyValue = true),
             @ApiImplicitParam(name = "openId", value = "微信openId", paramType = "form")
     })
-    public MessageResult<StationRemind> update(String remindId,String startStationId,String remindStationId,Integer stopInAdvance,
-                                            Integer remindType,String vehicleShiftId,String openId){
+    public MessageResult<StationRemind> update(String remindId, String startStationId, String remindStationId, Integer stopInAdvance,
+                                               Integer remindType, String vehicleShiftId, String openId) {
         MessageResult<StationRemind> msgResult = new MessageResult<>();
 
         try {
@@ -128,7 +127,7 @@ public class StationRemindApiController {
 
             StationInfo advanceStation = getAdvanceStation(startStationId, remindStationId, stopInAdvance);
 
-            if(advanceStation!=null) {
+            if (advanceStation != null) {
                 stationRemind.setAdvanceStationId(advanceStation.getId());
             }
 
@@ -148,9 +147,8 @@ public class StationRemindApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("订阅失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -165,13 +163,13 @@ public class StationRemindApiController {
         List<StationInfo> stationList = stationInfoService.findByRouteId(station.getRouteId());
         StationInfo advanceStation = null;
 
-        if(stationList.size()>0){
+        if (stationList.size() > 0) {
             StationInfo firstStation = stationList.get(0);
 
             int curIndex = 0;
 
-            for(int i=0;i<stationList.size();i++){
-                if(stationList.get(i).getId().equals(remindStationId)){
+            for (int i = 0; i < stationList.size(); i++) {
+                if (stationList.get(i).getId().equals(remindStationId)) {
                     curIndex = i;
                     break;
                 }
@@ -179,34 +177,32 @@ public class StationRemindApiController {
 
             int advanceIndex = 0;
 
-            if (firstStation.getId().equals(startStationId)){
+            if (firstStation.getId().equals(startStationId)) {
                 //首站->终点站
                 advanceIndex = curIndex - stopInAdvance;
-            }
-            else{
+            } else {
                 //终点站->首站
                 advanceIndex = curIndex + stopInAdvance;
             }
 
-            if(advanceIndex<0){
+            if (advanceIndex < 0) {
                 advanceIndex = 0;
             }
 
-            if (advanceIndex>=stationList.size()){
+            if (advanceIndex >= stationList.size()) {
                 advanceIndex = stationList.size() - 1;
             }
 
             advanceStation = stationList.get(advanceIndex);
-        }
-        else{
+        } else {
             throw new Exception("当前站点没有关联路线");
         }
         return advanceStation;
     }
 
-    @ApiOperation(value="取消订阅")
+    @ApiOperation(value = "取消订阅")
     @PostMapping("cancel")
-    public MessageResult<Integer> cancel(String id){
+    public MessageResult<Integer> cancel(String id) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -223,9 +219,8 @@ public class StationRemindApiController {
                 msgResult.setResult(false);
                 msgResult.setMessage("取消订阅失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -234,29 +229,29 @@ public class StationRemindApiController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String openId,
             String vehicleShiftId,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize){
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("create_time", "desc"));
 
         if (StringUtils.isNotEmpty(openId)) {
-            searchParams.put("openId",openId);
+            searchParams.put("openId", openId);
         }
 
         if (StringUtils.isNotEmpty(vehicleShiftId)) {
-            searchParams.put("vehicleShiftId",vehicleShiftId);
+            searchParams.put("vehicleShiftId", vehicleShiftId);
         }
 
-        Page<StationRemind> page = stationRemindService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<StationRemind> page = stationRemindService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
@@ -265,8 +260,8 @@ public class StationRemindApiController {
     }
 
     @GetMapping("sendMessage")
-    @ApiOperation(value="sendMessage")
-    public MessageResult<String> sendMessage(String shiftId){
+    @ApiOperation(value = "sendMessage")
+    public MessageResult<String> sendMessage(String shiftId) {
         MessageResult<String> messageResult = new MessageResult<>();
 
         try {
@@ -274,9 +269,8 @@ public class StationRemindApiController {
             rabbitTemplate.convertAndSend("stationRemindQueue", shiftInfo);
 
             messageResult.setResult(true);
-        }
-        catch (Exception ex){
-            log.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
 
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -287,17 +281,17 @@ public class StationRemindApiController {
 
 
     @GetMapping("findCurrentVehicle")
-    @ApiOperation(value="查询当前乘坐车辆")
-    public MessageResult<List> findCurrentVehicle(String openId){
+    @ApiOperation(value = "查询当前乘坐车辆")
+    public MessageResult<List> findCurrentVehicle(String openId) {
         MessageResult<List> messageResult = new MessageResult<>();
 
         try {
-            List<PassengerInfo> passengers = passengerInfoService.findByOpenIdAndStatus(openId,"1", "1");
+            List<PassengerInfo> passengers = passengerInfoService.findByOpenIdAndStatus(openId, "1", "1");
 
             Set<String> vehicleShiftSet = new HashSet<>();
 
             for (PassengerInfo passenger : passengers) {
-                if(!vehicleShiftSet.contains(passenger.getVehicleShiftId())){
+                if (!vehicleShiftSet.contains(passenger.getVehicleShiftId())) {
                     vehicleShiftSet.add(passenger.getVehicleShiftId());
                 }
             }
@@ -307,7 +301,7 @@ public class StationRemindApiController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
             for (String vehicleShiftId : vehicleShiftSet) {
-                Map<String,Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>();
                 map.put("vehicleShiftId", vehicleShiftId);
 
                 ShiftInfo shiftInfo = shiftInfoService.get(vehicleShiftId);
@@ -323,46 +317,47 @@ public class StationRemindApiController {
                 StationInfo currentStation = stationInfoService.get(shiftInfo.getCurrentStationId());
                 StationInfo endStation = stationInfoService.get(shiftInfo.getEndStationId());
 
-                map.put("startStationId",startStation.getId());
-                map.put("startStationName",startStation.getName());
-                map.put("endStationId",endStation.getId());
-                map.put("endStationName",endStation.getName());
+                map.put("startStationId", startStation.getId());
+                map.put("startStationName", startStation.getName());
+                map.put("endStationId", endStation.getId());
+                map.put("endStationName", endStation.getName());
 
-                if(currentStation!=null){
-                    map.put("currentStationId",currentStation.getId());
-                    map.put("currentStationName",currentStation.getName());
+                if (currentStation != null) {
+                    map.put("currentStationId", currentStation.getId());
+                    map.put("currentStationName", currentStation.getName());
                 }
 
                 //查询目的地
-                List<PassengerInfo> passengerInfos = passengerInfoService.findByOpenIdAndVehicleShiftId(openId,vehicleShiftId, "1" ,"1");
+                List<PassengerInfo> passengerInfos = passengerInfoService.findByOpenIdAndVehicleShiftId(openId, vehicleShiftId, "1", "1");
 
-                if (passengerInfos.size()>0){
+                if (passengerInfos.size() > 0) {
                     PassengerInfo passengerInfo = passengerInfos.get(0);
                     StationInfo ticketDownStation = stationInfoService.get(passengerInfo.getTicketDownStationId());
 
                     map.put("ticketDownStationId", ticketDownStation.getId());
-                    map.put("ticketDownStationName",ticketDownStation.getName());
+                    map.put("ticketDownStationName", ticketDownStation.getName());
                 }
 
                 //是否创建消息提醒，显示消息提醒的到达站点信息
-                map.put("openId",openId);
+                map.put("openId", openId);
+
+                List<StationRemind> stationRemindList = stationRemindService.findByOpenIdAndVehicleShiftId(openId, vehicleShiftId);
+                if (stationRemindList.size() > 0) {
+                    map.put("remindId", stationRemindList.get(0).getId());
+                    map.put("stopInAdvance", stationRemindList.get(0).getStopInAdvance());
 
-                StationRemind stationRemind = stationRemindService.findByOpenIdAndVehicleShiftId(openId,vehicleShiftId);
 
-                if(stationRemind!=null){
-                    map.put("remindId", stationRemind.getId());
-                    map.put("stopInAdvance", stationRemind.getStopInAdvance());
                 }
 
+
                 mapList.add(map);
             }
 
             //todo 填写具体代码
             messageResult.setData(mapList);
             messageResult.setResult(true);
-        }
-        catch (Exception ex){
-            log.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
 
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());

web/src/main/java/com/jpsoft/bus/modules/mq/listener/StationRemindListener.java

@@ -63,7 +63,7 @@ public class StationRemindListener {
 
             for (StationRemind stationRemind : stationRemindList) {
                 try {
-                    String remindStr = "上车刷脸听到“识别成功”通行，入座扫码手机购票。";
+                    String remindStr = "上车刷脸听到“感谢乘车”通行，入座扫码手机购票。";
 
                     if (stationRemind.getRemindType() != null && stationRemind.getRemindType() == 2) {
                         //下车提醒要判断是不是同一个班次
@@ -71,13 +71,13 @@ public class StationRemindListener {
                             continue;
                         }
                         else{
-                            remindStr = "下车时刷脸听到“识别成功”即可下车！";
+                            remindStr = "下车时刷脸听到“感谢乘车”即可下车！";
                         }
                     }
 
                     String detail = "上车提醒";
                     if (stationRemind.getRemindType() == 2){
-                        detail = "下次提醒";
+                        detail = "下车提醒";
                     }