فهرست منبع

feat:新增测试接口

wangweiyu 4 سال پیش
والد
کامیت
4ef3650028

+ 1 - 1
src/main/java/com/aoyang/tms/controller/TestController.java

@@ -116,7 +116,7 @@ public class TestController {
 
     @ApiOperation(value = "根据经纬度查询位置", notes = "根据经纬度查询位置")
     @PostMapping("/baiduapi")
-    public Result testBaiduApi(@RequestParam Float lon, @RequestParam Float lat) {
+    public Result testBaiduApi(@RequestParam String lon, @RequestParam String lat) {
         return new Result<>(commonService.longitudeToAddress(lat, lon));
     }
 

+ 3 - 0
src/main/java/com/aoyang/tms/controller/vo/TruckOrderManageVO.java

@@ -52,6 +52,9 @@ public class TruckOrderManageVO implements Serializable {
     @ApiModelProperty(value = "位置纬度")
     private String latitude;
 
+    @ApiModelProperty(value = "车辆位置")
+    private String location;
+
     /**
      * 执行中运单
      */

+ 1 - 1
src/main/java/com/aoyang/tms/service/CommonService.java

@@ -132,6 +132,6 @@ public interface CommonService {
      * @param lng 经度
      * @return
      */
-    String longitudeToAddress(float lat, float lng);
+    String longitudeToAddress(String lng, String lat);
 
 }

+ 2 - 2
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -316,9 +316,9 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public String longitudeToAddress(float lat, float lng) {
+    public String longitudeToAddress(String lng, String lat) {
         //拼接请求路径
-        String url = BAIDUMAP_URL + "&ak=" + BAIDUMAP_AK + "&location=" + lng + "," + lat;
+        String url = BAIDUMAP_URL + "&ak=" + BAIDUMAP_AK + "&location=" + lat + "," + lng;
         log.info("请求url:" + url);
         String res = doGet(url);
         String Addresslocation= JSON.parseObject(res).getJSONObject("result").getString("formatted_address");

+ 1 - 0
src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -208,6 +208,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             if (location != null) {
                 vo.setLatitude(location.getLatitude());
                 vo.setLongitude(location.getLongitude());
+                vo.setLocation(commonService.longitudeToAddress(location.getLatitude(), location.getLongitude()));
             }
             if (vo.getOrderId() != null) {
                 // 设置已读未读信息