From 0916da53ef71cf6b415ca289791b82bf5a7e6e01 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 03 Jun 2021 10:23:20 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/XchTest.java | 9 +++++++++
src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java | 27 ++++++---------------------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
index 23e5f5c..0587d11 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
@@ -36,40 +36,23 @@
@Autowired
private XchProfitService xchProfitService;
- // @Scheduled(cron = "0 0 0/10 * * ? ")
+// @Scheduled(cron = "0/1 * * * * ? ")
@Scheduled(cron = "0 0/10 * * * ? ")
public void baseDataUpdate() {
log.info("基础数据更新任务");
// 请求价格等数据 "https://api2.chiaexplorer.com/blockchainSummary"
String result = pyExec();
-// log.info("result======>>{}", result);
- // 每t预计收益
-// String profitPerT = execCurl("https://api2.chiaexplorer.com/chart/xchTibDay?period=2w");
-//
-// String xchPrice24HStr = execCurl("https://api2.chiaexplorer.com/chart/xchPriceChart?period=24h");
-// JSONObject jsonObject = (JSONObject) JSONObject.parse(result);
-// JSONObject perTObject = (JSONObject) JSONObject.parse(profitPerT);
+ log.info("====>{}",result);
JSONObject xchPrice24HObj = (JSONObject) JSONObject.parse(result);
List<YdBasicSettingEntity> list = ydBasicSettingDao.selectList(null);
if (CollUtil.isNotEmpty(list)) {
YdBasicSettingEntity settingEntity = list.get(0);
-// String netspaceStr = jsonObject.getString("netspace");
-// BigDecimal baseUnit = BigDecimal.valueOf(1024);
-// BigDecimal netspace = new BigDecimal(netspaceStr).divide(baseUnit.multiply(baseUnit.multiply(baseUnit.multiply(baseUnit.multiply(baseUnit)))), 2, BigDecimal.ROUND_DOWN);
-// settingEntity.setAllPower(netspace);
-
List<String> xchPrice24H = JSONObject.parseArray(xchPrice24HObj.getString("data"), String.class);
+
BigDecimal newestPrice = new BigDecimal(xchPrice24H.get(xchPrice24H.size() - 1));
redisUtils.set("XCH_NEW_PRICE", newestPrice);
settingEntity.setCurrentPrice(newestPrice);
-// BigDecimal lastPrice = new BigDecimal(xchPrice24H.get(xchPrice24H.size() - 1 -24));
-// BigDecimal upOrDown = newestPrice.subtract(lastPrice).multiply(BigDecimal.valueOf(100)).divide(lastPrice, 2, BigDecimal.ROUND_HALF_UP);
-// redisUtils.set("XCH_UP_DOWN", upOrDown);
-// List<String> data = JSONObject.parseArray(perTObject.getString("data"), String.class);
-// settingEntity.setPrifitT(new BigDecimal(data.get(0)));
-// settingEntity.setProfitDay(new BigDecimal(data.get(0)).multiply(BigDecimal.valueOf(1024)));
-
ydBasicSettingDao.updateById(settingEntity);
}
}
@@ -154,8 +137,10 @@
public String pyExec() {
String result = "";
+ String cmd = "python2.7 /home/javaweb/yunding/xch.py";
+// String cmd = "python /Users/helius/Desktop/xch.py";
try {
- Process process = Runtime.getRuntime().exec("python2.7 /home/javaweb/yunding/xch.py");
+ Process process = Runtime.getRuntime().exec(cmd);
process.waitFor();
InputStreamReader ir = new InputStreamReader(process.getInputStream());
LineNumberReader input = new LineNumberReader(ir);
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index 129b791..50684cf 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -12,6 +12,7 @@
import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.quartz.job.XchBaseDataUpdateJob;
import com.xcong.excoin.quartz.job.YdPowerJob;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -166,4 +167,12 @@
}
System.out.println(result);
}
+
+ @Autowired
+ private XchBaseDataUpdateJob xchBaseDataUpdateJob;
+
+ @Test
+ public void baseDataTest() {
+ xchBaseDataUpdateJob.baseDataUpdate();
+ }
}
--
Gitblit v1.9.1