From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java
index 984b0d3..38a13ca 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java
@@ -11,17 +11,20 @@
/*
public static void main(String[] args) {
- System.out.println(CreateRandom.random(1, 0));
- System.out.println(CreateRandom.random(2, 0));
- System.out.println(CreateRandom.random(3, 0));
- System.out.println(CreateRandom.random(4, 0));
- System.out.println(CreateRandom.random(5, 0));
- System.out.println(CreateRandom.random(100, 0));
- System.out.println(CreateRandom.random(1256, 1234));
+// System.out.println(CreateRandom.random(1, 0));
+// System.out.println(CreateRandom.random(2, 0));
+// System.out.println(CreateRandom.random(3, 0));
+// System.out.println(CreateRandom.random(4, 0));
+// System.out.println(CreateRandom.random(5, 0));
+// System.out.println(CreateRandom.random(100, 0));
+// System.out.println(CreateRandom.random(1256, 1234));
System.out.println("=======================");
- System.out.println(create_between(10, 100));
+ for(int i = 0 ; i < 100; i++){
+ System.out.println(create_between(10, 100));
+ }
}
*/
+
/**
* 4浣嶉殢鏈烘暟鎹�
@@ -81,13 +84,8 @@
if(max - min < min/2){
return min ;
}
- String minStr = String.valueOf(min) ;
- int len = minStr.length() ;
- char minFirst = minStr.charAt(0) ;
- double d = Math.random();
- d = d * 10000000 ;
- String s = String.valueOf(d);
- s = minFirst + s ;
+ int len = String.valueOf(min).length() ;
+ String s = String.valueOf(Math.random() * 10000000);
s = s.substring(0 ,len) ;
int n = Integer.parseInt(s) ;
if(n < min || n > max){
--
Gitblit v1.8.0