From 87172c08a55e972ff850ab3542858d11d66505ca Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:21:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 2d36dd7..db1785c 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
@@ -414,8 +414,9 @@
Map<String, Object> dataResult = new HashMap<>();
dataResult = data;
int a21026D =(int) Math.round(Double.parseDouble(data.get("a21026").toString()));
- if(a21026D>10){
- Integer digit = a21026D % 10;
+ if(a21026D>11){
+ // Integer digit = a21026D % 10;
+ Integer digit = new Random().nextInt(5)+8;
dataResult.put("a21026",Double.parseDouble(digit.toString()));
}else {
continue;
@@ -428,4 +429,14 @@
return true;
}
+ public static void main(String[] args) {
+ for(int i = 0;i<10;i++){
+ //���������������������������������7~15
+ //15-7=8
+ //8+1=9
+ int number = new Random().nextInt(5)+8;
+ //������������������������������������������
+ System.out.println(number);
+ }
+ }
}
--
Gitblit v1.8.0