From 9fca5996fb333551f16ab2eddf4ed4ef09c11fd2 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Mon, 24 Jun 2024 14:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/common/utils/SnowFlakeGenerator.java     | 8 ++++----
 .../main/java/com/das/modules/auth/entity/SysMenu.java    | 3 +++
 das/src/main/java/com/das/modules/auth/entity/SysOrg.java | 5 ++++-
 .../main/java/com/das/modules/auth/entity/SysUser.java    | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java b/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java
index e7050400..d307c4d6 100644
--- a/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java
+++ b/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java
@@ -1,14 +1,14 @@
 package com.das.common.utils;
 
 public class SnowFlakeGenerator {
-    private static long datacenterId = 0L;
+    private static final long datacenterId = 0L;
     private static final long DATACENTER_ID_BITS = 6L;
     private static final long MAX_DATACENTER_ID = 63L;
-    private static long sequenceBits = 12L;
+    private static final long sequenceBits = 12L;
     private static final long SEQUENCE_MAX;
     private static final long TWEPOCH = 1440000000000L;
-    private long datacenterIdShift;
-    private long timestampLeftShift;
+    private final long datacenterIdShift;
+    private final long timestampLeftShift;
     private volatile long lastTimestamp;
     private volatile long sequence;
 
diff --git a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java
index b6c22fb0..ba2df62d 100644
--- a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java
+++ b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java
@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_menu")
 @Data
@@ -14,6 +16,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class SysMenu extends BaseEntity {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
diff --git a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
index 081e71ad..59834ead 100644
--- a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
+++ b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+
 
 /**
  * <p>
@@ -22,6 +24,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class SysOrg extends BaseEntity {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
@@ -82,7 +85,7 @@ public class SysOrg extends BaseEntity {
     /**
      * 上级机构id
      */
-    @TableField("parent_org_iD")
+    @TableField("parent_org_id")
     private Long parentOrgID;
 
     /**
diff --git a/das/src/main/java/com/das/modules/auth/entity/SysUser.java b/das/src/main/java/com/das/modules/auth/entity/SysUser.java
index 4ed560df..1c38912f 100644
--- a/das/src/main/java/com/das/modules/auth/entity/SysUser.java
+++ b/das/src/main/java/com/das/modules/auth/entity/SysUser.java
@@ -5,6 +5,7 @@ import com.das.common.constant.BaseEntity;
 import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serial;
 import java.util.Date;
 
 /**
@@ -21,6 +22,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class SysUser extends BaseEntity {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**