添加了文件发布到服务器

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

@@ -405,21 +405,11 @@ public class FdModelController {
 
 
 
-    @ApiOperation("移动切片数据到服务器")
-    @GetMapping("command/move/{fileId}/")
-    private R cmdMove(@PathVariable("fileId") Long fileId) {
-        log.info("run cmdMove: {}", fileId);
-        FileEntity entity = fileServer.findById(fileId);
-
-        String fileName = StringUtils.substringBefore(entity.getFileName(), ".");
-        String path = StringUtils.substringBeforeLast(entity.getFileUrl(), "/");
-
-        String cmd = Command.CMD_MV;
-        cmd = cmd.replace("@fileName", fileName);
-        cmd = cmd.replace("@path", path);
-        log.info("cmd: {}", cmd);
-
-        return cmdServer.exeCmd(cmd);
+    @ApiOperation("移动数据到服务器上")
+    @GetMapping("move/{fileId}/")
+    private R moveFile(@PathVariable("fileId") Long fileId) {
+        log.info("run moveFile: {}", fileId);
+        return modelServer.moveFileToServer(fileId);
     }
 
 

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

@@ -3,6 +3,7 @@ package com.fd.controller;
 import com.fd.constant.Command;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
+import com.fd.dto.ConfigJsonDto;
 import com.fd.dto.MyQueue;
 import com.fd.dto.PageDto;
 import com.fd.entity.FileEntity;
@@ -320,10 +321,10 @@ public class RasterController {
 
 
     @ApiOperation("移动数据到服务器上")
-    @GetMapping("move/{fileId}/")
-    private R moveFile(@PathVariable("fileId") Long fileId) {
+    @PostMapping("move/{fileId}/")
+    private R moveFile(@PathVariable("fileId") Long fileId, @RequestBody ConfigJsonDto param) {
         log.info("run moveFile: {}", fileId);
-        return rasterServer.moveFileToServer(fileId);
+        return rasterServer.moveFileToServer(fileId, param);
     }
 
 

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

@@ -415,6 +415,13 @@ public class VectorController {
         return new R(200, entity);
     }
 
+    @ApiOperation("移动数据到服务器上")
+    @GetMapping("move/{fileId}/")
+    private R moveFile(@PathVariable("fileId") Long fileId) {
+        log.info("run moveFile: {}", fileId);
+        return vectorServer.moveFileToServer(fileId);
+    }
+
 
     // 普通坐标转换
     private OutputFileEntity generalCoordTransform(OutputFileEntity entity, String cmd){

src/main/java/com/fd/entity/OutputFileEntity.java

@@ -62,6 +62,7 @@ public class OutputFileEntity extends BaseEntity implements Serializable {
      * 5：切片完成
      * 6：切片中
      * 7: 坐标转换失败
+     * 8: 服务已发布
      */
     @Column
     private Integer status;

src/main/java/com/fd/server/ModelServer.java

@@ -22,4 +22,6 @@ public interface ModelServer {
     OutputFileEntity findById(Long fileId);
 
     R findByType(String fileTypeModel, PageDto param);
+
+    R moveFileToServer(Long fileId);
 }

src/main/java/com/fd/server/RasterServer.java

@@ -1,6 +1,7 @@
 package com.fd.server;
 
 
+import com.fd.dto.ConfigJsonDto;
 import com.fd.dto.PageDto;
 import com.fd.entity.OutputFileEntity;
 import com.fd.util.R;
@@ -12,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
 public interface RasterServer {
 
 
-    R moveFileToServer(Long fileId);
+    R moveFileToServer(Long fileId, ConfigJsonDto param);
 
     R uploadBigFile(MultipartFile file);
 

src/main/java/com/fd/server/VectorServer.java

@@ -19,4 +19,6 @@ public interface VectorServer {
     OutputFileEntity findById(Long fileId);
 
     OutputFileEntity save(OutputFileEntity entity);
+
+    R moveFileToServer(Long fileId);
 }

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

@@ -42,6 +42,9 @@ public class ModelServerImpl implements ModelServer {
     @Value("${output.file.path}")
     private String OUTPUT_FILE_PATH;
 
+    @Value("${copy.file.path.model}")
+    private String MOVE_FILE_TO_SERVER;
+
     @Autowired
     private FileRepository fileRepository;
 
@@ -50,6 +53,22 @@ public class ModelServerImpl implements ModelServer {
 
 
     @Override
+    public R moveFileToServer(Long fileId) {
+        Optional<OutputFileEntity> o = outputFileRepository.findById(fileId);
+        if (!o.isPresent()) {
+            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);
+        entity.setStatus(8);
+        outputFileRepository.save(entity);
+        return new R(200, MsgCode.SUCCESS);
+    }
+
+
+    @Override
     public R uploadBigFile(MultipartFile file) {
         log.warn("run uploadBigFile");
         long start = System.currentTimeMillis();

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

@@ -1,14 +1,17 @@
 package com.fd.server.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
+import com.fd.dto.ConfigJsonDto;
 import com.fd.dto.PageDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.server.RasterServer;
-import com.fd.server.VectorServer;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import lombok.extern.log4j.Log4j2;
@@ -20,11 +23,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Base64;
 import java.util.Date;
 import java.util.Optional;
 
@@ -45,6 +44,9 @@ public class RasterServerImpl implements RasterServer {
     @Value("${copy.file.path.raster}")
     private String MOVE_FILE_TO_SERVER;
 
+    @Value("${json.path}")
+    private String JSON_PATH;
+
     @Autowired
     private FileRepository fileRepository;
 
@@ -53,15 +55,17 @@ public class RasterServerImpl implements RasterServer {
 
 
     @Override
-    public R moveFileToServer(Long fileId) {
-        Optional<FileEntity> o = fileRepository.findById(fileId);
+    public R moveFileToServer(Long fileId, ConfigJsonDto param) {
+        Optional<OutputFileEntity> o = outputFileRepository.findById(fileId);
         if (!o.isPresent()) {
             log.info("id：{} 不存在", fileId);
             return new R(50002, MsgCode.E50002);
         }
-        FileEntity entity = o.get();
-
-        FileUtils.base64ToFileWriter(entity.getFileUrl(), MOVE_FILE_TO_SERVER);
+        OutputFileEntity entity = o.get();
+        FileUtils.createDir(MOVE_FILE_TO_SERVER);
+        FileUtils.base64ToFileWriter(entity.getSlicePath(), MOVE_FILE_TO_SERVER);
+        entity.setStatus(8);
+        outputFileRepository.save(entity);
         return new R(200, MsgCode.SUCCESS);
     }
 
@@ -140,4 +144,35 @@ public class RasterServerImpl implements RasterServer {
     public OutputFileEntity save(OutputFileEntity fileSchedule) {
         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;
+
+    }
 }

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

@@ -40,12 +40,31 @@ public class VectorServerImpl implements VectorServer {
     @Value("${output.file.path}")
     private String OUTPUT_FILE_PATH;
 
+    @Value("${copy.file.path.vector}")
+    private String MOVE_FILE_TO_SERVER;
+
     @Autowired
     private FileRepository fileRepository;
 
     @Autowired
     private OutputFileRepository outputFileRepository;
 
+
+    @Override
+    public R moveFileToServer(Long fileId) {
+        Optional<OutputFileEntity> o = outputFileRepository.findById(fileId);
+        if (!o.isPresent()) {
+            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);
+        entity.setStatus(8);
+        outputFileRepository.save(entity);
+        return new R(200, MsgCode.SUCCESS);
+    }
+
     @Override
     public R uploadFile(MultipartFile file, String coord) {
         log.warn("run uploadFile");

src/main/java/com/fd/util/FileUtils.java

@@ -382,6 +382,15 @@ public class FileUtils {
         return true;
     }
 
+    /**
+     * 读取json 文件, Linux版
+     */
+    public static String readJsonLinux(String path){
+        String param = FileUtils.readFile(path);
+        return param;
+
+    }
+
 
 
     public static void main(String[] args) {

src/main/resources/application-dev.properties

@@ -13,4 +13,6 @@ output.file.path=F:\\test\\cesium\\output\\
 #·¢²¼·þÎñµØÖ·
 copy.file.path.model=/root/gis/cesium/output/copy/
 copy.file.path.raster=/root/gis/cesium/output/copy/
-copy.file.path.vector=/root/gis/cesium/output/copy/
+copy.file.path.vector=/root/gis/cesium/output/copy/
+
+json.path=/root/gis/cesium/output/copy/

src/main/resources/application-pro.properties

@@ -15,3 +15,6 @@ copy.file.path.model=/root/gis/cesium/output/copy/
 copy.file.path.raster=/root/gis/cesium/output/copy/
 copy.file.path.vector=/root/gis/cesium/output/copy/
 
+#config.json
+json.path=/var/www/html/3dmap/config.json
+

src/main/resources/application-uat.properties

@@ -0,0 +1,20 @@
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://39.108.123.31:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=123456
+
+logging.file=/root/java/apache-tomcat-8.5.47_8082_cesium/log/cesium.log
+
+input.file.path=/root/gis/cesium/input/
+output.file.path=/root/gis/cesium/output/
+
+
+#·¢²¼·þÎñµØÖ·
+copy.file.path.model=/root/gis/cesium/output/copy/
+copy.file.path.raster=/root/gis/cesium/output/copy/
+copy.file.path.vector=/root/gis/cesium/output/copy/
+
+#config.json
+json.path=/var/www/html/3dmap/config.json
+

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 server.port=8082
 
 # file multipart
-spring.profiles.active=pro
+spring.profiles.active=uat
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=51200MB
 spring.servlet.multipart.max-request-size=51200MB