ソースを参照

添加了 update 4dage function

wuweihao 5 年 前
コミット
d47c1f92c7

+ 17 - 0
src/main/java/com/fd/Dto/BaseMapFdageDto.java

@@ -0,0 +1,17 @@
+package com.fd.Dto;
+
+import lombok.Data;
+
+/**
+ * Created by Owen on 2019/10/30 0030 10:36
+ *
+ * ResourcesJson 请求参数
+ */
+@Data
+public class BaseMapFdageDto {
+
+    private String tiandiMap;
+
+    private String tiandiSurface;
+
+}

+ 16 - 0
src/main/java/com/fd/Dto/ModelFdageDto.java

@@ -0,0 +1,16 @@
+package com.fd.Dto;
+
+import lombok.Data;
+
+/**
+ * Created by Owen on 2019/10/30 0030 10:36
+ *
+ */
+@Data
+public class ModelFdageDto {
+
+    private String tilesets;
+
+    private String viewSurfaces;
+
+}

+ 11 - 0
src/main/java/com/fd/controller/VtsBaseMapController.java

@@ -1,5 +1,7 @@
 package com.fd.controller;
 
+import com.fd.Dto.BaseMapFdageDto;
+import com.fd.Dto.FdageDto;
 import com.fd.Dto.ResourcesJsonDto;
 import com.fd.server.JsonServer;
 import com.fd.util.ResponseResult;
@@ -29,4 +31,13 @@ public class VtsBaseMapController {
         return new ResponseResult(200,"success");
     }
 
+
+    @ApiOperation("update 4dage")
+    @PostMapping("update/fdage")
+    private ResponseResult updateFdage(@RequestBody BaseMapFdageDto param){
+        log.info("run updateFdage");
+
+        return jsonServer.updateBaseMapFdage(param);
+    }
+
 }

+ 4 - 4
src/main/java/com/fd/controller/VtsModelController.java

@@ -1,6 +1,6 @@
 package com.fd.controller;
 
-import com.fd.Dto.FdageDto;
+import com.fd.Dto.ModelFdageDto;
 import com.fd.Dto.PageDto;
 import com.fd.constant.CommandMsg;
 import com.fd.constant.MsgCode;
@@ -307,10 +307,10 @@ public class VtsModelController {
 
     @ApiOperation("update 4dage")
     @PostMapping("update/fdage")
-    private ResponseResult updateFdage(@RequestBody FdageDto param){
+    private ResponseResult updateFdage(@RequestBody ModelFdageDto param){
         log.info("run updateFdage");
-        jsonServer.updateFdage(param);
-        return new ResponseResult(200,"success");
+
+        return jsonServer.updateModelFdage(param);
     }
 
 

+ 5 - 3
src/main/java/com/fd/server/JsonServer.java

@@ -1,8 +1,6 @@
 package com.fd.server;
 
-import com.fd.Dto.FdageDto;
-import com.fd.Dto.ResourcesJsonDto;
-import com.fd.Dto.VectorResourcesJsonDto;
+import com.fd.Dto.*;
 import com.fd.util.ResponseResult;
 
 /**
@@ -18,4 +16,8 @@ public interface JsonServer {
     void updateFdage(FdageDto param);
 
     ResponseResult updateVectroFdage(String param);
+
+    ResponseResult updateModelFdage(ModelFdageDto param);
+
+    ResponseResult updateBaseMapFdage(BaseMapFdageDto param);
 }

+ 62 - 5
src/main/java/com/fd/server/impl/JsonServerImpl.java

@@ -3,9 +3,7 @@ package com.fd.server.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fd.Dto.FdageDto;
-import com.fd.Dto.ResourcesJsonDto;
-import com.fd.Dto.VectorResourcesJsonDto;
+import com.fd.Dto.*;
 import com.fd.constant.MsgCode;
 import com.fd.server.JsonServer;
 import com.fd.util.FileUtils;
@@ -215,10 +213,69 @@ public class JsonServerImpl implements JsonServer {
 
         log.info("result: {}", original.toJSONString());
 
-//        System.out.println(original.toJSONString());
+        try {
+            FileUtils.fileWriter(JSON.toJSONString(original), FDAGE_PATH);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ResponseResult(200, MsgCode.SUCCESS);
+    }
+
+    @Override
+    public ResponseResult updateModelFdage(ModelFdageDto param) {
+//                String s = readJson("json/4dage");
+        String s = readJsonLinux(FDAGE_PATH);
+        // 转jsonObject
+        JSONObject original = JSON.parseObject(s);
+
+        // tilesets
+        JSONArray subTilesets = JSON.parseArray(original.getString("tilesets"));
+        subTilesets.add(param.getTilesets());
+
+        // view
+        JSONObject subViewJson = JSON.parseObject(original.getString("view"));
+
+        JSONObject surfacesJson = JSON.parseObject(subViewJson.getString("surfaces"));
+        surfacesJson.put(param.getViewSurfaces(),JSON.parse("[]"));
+
+        subViewJson.put("surfaces", surfacesJson);
+
+        // 修改值设置回原来的接送
+        original.put("tilesets", subTilesets);
+        original.put("view", subViewJson);
+
+        log.info("result: {}", original.toString());
+        System.out.println(original.toString());
+
+        try {
+            FileUtils.fileWriter(JSON.toJSONString(original), FDAGE_PATH);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ResponseResult(200, MsgCode.SUCCESS);
+    }
+
+    @Override
+    public ResponseResult updateBaseMapFdage(BaseMapFdageDto param) {
+//                String s = readJson("json/4dage");
+        String s = readJsonLinux(FDAGE_PATH);
+        // 转jsonObject
+        JSONObject original = JSON.parseObject(s);
+
+        // 获取子对象
+        JSONObject subFreeLayers = JSON.parseObject(original.getString("freeLayers"));
+        subFreeLayers.put("tiandi-surface", param.getTiandiSurface());
+
+        JSONObject subBoundLayers = JSON.parseObject(original.getString("boundLayers"));
+        subBoundLayers.put("tiandi-map", param.getTiandiMap());
+
+        // 修改值设置回原来的接送
+        original.put("freeLayers", subFreeLayers);
+        original.put("boundLayers", subBoundLayers);
+
+        log.info("result: {}", original.toString());
 
         try {
-//            FileUtils.fileWriter(JSON.toJSONString(original),"/var/vts/store/map-config/4dage_test");
             FileUtils.fileWriter(JSON.toJSONString(original), FDAGE_PATH);
         } catch (IOException e) {
             e.printStackTrace();