乘客端

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

@@ -271,7 +271,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -310,7 +310,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -349,7 +349,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -427,7 +427,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -491,7 +491,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -535,7 +535,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -580,7 +580,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -625,7 +625,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -674,7 +674,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -717,15 +717,20 @@ public class PassengerApiController {
             Page<StationInfo> page = stationInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
             List<StationInfo> stationInfoList = page.getResult();
+
             List<NearbyStationDTO> nearbyStationDTOList = new ArrayList<>();
             List<String> shiftIdList = new ArrayList<>();
             if (stationInfoList.size() > 0) {
                 for (StationInfo stationInfo : stationInfoList) {
 
-                    NearbyStationDTO nearbyStationDTO = new NearbyStationDTO();
+
                     List<ShiftInfo> shiftInfoList = shiftInfoService.findByRouteIdAndStatus(stationInfo.getRouteId(), "1");
                     if (shiftInfoList.size() > 0) {
                         if (shiftInfoList.size() == 1) {
+
+                            NearbyStationDTO nearbyStationDTO = new NearbyStationDTO();
+
+
                             ShiftInfo shiftInfo = shiftInfoList.get(0);
 
                             if (!shiftIdList.contains(shiftInfo.getId())) {
@@ -743,7 +748,7 @@ public class PassengerApiController {
                                 nearbyStationDTO.setStationName(stationInfo.getName());
                                 List<NearbyShiftDTO> nearbyShiftDTOList = new ArrayList<>();
                                 NearbyShiftDTO nearbyShiftDTO = new NearbyShiftDTO();
-                                nearbyShiftDTO.setId(shiftInfo.getId());
+                                nearbyShiftDTO.setId(shiftInfo.getVehicleId());
                                 nearbyShiftDTO.setRouteName(routeInfo.getName());
                                 nearbyShiftDTO.setStartStationName(startStation.getName());
                                 nearbyShiftDTO.setEndStationName(endStation.getName());
@@ -764,8 +769,11 @@ public class PassengerApiController {
 
                             }
                         } else {
+                            NearbyStationDTO nearbyStationDTO = new NearbyStationDTO();
+                            List<NearbyShiftDTO> nearbyShiftDTOList = new ArrayList<>();
                             for (ShiftInfo shiftInfo : shiftInfoList) {
 
+
                                 if (!shiftIdList.contains(shiftInfo.getId())) {
 
 
@@ -778,10 +786,13 @@ public class PassengerApiController {
                                     StationInfo endStation = stationInfoService.get(shiftInfo.getEndStationId());
                                     //当前站
                                     StationInfo currentStation = stationInfoService.get(shiftInfo.getCurrentStationId());
-                                    nearbyStationDTO.setStationName(stationInfo.getName());
-                                    List<NearbyShiftDTO> nearbyShiftDTOList = new ArrayList<>();
+
+
+
+
+
                                     NearbyShiftDTO nearbyShiftDTO = new NearbyShiftDTO();
-                                    nearbyShiftDTO.setId(shiftInfo.getId());
+                                    nearbyShiftDTO.setId(shiftInfo.getVehicleId());
                                     nearbyShiftDTO.setRouteName(routeInfo.getName());
                                     nearbyShiftDTO.setStartStationName(startStation.getName());
                                     nearbyShiftDTO.setEndStationName(endStation.getName());
@@ -794,11 +805,18 @@ public class PassengerApiController {
                                     double meter1 = CommonUtil.getDistanceMeter(source, target, Ellipsoid.Sphere);
                                     nearbyShiftDTO.setDistance((new Double(meter1)).intValue());
                                     nearbyShiftDTOList.add(nearbyShiftDTO);
-                                    nearbyStationDTO.setNearbyShiftDTOList(nearbyShiftDTOList);
-                                    nearbyStationDTOList.add(nearbyStationDTO);
+
+
                                     shiftIdList.add(shiftInfo.getId());
                                 }
                             }
+                            nearbyStationDTO.setStationName(stationInfo.getName());
+                            nearbyStationDTO.setNearbyShiftDTOList(nearbyShiftDTOList);
+                            if (nearbyShiftDTOList.size()>0){
+                                nearbyStationDTOList.add(nearbyStationDTO);
+                            }
+
+
                         }
 
                     }
@@ -810,7 +828,7 @@ public class PassengerApiController {
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -842,7 +860,7 @@ public class PassengerApiController {
 
 
         }catch (Exception ex){
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
@@ -880,7 +898,7 @@ public class PassengerApiController {
 
 
         }catch (Exception ex){
-            log.error(ex.getMessage());
+            log.error(ex.getMessage(),ex);
             messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());