966120Api.git - Gitblit

			@@ -139,6 +139,8 @@
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String beginTime= sdf.format(dispatchOrd.getDispatchOrdStartDate());
			String endTime= sdf.format(new Date());

			logger.info("查询车辆轨迹：车辆号：{}, 开始时间：{}, 结束时间：{}", vehicleNo, beginTime, endTime);
			return this.getAnonymousTracks(vehicleNo,beginTime,endTime);
			//
			// vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
			@@ -225,17 +227,20 @@
			// 通过车牌号获取设备ID
			VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(vehicleNo);
			if (vehicleInfo == null) {
			throw new Error("未找到该车辆对应的GPS设备");

			// throw new Error("未找到该车辆对应的GPS设备");
			return getDataTable(new ArrayList<>());
			}

			// 处理开始时间
			beginTime = beginTime.replace("T", " ").replace(" ","%20");
			beginTime = beginTime.replace("T", " ");
			if (beginTime.split(":").length == 2) { // 只有小时和分钟
			beginTime += ":00";
			}

			// 处理结束时间
			endTime = endTime.replace("T", " ").replace(" ","%20");
			// endTime = endTime.replace("T", " ").replace(" ","%20");
			endTime = endTime.replace("T", " ");
			if (endTime.split(":").length == 2) { // 只有小时和分钟
			endTime += ":59";
			}
			@@ -310,10 +315,12 @@
			request.setEndtime(endTime);
			request.setTimezone(8); // 中国时区

			logger.info("查询车辆轨迹：车辆号：{}, 设备ID：{}, 开始时间：{}, 结束时间：{}", vehicleNo, vehicleInfo.getDeviceId(), beginTime, endTime);
			// 查询轨迹
			GpsTrackQueryResponse response = gpsCollectService.queryTracks(request);
			if (response.getStatus() != 0) {
			throw new Error("查询轨迹失败：" + response.getCause());
			logger.error("查询轨迹失败，状态码：{}, 错误信息：{}", response.getStatus(), response.getCause());
			throw new Error("查询轨迹失败：" + (response.getCause() != null ? response.getCause() : "未知错误"));
			}

			// 转换GPS51轨迹点为统一格式