raster 发放服务成功

src/main/java/com/fd/controller/RasterController.java

@@ -284,36 +284,6 @@ public class RasterController {
     }
 
 
-//    public class RasterSliceThread implements Runnable{
-//
-//        private String cmd;
-//
-//        private OutputFileEntity entity;
-//
-//        private RasterSliceThread(String cmd, OutputFileEntity entity){
-//            this.cmd = cmd;
-//            this.entity = entity;
-//        }
-//
-//        @Override
-//        public void run() {
-//            log.warn("run RasterSliceThread");
-//            Integer integer = cmdServer.exeCmdRasterSlice(cmd, entity);
-//            if (integer != 0) {
-//                log.info("error command exeCmdRasterSlice");
-//                // 如果命令运行失败，状态改为0
-//                entity.setStatus(0);
-//                rasterServer.save(entity);
-//                return;
-//            }
-//
-//            // 修改状态, 告诉前端切片完成
-//            entity.setStatus(5);
-//            rasterServer.save(entity);
-//            log.warn("end RasterSliceThread");
-//        }
-//    }
-
     @ApiOperation("栅格数据进度查询")
     @GetMapping("progress/{fileId}/")
     private R getProgress(@PathVariable("fileId") Long fileId) {

src/main/java/com/fd/dto/ConfigJsonDto.java

@@ -9,13 +9,13 @@ import lombok.Data;
 public class ConfigJsonDto {
 
 
-    private String tileset;
+//    private String tileset;
 
-    private String name;
+//    private String name;
 
     private String text;
 
-    private String type;
+//    private String type;
 
 //    private boolean checked;
 

src/main/java/com/fd/server/impl/RasterServerImpl.java

@@ -44,8 +44,13 @@ public class RasterServerImpl implements RasterServer {
     @Value("${copy.file.path.raster}")
     private String MOVE_FILE_TO_SERVER;
 
-//    @Value("${json.path}")
-//    private String JSON_PATH;
+    // config.json 地址
+    @Value("${config.path}")
+    private String CONFIG_JSON_PATH;
+
+    // config.json  teileset 的相对路径
+    @Value("${config.tileset}")
+    private String CONFIG_TILESET;
 
     @Autowired
     private FileRepository fileRepository;
@@ -85,9 +90,17 @@ public class RasterServerImpl implements RasterServer {
             log.info("id：{} 不存在", fileId);
             return new R(50002, MsgCode.E50002);
         }
+
+        // 把数据移动到指定服务位置
         OutputFileEntity entity = o.get();
         FileUtils.createDir(MOVE_FILE_TO_SERVER);
         FileUtils.base64ToFileWriter(entity.getSlicePath(), MOVE_FILE_TO_SERVER);
+
+        // 修改前端的config.json 文件
+        writeJsonFile(param);
+
+
+        // 成功，更新状态
         entity.setStatus(8);
         outputFileRepository.save(entity);
         return new R(200, MsgCode.SUCCESS);
@@ -169,34 +182,33 @@ public class RasterServerImpl implements RasterServer {
         return outputFileRepository.save(fileSchedule);
     }
 
-//    private boolean writeJson(ConfigJsonDto param) {
-//        String s = FileUtils.readJsonLinux(JSON_PATH);
-//
-//        log.info("original： {}", s);
-//        JSONObject original = JSON.parseObject(s);
-//
-//        JSONArray layers = JSON.parseArray(original.getString("layers"));
-//
-//        JSONObject subJson = new JSONObject();
-//        subJson.put("name", "111");
-//        subJson.put("text", param.getText());
-//        subJson.put("type", "3333");
-//        subJson.put("checked", false);
-//        subJson.put("show", true);
-//        subJson.put("url", param.getUrl());
-//
-//        layers.add(subJson);
-//
-//        original.put("layers", layers);
-//
-//        log.info("original update： {}", original.toJSONString());
-//        try {
-//            FileUtils.fileWriter(JSON.toJSONString(original), JSON_PATH);
-//            return true;
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        return false;
-//
-//    }
+    private void writeJsonFile(ConfigJsonDto param) {
+        String s = FileUtils.readFile(CONFIG_JSON_PATH);
+
+        JSONObject original = JSON.parseObject(s);
+
+        log.info("original： {}", s);
+
+        JSONArray layers = JSON.parseArray(original.getString("layers"));
+
+        JSONObject subJson = new JSONObject();
+        long cu = System.currentTimeMillis();
+        subJson.put("name", "raster_" + cu); // 需要唯一
+        subJson.put("text", param.getText());
+        subJson.put("type", "imagery"); // raster 就用这个类型
+        subJson.put("checked", false);
+        subJson.put("show", true);
+        subJson.put("url", param.getUrl());
+
+        layers.add(subJson);
+
+        original.put("layers", layers);
+
+        log.info("original update： {}", original.toJSONString());
+        try {
+            FileUtils.fileWriter(JSON.toJSONString(original), CONFIG_JSON_PATH);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }