更新目录结构

720yun_local_consumer/src/main/java/com/gis/listener/Local720Listener.java

@@ -74,7 +74,7 @@ public class Local720Listener {
             // 直接结束，抛异常的话，会造成死循环，产生大量日志，而且队列也跑不下去
             return;
         }
-        String panoPath = configConstant.serverBasePath + File.separator  + sceneCode + "/" +sceneCode+ ".jpg";
+        String panoPath = configConstant.serverBasePath + "/pano/" + sceneCode + "/" +sceneCode+ ".jpg";
         String cmd = CmdConstant.PANO_KRPANO + panoPath;
 
 
@@ -127,27 +127,6 @@ public class Local720Listener {
 
 
 
-
-    /**
-     * 上传切图目录
-     */
-    private void uploadOss(String sceneCode){
-        String cmd = CmdConstant.OSSUTIL_UPLOAD_DIR;
-        cmd = cmd.replaceAll("@sceneCode", sceneCode);
-        log.info("ossCmd: " + cmd);
-        long start = System.currentTimeMillis();
-        CmdUtils.callshell(cmd);
-        long end = System.currentTimeMillis();
-        log.info("切图上传完成, 耗时：{} s" , (end-start)/1000 );
-    }
-
-    @Test
-    public void test(){
-        CmdUtils.callshell("ipconfig");
-    }
-
-
-
     private FodderEntity findBySceneCode(String sceneCode){
         LambdaQueryWrapper<FodderEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(FodderEntity::getSceneCode, sceneCode);

720yun_local_manage/gis_pano/src/main/java/com/gis/cms/service/impl/OpsServiceImpl.java

@@ -190,7 +190,7 @@ public class OpsServiceImpl  implements OpsService {
         String outPath = configConstant.serverBasePath + "/download/" + workId;
         String inPath;
         for (String sceneCode : split) {
-            inPath = configConstant.serverBasePath + "/" + sceneCode + "/vtour/panos/" + sceneCode + ".tiles";
+            inPath = configConstant.serverBasePath + "/pano/" + sceneCode + "/vtour/panos/" + sceneCode + ".tiles";
             String cmd = StrUtil.format("cp -r {} {} ", inPath,  outPath);
             CmdUtils.callCmd(cmd);
         }

720yun_local_manage/gis_pano/src/main/java/com/gis/cms/service/impl/WorkServiceImpl.java

@@ -297,7 +297,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
     public Result uploadFix(MultipartFile file, String sceneCode) {
         // 检查非法文件上传
         BaseRuntimeException.isHas(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
-        Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/" + sceneCode, true);
+        Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/pano/" + sceneCode, true);
         return Result.success(uploadMap);
     }
 
@@ -306,7 +306,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
     public Result upload(MultipartFile file, String sceneCode) {
         // 检查非法文件上传
         BaseRuntimeException.isHas(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
-        Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/" + sceneCode + "/edit", false);
+        Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/pano/" + sceneCode + "/edit", false);
         return Result.success(uploadMap);
     }
 

720yun_local_manage/gis_pano_producer/src/main/java/com/gis/cms/service/impl/ProduceServiceImpl.java

@@ -57,7 +57,7 @@ public class ProduceServiceImpl implements ProducerService {
 
         String sceneCode = RandomUtil.getSceneCode("LC720_");
         // 全景图固定命名
-        String basePath = configConstant.serverBasePath + File.separator + sceneCode;
+        String basePath = configConstant.serverBasePath + "/pano/" + sceneCode;
         // 切图后也会用场景码命名文件夹
         String savePath = basePath + File.separator + sceneCode + ".jpg";
         log.info("全景图保存路径: {}", savePath);