|
@@ -3,6 +3,7 @@ package com.fd.server.impl;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.fd.constant.Command;
|
|
|
import com.fd.constant.MsgCode;
|
|
|
import com.fd.constant.TypeCode;
|
|
|
import com.fd.dto.ConfigJsonDto;
|
|
@@ -11,6 +12,7 @@ import com.fd.entity.FileEntity;
|
|
|
import com.fd.entity.OutputFileEntity;
|
|
|
import com.fd.repository.FileRepository;
|
|
|
import com.fd.repository.OutputFileRepository;
|
|
|
+import com.fd.server.CmdServer;
|
|
|
import com.fd.server.RasterServer;
|
|
|
import com.fd.util.FileUtils;
|
|
|
import com.fd.util.R;
|
|
@@ -60,6 +62,9 @@ public class RasterServerImpl implements RasterServer {
|
|
|
@Autowired
|
|
|
private OutputFileRepository outputFileRepository;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CmdServer cmdServer;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public R deleteById(Long fileId) {
|
|
@@ -119,21 +124,31 @@ public class RasterServerImpl implements RasterServer {
|
|
|
|
|
|
try {
|
|
|
org.apache.commons.io.FileUtils.copyDirectoryToDirectory(new File(entity.getSlicePath()), new File(MOVE_FILE_TO_SERVER));
|
|
|
+ // 修改前端的config.json 文件
|
|
|
+ String lastName = StringUtils.substringAfterLast(entity.getSlicePath(), "/");
|
|
|
+ log.info("lastName: {}", lastName);
|
|
|
+ writeJsonFile(param, lastName);
|
|
|
+
|
|
|
+ //修改linux 文件权限
|
|
|
+ String cmd = Command.CMD_CHOMD_755;
|
|
|
+ String slice = MOVE_FILE_TO_SERVER + lastName;
|
|
|
+ cmd = cmd.replace("@path", slice);
|
|
|
+ log.info("cmd: {}", cmd);
|
|
|
+ cmdServer.exeCmdInt(cmd);
|
|
|
+
|
|
|
+ // 成功,更新状态
|
|
|
+ entity.setStatus(8);
|
|
|
+ entity.setUpdateTime(new Date());
|
|
|
+ outputFileRepository.save(entity);
|
|
|
+ return new R(200, MsgCode.SUCCESS);
|
|
|
} catch (IOException e) {
|
|
|
+
|
|
|
+ entity.setStatus(10);
|
|
|
+ entity.setUpdateTime(new Date());
|
|
|
+ outputFileRepository.save(entity);
|
|
|
e.printStackTrace();
|
|
|
return new R(51004, MsgCode.E51004, e);
|
|
|
}
|
|
|
-
|
|
|
- // 修改前端的config.json 文件
|
|
|
- String lastName = StringUtils.substringAfterLast(entity.getSlicePath(), "/");
|
|
|
- log.info("lastName: {}", lastName);
|
|
|
- writeJsonFile(param, lastName);
|
|
|
-
|
|
|
-
|
|
|
- // 成功,更新状态
|
|
|
- entity.setStatus(8);
|
|
|
- outputFileRepository.save(entity);
|
|
|
- return new R(200, MsgCode.SUCCESS);
|
|
|
}
|
|
|
|
|
|
@Override
|