bug修改

common/src/main/java/com/jpsoft/bus/modules/bus/callback/GpsDataCallbackImpl.java

@@ -161,6 +161,8 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
                                 frontToEnd = false;
                             }
 
+
+
                             //查询乘客表是否有过站的情况
                             List<PassengerInfo> passengerInfoList = passengerInfoService.findByShiftStatusPayStatusNotTicketDown(shiftInfo.getId(),"1","1",stationId);
 
@@ -183,7 +185,7 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
                                     //过站发消息
                                     if (passengerInfo.getPayStatus().equals("2")){
-                                        new Thread(()->{
+
                                             List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
                                             OrderInfo orderInfo = orderInfoList.get(0);
                                             //综合账单
@@ -214,13 +216,13 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
 
 
-                                        }).start();
+
                                     }
 
                                 }
                             }
 
-                            new Thread(()->{
+
                                 //查询乘客有过站的情况
                                 List<PassengerInfo> passengerInfoList1 = passengerInfoService.findByShiftStatusPayStatusNotTicketDown(shiftInfo.getId(),"1","2",stationId);
                                 if (passengerInfoList1.size()>0){
@@ -256,7 +258,7 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
                                 }
 
-                            }).start();
+
 
                         }
 

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

@@ -23,4 +23,6 @@ public class PassengerMessageDTO {
 
     private String statusName;
 
+    private String imageUrl;
+
 }

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

@@ -955,6 +955,7 @@ public class PassengerApiController {
                     passengerMessageDTO.setRouteName(routeInfo.getName());
                     passengerMessageDTO.setSendTime(DateUtil.format(passengerMessage.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                     passengerMessageDTO.setStatusName("已过站");
+                    passengerMessageDTO.setImageUrl(passengerInfo.getImageUrl());
                     list.add(passengerMessageDTO);
 
                     passengerMessage.setReadStatus(true);