|
@@ -37,6 +37,7 @@ import static com.winhc.data.push.constant.BaseParam.*;
|
|
import static com.winhc.data.push.utils.BaseUtils.getObjectId;
|
|
import static com.winhc.data.push.utils.BaseUtils.getObjectId;
|
|
import static com.winhc.data.push.utils.BaseUtils.getPrcessDate;
|
|
import static com.winhc.data.push.utils.BaseUtils.getPrcessDate;
|
|
import static com.winhc.data.push.utils.DateUtils.getPrcessDateV2;
|
|
import static com.winhc.data.push.utils.DateUtils.getPrcessDateV2;
|
|
|
|
+import static com.winhc.data.push.utils.OssUtils.existsBucketName;
|
|
import static com.winhc.data.push.utils.OssUtils.listKeys;
|
|
import static com.winhc.data.push.utils.OssUtils.listKeys;
|
|
import static com.winhc.data.push.utils.TransToExcelNewCompany.dataPathPrefix;
|
|
import static com.winhc.data.push.utils.TransToExcelNewCompany.dataPathPrefix;
|
|
import static com.winhc.data.push.utils.TransToExcelNewCompany.run;
|
|
import static com.winhc.data.push.utils.TransToExcelNewCompany.run;
|
|
@@ -128,6 +129,38 @@ public class SynDataServiceImpl implements SynDataService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 安硕数据工商数据输出
|
|
|
|
+ *
|
|
|
|
+ * @param tns
|
|
|
|
+ * @param ds
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public void pushAnshuoCompany(List<String> tns, String ds) {
|
|
|
|
+ String id = ds;
|
|
|
|
+ String message_pre = "安硕工商推送 ";
|
|
|
|
+ try {
|
|
|
|
+ updateTaskStatus(SYN_ANSHUO_GONGSHANG_TASKS, ds, TaskEnum.STATUS.RUNNING.code, id);
|
|
|
|
+ sendMessage(message_pre + "task running !!! " + id);
|
|
|
|
+ String project = "winhc_ng";
|
|
|
|
+ if (touchService.export2OSSAnshuoCompany(project, ds, tns)) {
|
|
|
|
+ //待修改
|
|
|
|
+ saveObjectAnshuo(ds, ANSHUO_BUCKET_NAME, ANSHUO_OSS_PRE);
|
|
|
|
+ updateTaskStatus(SYN_ANSHUO_GONGSHANG_TASKS, ds, TaskEnum.STATUS.SUCCESS.code, id);
|
|
|
|
+ sendMessage(message_pre + "导出 任务 成功 !!! " + id);
|
|
|
|
+ } else {
|
|
|
|
+ log.error(message_pre + "导出OSS 失败 !!!");
|
|
|
|
+ sendMessage(message_pre + "导出 OSS 失败!!! " + id);
|
|
|
|
+ updateTaskStatus(SYN_ANSHUO_GONGSHANG_TASKS, ds, TaskEnum.STATUS.ERROR.code, id);
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ sendMessage(message_pre + "任务失败!!! " + id + " | error " + e.getMessage());
|
|
|
|
+ updateTaskStatus(SYN_ANSHUO_GONGSHANG_TASKS, ds, TaskEnum.STATUS.TASK_ERROR.code, id);
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ log.error(message_pre + "export error: {}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public String saveTask(String tn, String ds) {
|
|
public String saveTask(String tn, String ds) {
|
|
@@ -361,7 +394,26 @@ public class SynDataServiceImpl implements SynDataService {
|
|
String targetKey = pre + "out_tc.success";
|
|
String targetKey = pre + "out_tc.success";
|
|
PutObjectRequest putObjectRequest = new PutObjectRequest(targetBucketName, targetKey, new ByteArrayInputStream(sum.getBytes()));
|
|
PutObjectRequest putObjectRequest = new PutObjectRequest(targetBucketName, targetKey, new ByteArrayInputStream(sum.getBytes()));
|
|
ossClient.putObject(putObjectRequest);
|
|
ossClient.putObject(putObjectRequest);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 安硕工商数据测试
|
|
|
|
+ *
|
|
|
|
+ * @param ds
|
|
|
|
+ * @param targetBucketName
|
|
|
|
+ * @param ossPre
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public void saveObjectAnshuo(String ds, String targetBucketName, String ossPre) {
|
|
|
|
+ String prcessDate = getPrcessDateV2(ds, 0);
|
|
|
|
+ anshuo_company_tns.forEach(tn -> {
|
|
|
|
+ String targetSuccessKey = ossPre + "/" + tn + "/" + prcessDate + "/" + "anshuo.txt";
|
|
|
|
+ String targetDataKey = ossPre + "/" + tn + "/" + prcessDate + "/" + tn + ".json";
|
|
|
|
+ if (existsBucketName(targetBucketName, targetDataKey)) {
|
|
|
|
+ PutObjectRequest putObjectRequest = new PutObjectRequest(targetBucketName, targetSuccessKey, new ByteArrayInputStream("".getBytes()));
|
|
|
|
+ ossClient.putObject(putObjectRequest);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
}
|
|
}
|
|
|
|
|
|
public String getTn(String key) {
|
|
public String getTn(String key) {
|