From a7bd76dfd00efc7b03999c4559cf8554e34c19cb Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 Aug 2024 16:56:34 +0800
Subject: [PATCH] 1

---
 src/main/java/project/data/job/GetDataJob.java |   85 ++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/main/java/project/data/job/GetDataJob.java b/src/main/java/project/data/job/GetDataJob.java
index e2ba06a..d63c10a 100644
--- a/src/main/java/project/data/job/GetDataJob.java
+++ b/src/main/java/project/data/job/GetDataJob.java
@@ -132,47 +132,50 @@
 				}
 				
 				// 缓存中最新一条Realtime数据
-				Realtime realtimeLast = DataCache.getRealtime(symbol);
-				if (null != realtimeLast) {
-					// 临时处理:正常10秒超过25%也不合理,丢弃
-					double rate = Math.abs(Arith.sub(realtime.getClose(), realtimeLast.getClose()));
-					if (null == realtimeLast || Arith.div(rate, realtimeLast.getClose()) < 0.25D) {
-						Double high = DataCache.getRealtimeHigh().get(symbol);
-						Double low = DataCache.getRealtimeLow().get(symbol);
-
-						if (high == null || realtime.getClose() > high) {
-							DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
-						}
-						if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
-							DataCache.getRealtimeLow().put(symbol, realtime.getClose());
-						}
-						
-						this.dataDBService.saveAsyn(realtime);
-					} else {
-						Double high = DataCache.getRealtimeHigh().get(symbol);
-						Double low = DataCache.getRealtimeLow().get(symbol);
-
-						if (high == null || realtime.getClose() > high) {
-							DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
-						}
-						if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
-							DataCache.getRealtimeLow().put(symbol, realtime.getClose());
-						}
-						
-						this.dataDBService.saveAsyn(realtime);
-						logger.error("当前价格{},超过25%也不合理,丢弃Realtime,不入库", realtime.getClose());
-					}
-				} else {
-					Double high = DataCache.getRealtimeHigh().get(symbol);
-					Double low = DataCache.getRealtimeLow().get(symbol);
-					if (high == null || realtime.getClose() > high) {
-						DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
-					}
-					if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
-						DataCache.getRealtimeLow().put(symbol, realtime.getClose());
-					}					
-					this.dataDBService.saveAsyn(realtime);
-				}
+				DataCache.getRealtimeHigh().put(symbol, realtime.getHigh());
+				DataCache.getRealtimeLow().put(symbol, realtime.getLow());
+				this.dataDBService.saveAsyn(realtime);
+//				Realtime realtimeLast = DataCache.getRealtime(symbol);
+//				if (null != realtimeLast) {
+//					// 临时处理:正常10秒超过25%也不合理,丢弃
+//					double rate = Math.abs(Arith.sub(realtime.getClose(), realtimeLast.getClose()));
+//					if (null == realtimeLast || Arith.div(rate, realtimeLast.getClose()) < 0.25D) {
+//						Double high = DataCache.getRealtimeHigh().get(symbol);
+//						Double low = DataCache.getRealtimeLow().get(symbol);
+//
+//						if (high == null || realtime.getClose() > high) {
+//							DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
+//						}
+//						if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
+//							DataCache.getRealtimeLow().put(symbol, realtime.getClose());
+//						}
+//
+//						this.dataDBService.saveAsyn(realtime);
+//					} else {
+//						Double high = DataCache.getRealtimeHigh().get(symbol);
+//						Double low = DataCache.getRealtimeLow().get(symbol);
+//
+//						if (high == null || realtime.getClose() > high) {
+//							DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
+//						}
+//						if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
+//							DataCache.getRealtimeLow().put(symbol, realtime.getClose());
+//						}
+//
+//						this.dataDBService.saveAsyn(realtime);
+//						logger.error("当前价格{},超过25%也不合理,丢弃Realtime,不入库", realtime.getClose());
+//					}
+//				} else {
+//					Double high = DataCache.getRealtimeHigh().get(symbol);
+//					Double low = DataCache.getRealtimeLow().get(symbol);
+//					if (high == null || realtime.getClose() > high) {
+//						DataCache.getRealtimeHigh().put(symbol, realtime.getClose());
+//					}
+//					if ((low == null || realtime.getClose() < low) && realtime.getClose() > 0) {
+//						DataCache.getRealtimeLow().put(symbol, realtime.getClose());
+//					}
+//					this.dataDBService.saveAsyn(realtime);
+//				}
 
 
 			} catch (Exception e) {				

--
Gitblit v1.9.3