From d461a9e12841ba0e345fdb03eb8caaccb3b0da8e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:46:48 +0800
Subject: [PATCH] fix：修改测试环境redis
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 11 ++++++++---
screen-api/src/main/resources/application-qa.yml | 4 ++--
screen-manage/src/main/resources/application-qa.yml | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 7287c00..0f2b128 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -410,14 +410,19 @@
Map<String, Object> data = JSON.parseObject(g.getValue(), Map.class);
Map<String, Object> dataResult = new HashMap<>();
dataResult = data;
- int a21026D =(int) Math.round(Double.parseDouble(data.get("a21026").toString()));
- if(a21026D>11){
+
+ Double a34004 = Double.parseDouble(data.get("a34004").toString());
+ Double a34002 = Double.parseDouble(data.get("a34002").toString());
+ dataResult.put("a34002",Double.parseDouble(String.format("%.4f",a34004)));
+ dataResult.put("a34004",Double.parseDouble(String.format("%.4f",a34002)));
+
+ /* if(a21026D>11){
// Integer digit = a21026D % 10;
Integer digit = new Random().nextInt(5)+8;
dataResult.put("a21026",Double.parseDouble(digit.toString()));
}else {
continue;
- }
+ }*/
historySecondUav.setId(g.getId());
historySecondUav.setValue(JSONObject.toJSONString(dataResult));
list.add(historySecondUav);
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index f9dde1a..ccec2b7 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -21,7 +21,7 @@
main:
allow-bean-definition-overriding: true
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -38,7 +38,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml
index d7ed599..74fe56e 100644
--- a/screen-manage/src/main/resources/application-qa.yml
+++ b/screen-manage/src/main/resources/application-qa.yml
@@ -18,7 +18,7 @@
application:
name: screen-manage
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -35,7 +35,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
--
Gitblit v1.8.0