From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java
index 3b8a133..3ab0397 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java
@@ -22,6 +22,7 @@
//姝D鐢熸垚鍣ㄥ湪鍚勪釜瀛愮郴缁熶腑闅惧厤涓哄悓涓�绫绘暟鎹敓鎴愮浉鍚岀殑ID锛岄�犳垚鏁版嵁搴撴彃鍏ュ洜涓婚敭鐩稿悓鑰屾姤閿�,
//鎵�浠ヨ璁℃鍚庣紑锛屾瘡涓瓙绯荤粺鍚庣紑涓嶅悓
private static int suffix = 0 ;
+ private static final int noSuffix = 0 ;
static {
last = current() ;
@@ -56,7 +57,7 @@
* @return ID
*/
public static Long generateTodayStartId(){
- return (currentTodayStart() * chengShu) * 100 + suffix;
+ return (currentTodayStart() * chengShu) * 100 + noSuffix;
}
/**
@@ -64,7 +65,7 @@
* @return ID
*/
public static Long generateTodayEndId(){
- return (currentTodayEnd() * chengShu) * 100 + suffix;
+ return (currentTodayEnd() * chengShu) * 100 + noSuffix;
}
@@ -73,7 +74,7 @@
* @return ID
*/
public static Long generateBeforeXDayStartId(int xday){
- return (beforeXDayStart(xday) * chengShu) * 100 + suffix;
+ return (beforeXDayStart(xday) * chengShu) * 100 + noSuffix;
}
/**
@@ -81,7 +82,7 @@
* @return ID
*/
public static Long generateBeforeXDayEndId(int xday){
- return (beforeXDayEnd(xday) * chengShu) * 100 + suffix;
+ return (beforeXDayEnd(xday) * chengShu) * 100 + noSuffix;
}
--
Gitblit v1.8.0