陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAttnServiceImpl.java

@@ -91,7 +91,7 @@ public class CorpsAttnServiceImpl extends ServiceImpl<CorpsAttnMapper, CorpsAttn
 				throw new ServiceException(result.getMsg());
 			}
 
-			R<User> userTemp = userClient.userByAccount(AuthUtil.getTenantId(), attn.getCname());
+			R<User> userTemp = userClient.userByAccount(AuthUtil.getTenantId(), attn.getTel());
 			if (!userTemp.isSuccess()) {
 				throw new ServiceException(userTemp.getMsg());
 			}

blade-service/blade-client/src/main/java/org/springblade/client/land/service/impl/LandDriverServiceImpl.java

@@ -197,7 +197,7 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 				throw new ServiceException(result.getMsg());
 			}
 
-			R<User> userTemp = userClient.userByAccount(AuthUtil.getTenantId(), driver.getName());
+			R<User> userTemp = userClient.userByAccount(AuthUtil.getTenantId(), driver.getTel());
 			if (!userTemp.isSuccess()) {
 				throw new ServiceException(userTemp.getMsg());
 			}

blade-service/blade-land/src/main/java/org/springblade/land/controller/TrackLogController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 陆运订单轨迹表 控制器
@@ -77,7 +78,7 @@ public class TrackLogController extends BladeController {
 	@GetMapping("/location")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "陆运定位", notes = "传入trackLog")
-	public R<List<Double>> location(TrackLog trackLog) {
+	public R<Map<String, Object>> location(TrackLog trackLog) {
 		return R.data(trackLogService.location(trackLog));
 	}
 

blade-service/blade-land/src/main/java/org/springblade/land/service/ITrackLogService.java

@@ -22,6 +22,7 @@ import org.springblade.land.entity.TrackLog;
 import org.springblade.land.vo.TrackLogVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 陆运轨迹日志表 服务类
@@ -46,7 +47,7 @@ public interface ITrackLogService extends IService<TrackLog> {
 	 * @param trackLog
 	 * @return
 	 */
-	List<Double> location(TrackLog trackLog);
+	Map<String, Object> location(TrackLog trackLog);
 
 	/**
 	 * 获取轨迹

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/TrackLogServiceImpl.java

@@ -56,13 +56,13 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public List<Double> location(TrackLog trackLog) {
+	public Map<String, Object> location(TrackLog trackLog) {
 		TrackKey key = CacheUtil.get(LandConst.LAND_CACHE, LandConst.TRACK_TOKEN, trackLog.getTenantId(), TrackKey.class, false);
 		if (ObjectUtil.isEmpty(key)) {
 			throw new RuntimeException("获取请求token失败");
 		}
 
-		List<Double> data = new ArrayList<>();
+		Map<String, Object> data = new HashMap<>();
 		try {
 			Map<String, String> map = new HashMap<>(5);
 			map.put("token", key.getToken());
@@ -79,11 +79,19 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 			JSONObject result = getData(res);
 			// 处理数据
 			JSONObject temp = result.getJSONObject("result");
+
 			BigDecimal divisor = new BigDecimal("600000");
 			BigDecimal longitude = new BigDecimal(temp.getString("lon")).divide(divisor, 6, RoundingMode.HALF_UP);
 			BigDecimal latitude = new BigDecimal(temp.getString("lat")).divide(divisor, 6, RoundingMode.HALF_UP);
-			data.add(longitude.doubleValue());
-			data.add(latitude.doubleValue());
+			List<Double> location = new ArrayList<>();
+			location.add(longitude.doubleValue());
+			location.add(latitude.doubleValue());
+
+			data.put("location", location);
+			data.put("address", temp.getString("adr"));
+			data.put("time", temp.getString("utc"));
+			data.put("speed", temp.getString("spd"));
+			data.put("mileage", temp.getString("mil"));
 		} catch (Exception e) {
 			throw new RuntimeException("获取数据失败：" + e.getMessage());
 		}