压缩场景 6

720yun_local_manage/gis_common/src/main/java/com/gis/common/constant/CmdConstant.java

@@ -26,5 +26,6 @@ public class CmdConstant {
      * @output 指定目录
      * @code  需要下载的目录参数， 参数用逗号隔开
      */
-    public final static String zip = "zip -r @output @inDir/{@code}";
+//    public final static String zip = "zip -r @output @inDir{@code}";
+    public final static String zip = "sh zip.sh @workPace @output '@inDir'";
 }

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

@@ -49,6 +49,7 @@ public class OpsServiceImpl  implements OpsService {
     public Result<WorkEntity> downloadWork(String ids) {
         BaseRuntimeException.isBlank(ids, null, "输入参数为空");
         // 替换空格
+        ids = StringUtils.replaceAll(ids, ",", " ");
         log.info("下载作品目录：{}", ids);
         String zipName = StrUtils.getTime("work_");
         zipName = "/download/" + zipName + ".zip";
@@ -57,8 +58,8 @@ public class OpsServiceImpl  implements OpsService {
         log.info("zip保存路径：{}", outPath);
         String cmd = CmdConstant.zip;
         cmd = cmd.replaceAll("@output", outPath);
-        cmd = cmd.replaceAll("@inDir", configConstant.serverBasePath + "/work");
-        cmd = cmd.replaceAll("@code", ids);
+        cmd = cmd.replaceAll("@workPace", configConstant.serverBasePath + "/work");
+        cmd = cmd.replaceAll("@inDir", ids);
 
         CmdUtils.callShell(cmd);
 
@@ -79,7 +80,8 @@ public class OpsServiceImpl  implements OpsService {
         }
         String dirCode = dir.toString();
         // 替换空格
-        dirCode = StringUtils.substringBeforeLast(dirCode, ",");
+        dirCode = StringUtils.replaceAll(dirCode, ",", " ");
+//        dirCode = StringUtils.substringBeforeLast(dirCode, ",");
         log.info("下载全景目录：{}", dirCode);
         String zipName = StrUtils.getTime("pano_");
         zipName = "/download/" + zipName + ".zip";
@@ -88,8 +90,8 @@ public class OpsServiceImpl  implements OpsService {
         log.info("zip保存路径：{}", outPath);
         String cmd = CmdConstant.zip;
         cmd = cmd.replaceAll("@output", outPath);
-        cmd = cmd.replaceAll("@inDir", configConstant.serverBasePath );
-        cmd = cmd.replaceAll("@code", dirCode);
+        cmd = cmd.replaceAll("@workPace", configConstant.serverBasePath );
+        cmd = cmd.replaceAll("@inDir", dirCode);
 
         CmdUtils.callShell(cmd);
 

720yun_local_manage/gis_pano/src/main/resources/zip.sh

@@ -3,4 +3,5 @@ workPace=$1    #工作目录
 output=$2      #输出目录
 inDir=$3       #下载目录参数
 cd $1
+echo $3
 zip -r $2 $3