From 092d4d994a95a9df6775c90401887dfba684e8ee Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 18 十二月 2023 21:13:04 +0800
Subject: [PATCH] 增加授权

---
 src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
index 53966e1..c7efde7 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
@@ -18,6 +18,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -271,15 +272,16 @@
 
 
         WeatherWebDto weather = WeatherWebDto.contextMap.get("default");
-        double tMIn = 20, tMax = 25;
+        double tMIn = 10, tMax = 15;
         if (null != weather) {
             double tOut = Double.valueOf(weather.getTem());
-            tMIn = tOut - 4;
-            if (tMIn < 4) tMIn = 5;
-            tMax = tOut + 0;
-            if (tMax < 15) tMax = 15;
+            tMIn = tOut - 5;
+            tMax = tOut;
         }
-
+        if (tMIn < 10) tMIn = 10;
+        if (tMIn > 20) tMIn = 20;
+        if (tMax < 15) tMax = 15;
+        if (tMax > 25) tMax = 25;
 
         //鏁版嵁灏佽
         GrainData grain = new GrainData();
@@ -309,24 +311,22 @@
         double randomNumber = tMIn;
         int x = 0, y = 0, z = 0;
         for (int i = 0; i < sumNum; i++) {
-            if ((i) % Integer.valueOf(cableRule[0]) == 0) {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
-            } else if ((i) % Integer.valueOf(cableRule[0]) == 1) {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
-            } else if ((i) % Integer.valueOf(cableRule[0]) == 2) {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
-            } else if ((i) % Integer.valueOf(cableRule[0]) == 3) {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
-            } else if ((i) % Integer.valueOf(cableRule[0]) == 4) {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
-            } else {
-                randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
-
+            log.info("i=锛�" + i);
+            if (i % cableZ == 0) {
+                randomNumber = RandomUtils.nextDouble(tMIn, tMax+1.5);
+                log.info("绗�1灞傛俯搴︼細" + randomNumber);
+            } else if (i % cableZ == 1)  {
+                randomNumber = RandomUtils.nextDouble(tMIn-1, tMax-0);
+                log.info("绗�2灞傛俯搴︼細" + randomNumber);
+            } else if (i % cableZ == 2)  {
+                randomNumber = RandomUtils.nextDouble(tMIn-2, tMax-1.5);
+                log.info("绗�3灞傛俯搴︼細" + randomNumber);
+            } else if (i % cableZ == 3)  {
+                randomNumber = RandomUtils.nextDouble(tMIn-3, tMax-3);
+                log.info("绗�4灞傛俯搴︼細" + randomNumber);
+            } else if (i % cableZ == 4)  {
+                randomNumber = RandomUtils.nextDouble(tMIn-4, tMax-4.5);
+                log.info("绗�5灞傛俯搴︼細" + randomNumber);
             }
             // randomNumber = Math.random() * (tMax - tMIn + 1) + tMIn;
             curTemp = NumberUtil.keepPrecision(randomNumber, 1);

--
Gitblit v1.9.3