|
@@ -3,6 +3,7 @@ package com.fdkankan.scene.service.impl;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.io.FileUtil;
|
|
import cn.hutool.core.io.FileUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
+import cn.hutool.core.util.ZipUtil;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -2918,9 +2919,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
new File(zipPath).delete();
|
|
new File(zipPath).delete();
|
|
|
|
|
|
// FileUtils.zipFile(zipPath, target + File.separator + "results/ajk/");
|
|
// FileUtils.zipFile(zipPath, target + File.separator + "results/ajk/");
|
|
- String command = "bash /opt/ossutil/gzip.sh " + zipPath.replace(".zip", "") + " " + target + File.separator + "results/ajk/";
|
|
|
|
- log.info("压缩文件:" + command);
|
|
|
|
- CreateObjUtil.callshell(command);
|
|
|
|
|
|
+// String command = "bash /opt/ossutil/gzip.sh " + zipPath.replace(".zip", "") + " " + target + File.separator + "results/ajk/";
|
|
|
|
+ ZipUtil.zip(target + File.separator + "results/ajk/", zipPath);
|
|
|
|
+// log.info("压缩文件:" + command);
|
|
|
|
+// CreateObjUtil.callshell(command);
|
|
|
|
|
|
if(!new File(zipPath).exists()){
|
|
if(!new File(zipPath).exists()){
|
|
return ResultData.error(ErrorCode.FAILURE_CODE_5043);
|
|
return ResultData.error(ErrorCode.FAILURE_CODE_5043);
|