From 3b668f811fce818ce69ac9bca4195976704dc719 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 18 十二月 2023 15:35:59 +0800 Subject: [PATCH] 1、优化ID生成器,方法同步锁改为静态变量同步锁; 2、RTU模拟器中增加TCP连接输出日志信息; 3、RTU模拟器中增加Rmi相关输出日志信息; --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/IDLongGenerator.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 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 7c607d9..9f6e86f 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 @@ -1,11 +1,15 @@ package com.dy.common.util; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Calendar; +@Slf4j @Component public class IDLongGenerator { + + private static final Object synObj = new Object() ; private static final int yearLenght = 4 ;//4锛氬勾搴﹀彇鍥涗綅锛� 3锛氬勾搴﹀彇涓変綅锛� 2锛氬勾搴﹀彇涓や綅锛� 1锛氬勾搴﹀彇涓�浣嶏紝 0锛氬勾搴﹀彇0浣� @@ -24,11 +28,16 @@ } /** - * 23 10 28 09 14 40 00000 - * 闀垮害16鐨処D锛屽勾搴﹀彇涓や綅锛岄暱搴�18鐨処D锛屽勾搴﹀彇鍥涗綅锛�17浣嶆暟瀛楄秴鍑轰簡javascript鐨勮〃鏁拌寖鍥达紝javascript浼氳〃鏁颁笉姝g‘ + * 2023 10 28 09 14 40 00000 + * 闀垮害19鐨処D锛屽勾搴﹀彇涓や綅锛岄暱搴�18鐨処D锛屽勾搴﹀彇鍥涗綅锛�17浣嶆暟瀛楄秴鍑轰簡javascript鐨勮〃鏁拌寖鍥达紝javascript浼氳〃鏁颁笉姝g‘ */ public Long generate(){ - return doGenerate() ; + synchronized (synObj){ + //Long id = doGenerate() ; + //log.info("浜х敓ID = " + id); + //return id ; + return doGenerate() ; + } } /** * 璁剧疆鍚庣紑锛屼笉鍚屽瓙绯荤粺璁剧疆涓嶅悓鐨勫悗缂� @@ -96,9 +105,9 @@ /** * 鎵ц鐢熸垚 - * @return ID + * @return ID 20231218 104504 06900 */ - private synchronized Long doGenerate(){ + private Long doGenerate(){ long id ; long now = current() ; if(now != last){ -- Gitblit v1.8.0