feat : 地图层查询

app/src/main/java/com/yiring/app/web/map/MapController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.map;
+
+import com.yiring.auth.util.ZyUtil;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import java.io.Serializable;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 地图控制器
+ * @author Administrator
+ * @version 1.0
+ * @description: TODO
+ * @date 2022/4/24 13:48
+ */
+@Slf4j
+@Validated
+@Api(tags = "Map(地图)")
+@RestController
+@RequestMapping("/map/")
+public class MapController {
+
+    @GetMapping("/mapSelect")
+    @ApiImplicitParams({ @ApiImplicitParam(value = "orgId", required = true, name = "orgId") })
+    public Result<Serializable> fail(String orgId) {
+        Result<Serializable> result = ZyUtil.getRequest("/positionApi/api/area/allList/", orgId, 3000);
+        if (result.getCode() != 200) {
+            Result.no(Status.BAD_REQUEST, result.getMessage());
+        }
+        return Result.ok(result.getBody());
+    }
+}

basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java

@@ -95,6 +95,27 @@ public class ZyUtil {
     }
 
     /**
+     * get请求
+     * @param urlString 路径
+     * @param obj 路径参
+     * @param timeout 请求时长
+     * @return json
+     */
+    public static Result<Serializable> getRequest(String urlString, Object obj, int timeout) {
+        String json = JSONUtil.toJsonStr(obj);
+        String token = login();
+        String body = HttpRequest
+            .get(URL_PREFIX + urlString + json)
+            .header(Header.AUTHORIZATION, TOKEN_TYPE + token)
+            .header(Header.CONTENT_TYPE, "application/json")
+            //            .body(json)
+            .timeout(timeout)
+            .execute()
+            .body();
+        return bodyResult(body);
+    }
+
+    /**
      * post请求
      * @param urlString 路径
      * @param obj 参数
@@ -166,6 +187,20 @@ public class ZyUtil {
         Map map = JSONUtil.toBean(body, Map.class);
         Integer code = Convert.toInt(map.get("code"));
         String msg = Convert.toStr(map.get("msg"));
-        return Result.builder().code(code).message(msg).build();
+        String bodyResult = Convert.toStr(map.get("data"));
+        return Result.builder().code(code).message(msg).body(bodyResult).build();
+    }
+
+    /**
+     * 返回类型转换
+     * @param body json
+     * @return Result
+     */
+    private static Result<Serializable> bodyResult(String body) {
+        Map map = JSONUtil.toBean(body, Map.class);
+        Integer code = Convert.toInt(map.get("code"));
+        String msg = Convert.toStr(map.get("msg"));
+        String data = Convert.toStr(map.get("data"));
+        return Result.builder().code(code).message(msg).body(data).build();
     }
 }