|
@@ -24,6 +24,7 @@ import com.fdkankan.push.PushMsgUtil;
|
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
|
import com.taobao.api.ApiException;
|
|
|
+import java.util.Map.Entry;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.rocketmq.spring.annotation.ConsumeMode;
|
|
@@ -351,8 +352,13 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
|
|
|
}
|
|
|
|
|
|
log.info("计算完成,批量上传文件集合:{}", map.toString());
|
|
|
+ //上传计算后生成的文件
|
|
|
uploadToOssUtil.uploadMulFiles(map);
|
|
|
|
|
|
+ //拷贝部分文件到编辑目录,用于用户编辑
|
|
|
+ this.copyToEditDir(projectNum);
|
|
|
+
|
|
|
+ //计算已使用容量
|
|
|
payStatus = 1;
|
|
|
File spaceFile = null;
|
|
|
for (String key : map.keySet()) {
|
|
@@ -392,6 +398,19 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void copyToEditDir(String num) throws IOException {
|
|
|
+
|
|
|
+ String editPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
|
|
|
+ String viewPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
+ map.put(editPath + "vision.modeldata", viewPath + "vision.modeldata");
|
|
|
+ map.put(editPath + "vision2.modeldata", viewPath + "vision2.modeldata");
|
|
|
+
|
|
|
+ for (Entry<String, String> entry : map.entrySet()) {
|
|
|
+ uploadToOssUtil.copyFiles(entry.getValue(), entry.getKey());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void sendCallResult(boolean buildSuccess, String cameraType, Long computeTime, String fileId,
|
|
|
Integer payStatus, String projectNum, Long space, JSONObject videosJson){
|
|
|
rocketMQProducer.sendOneWay(buildSceneResultTopic,
|