|
|
@@ -99,21 +99,21 @@ public class DataBucketController {
|
|
|
uploadToOssUtil.uploadTo4dTjw(res.toJSONString().getBytes(), FileName);
|
|
|
DataBucketController.log.info("上传结束,上传版本号={}", version);
|
|
|
//step 3 返回json地址
|
|
|
- if (uploadToOssUtil.existFileToOSS(FileName, "4d-tjw")) {
|
|
|
- res.forEach(a -> {
|
|
|
- JSONObject json = (JSONObject) JSONObject.toJSON(a);
|
|
|
- if (json.containsKey("escFilePath")) {
|
|
|
- String escFilePath = json.getString("escFilePath");
|
|
|
- TimeInterval timer = DateUtil.timer();
|
|
|
- timer.start();
|
|
|
- List<String> cmdRes = RuntimeUtil.execForLines("bash /home/uploadToEsc.sh ", escFilePath);
|
|
|
- DataBucketController.log.info("上传耗时{}", timer.intervalMs());
|
|
|
- cmdRes.forEach(c -> {
|
|
|
- DataBucketController.log.info("上传文件至ESC{}", c);
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+// if (uploadToOssUtil.existFileToOSS(FileName, "4d-tjw")) {
|
|
|
+// res.forEach(a -> {
|
|
|
+// JSONObject json = (JSONObject) JSONObject.toJSON(a);
|
|
|
+// if (json.containsKey("escFilePath")) {
|
|
|
+// String escFilePath = json.getString("escFilePath");
|
|
|
+// TimeInterval timer = DateUtil.timer();
|
|
|
+// timer.start();
|
|
|
+// List<String> cmdRes = RuntimeUtil.execForLines("bash /home/uploadToEsc.sh ", escFilePath);
|
|
|
+// DataBucketController.log.info("上传耗时{}", timer.intervalMs());
|
|
|
+// cmdRes.forEach(c -> {
|
|
|
+// DataBucketController.log.info("上传文件至ESC{}", c);
|
|
|
+// });
|
|
|
+// }
|
|
|
+// });
|
|
|
+// }
|
|
|
////step 4 发送到任务处理
|
|
|
//String resultData = OkHttpUtils.httpGet(mainUrl + "/change/data/dataPush/" + version + "/type/" + param.getType());
|
|
|
//JSONObject resultJson = JSON.parseObject(resultData) ;
|
Xiewj