Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -581,15 +581,15 @@ public class DriverApiController {
                 String currentStationId = shiftInfo.getCurrentStationId();
                 //班次的当前站点和GPS记录对比验证
                 //记录时间往后偏移1min
-                Date time = DateUtil.parse(recordTime,"yyyy-MM-dd HH:mm:ss");
-                Date offsetTime = DateUtil.offsetMinute(time,-1);
-
-                //查询gps记录表中此时间段间的记录
-                GpsDataInfo gpsDataInfo = gpsDataInfoService.findByDeviceNoAndCreateTime(vehicleInfo.getGpsDeviceNo(),time,offsetTime);
-
-                if (gpsDataInfo != null && StringUtils.isNotBlank(gpsDataInfo.getStationId())){
-                    currentStationId = gpsDataInfo.getStationId();
-                }
+//                Date time = DateUtil.parse(recordTime,"yyyy-MM-dd HH:mm:ss");
+//                Date offsetTime = DateUtil.offsetMinute(time,-1);
+//
+//                //查询gps记录表中此时间段间的记录
+//                GpsDataInfo gpsDataInfo = gpsDataInfoService.findByDeviceNoAndCreateTime(vehicleInfo.getGpsDeviceNo(),time,offsetTime);
+//
+//                if (gpsDataInfo != null && StringUtils.isNotBlank(gpsDataInfo.getStationId())){
+//                    currentStationId = gpsDataInfo.getStationId();
+//                }
 
                 passengerInfoService.passengerFace(vehicleInfo, shiftInfo, retFileUrl, recordTime, currentStationId,libId, personId,localImageUrl);
                 messageResult.setResult(true);
@@ -1102,7 +1102,7 @@ public class DriverApiController {
             if(currentStation!=null){
                 SysLog sysLog = new SysLog();
                 sysLog.setPointcut("站点校正");
-                sysLog.setData("车牌号:" + vehicleInfo.getLicensePlateNumber() + ",经纬度:" +  vehicleInfo.getLongitude() + "." + vehicleInfo.getLatitude());
+                sysLog.setData("车牌号:" + vehicleInfo.getLicensePlateNumber() + ",经纬度:" +  vehicleInfo.getLongitude() + "," + vehicleInfo.getLatitude());
                 sysLog.setRemark("当前站点:" + currentStation.getName() + ",id=" + currentStationId);
                 sysLog.setRemoteIp(HttpUtil.getIpAddress(request));
                 sysLog.setCreateTime(new Date());