基本功能完成

src/main/java/com/fd/constant/MsgCode.java

@@ -17,12 +17,18 @@ public class MsgCode {
 
     public static final String E50005 = "命令执行失败";
 
-    public static final String E50006 = "文件解压失败";
+    public static final String E51001 = "文件解压失败";
+
+    public static final String E51002 = "文件解压失败,文件名跟目录名称不一致";
 
     public static final String E50007 = "只支持.zip 文件";
 
     public static final String E50008 = "只支持.tip 文件";
 
+    public static final String E50009 = "坐标为空，转换失败";
+
+
+
 
 
 

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

@@ -67,7 +67,8 @@ public class FdModelController {
         boolean unzip = FileUtils.unzip(entity.getFileUrl(), INPUT_FILE_PATH);
 
         if (!unzip) {
-            return new R(50006, MsgCode.E50006);
+            log.info("zip error: {}", MsgCode.E51001);
+            return new R(50001, MsgCode.E51001);
         }
 
         String fileName = StringUtils.substringBefore(entity.getFileName(), ".");
@@ -118,6 +119,8 @@ public class FdModelController {
 
 
 
+
+
     @ApiOperation("移动切片数据到服务器")
     @GetMapping("command/move/{fileId}/")
     private R cmdMove(@PathVariable("fileId") Long fileId) {

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

@@ -83,11 +83,22 @@ public class VectorController {
         boolean unzip = FileUtils.unzip(entity.getFileUrl(), INPUT_FILE_PATH);
 
         if (!unzip) {
-            return new R(50006, MsgCode.E50006);
+            log.info("zip error: {}", MsgCode.E51001);
+            return new R(51001, MsgCode.E51001);
         }
 
+
+
         String fileName = StringUtils.substringBefore(entity.getFileName(), ".");
 
+        // 判断文件内容是否跟目录名称一样
+        String shpPath = INPUT_FILE_PATH + fileName + File.separator + fileName + ".shp";
+        File file = new File(shpPath);
+        if (!file.exists()) {
+            log.info("zip error: {}", MsgCode.E51002);
+            return new R(51002, MsgCode.E51002);
+        }
+
         FileEntity fileEntity = new FileEntity();
 
         // 添加文件夹到数据库
@@ -107,7 +118,7 @@ public class VectorController {
 //        fileEntity.setFileUrl(INPUT_FILE_PATH + fileName + File.separator + sName);
 
         fileEntity.setFileName(fileName + ".shp");
-        fileEntity.setFileUrl(INPUT_FILE_PATH + fileName + File.separator + fileName + ".shp");
+        fileEntity.setFileUrl(shpPath);
 
         fileEntity.setCreateTime(new Date());
         fileEntity.setUpdateTime(new Date());
@@ -204,9 +215,13 @@ public class VectorController {
                 fileEntity = strictCoordTransform(entity, Command.VECTOR_TRANSFORM_STRICT_WGS80);
             }
 
-        } else if (isJudge == 1001 && coord != null) {
+        } else if (isJudge == 1001) {
             // 严格坐标转换 （西安80转wgs84），需要参数
             log.info("need to strict transform");
+            if (coord == null) {
+                log.info("error： {}", MsgCode.E50009);
+                return new R(50009, MsgCode.E50009);
+            }
             fileEntity = strictCoordTransform(entity, Command.VECTOR_TRANSFORM_STRICT_WGS84);
 
         } else if (0 == isJudge){ // 不转换坐标

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

@@ -46,8 +46,9 @@ public class VectorServerImpl implements VectorServer {
         // 文件名全名
         String fullFileName = file.getOriginalFilename();
 
-        // 拼接唯一文件名
+//        // 拼接唯一文件名
 //        String fileName = FileUtils.dateStr() + fullFileName;
+//        String filePath = INPUT_FILE_PATH + fileName;
 
         // 文件保存路径
         String filePath = INPUT_FILE_PATH + fullFileName;

src/main/resources/application-pro.properties

@@ -9,3 +9,6 @@ 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/
 
+
+#
+