style : 修改地图接口未用Vo返回

app/src/main/java/com/yiring/app/vo/map/MapVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.map;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * @version 1.0
+ * @description: 地图
+ * @date 2022/4/27 10:37
+ */
+@ApiModel("MapVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class MapVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1058997208992044029L;
+
+    List<MapVoReuslt> data = new ArrayList<>();
+
+    @ApiModel("MapVoReuslt")
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    public static class MapVoReuslt implements Serializable {
+
+        @Serial
+        private static final long serialVersionUID = 4115779013003587949L;
+
+        @JsonSerialize(using = ToStringSerializer.class)
+        @ApiModelProperty(value = "id", example = "1")
+        Integer id;
+
+        @ApiModelProperty(value = "父id", example = "1")
+        Integer parentId;
+
+        @ApiModelProperty(value = "地图名称")
+        String name;
+    }
+}

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

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.web.map;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yiring.app.feign.MapClient;
+import com.yiring.app.vo.map.MapVo;
 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 java.util.List;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 地图控制器
+ *
  * @author Administrator
  * @version 1.0
  * @description: TODO
@@ -35,9 +40,23 @@ public class MapController {
 
     @GetMapping("/mapSelect")
     @ApiImplicitParams({ @ApiImplicitParam(value = "orgId", required = true, name = "orgId") })
-    public Result<Serializable> fail(String orgId) {
+    public Result<MapVo> fail(String orgId) {
         String login = ZyUtil.login();
         JSONObject jsonObject = mapClient.selectMap(orgId, "bearer " + login);
-        return Result.ok(jsonObject.get("data").toString());
+        //        if (ObjectUtil.isNotNull(jsonObject.getJSONArray("data"))) {
+        //            List<MapVo.MapVoReuslt> data = jsonObject.getJSONArray("data").toJavaList(MapVo.MapVoReuslt.class);
+        //            MapVo mapVo = MapVo.builder().data(data).build();
+        //            return Result.ok(mapVo);
+        //        } else {
+        //            return Result.no(Status.NOT_FOUND);
+        //        }
+        if (ObjectUtil.isNotNull(jsonObject.get("data"))) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            List data = objectMapper.convertValue(jsonObject.get("data"), List.class);
+            MapVo mapVo = MapVo.builder().data(data).build();
+            return Result.ok(mapVo);
+        } else {
+            return Result.no(Status.NOT_FOUND);
+        }
     }
 }