|
@@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.io.ByteArrayInputStream;
|
|
|
import java.io.File;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Consumer;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.StreamSupport;
|
|
@@ -74,6 +71,7 @@ public class SynDataServiceImpl implements SynDataService {
|
|
|
saveObject(ds);
|
|
|
updateTask(tn, ds, "success");
|
|
|
sendMessage("导出 任务 成功 !!! " + id);
|
|
|
+ saveEmptyObject(ds);
|
|
|
} else {
|
|
|
log.error("导出OSS 失败 !!!");
|
|
|
sendMessage("导出 OSS 失败!!! " + id);
|
|
@@ -329,9 +327,30 @@ public class SynDataServiceImpl implements SynDataService {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ public void saveEmptyObject(String ds) {
|
|
|
+ //空文书输出
|
|
|
+ List<String> out_tns = Arrays.asList("wenshu_detail_v2", "wenshu_original");
|
|
|
+ String ossPre = "anshuo/wenshu/";
|
|
|
+ List<String> res = listKeys(project.getTargetBucketName(), ossPre + ds);
|
|
|
+ List<String> tns = res.stream()
|
|
|
+ .map(key -> key.replace(".json", "")
|
|
|
+ .substring(key.lastIndexOf("/") + 1))
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ out_tns.stream()
|
|
|
+ .filter(tn -> !tns.contains(tn))
|
|
|
+ .forEach(tn -> {
|
|
|
+ String targetKey = ossPre + ds + "/" + tn + ".json";
|
|
|
+ PutObjectRequest putObjectRequest = new PutObjectRequest(project.getTargetBucketName(), targetKey, new ByteArrayInputStream("".getBytes()));
|
|
|
+ ossClient.putObject(putObjectRequest);
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public void saveObject(String ds, String targetBucketName, String ossPre) {
|
|
|
- String prcessDate = getPrcessDateV2(ds,7);
|
|
|
+ String prcessDate = getPrcessDateV2(ds, 7);
|
|
|
String pre = ossPre + "/" + prcessDate + "/";
|
|
|
List<String> keys = listKeys(targetBucketName, pre);
|
|
|
List<String> filters_keys = keys.stream()
|