From 9671b7bd4d3402d5cec519089e079d917708b5a8 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期五, 09 六月 2023 18:13:41 +0800
Subject: [PATCH] 修改getPk为使用雪花算法
---
Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml | 6 +
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseModelVO.java | 301 ++++++++++++++++++++++++++++++++++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 9 +
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 7
4 files changed, 318 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
index 8702264..5ff66ef 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/pom.xml
@@ -45,5 +45,11 @@
<artifactId>mybatis-plus-join-boot-starter</artifactId>
<version>${mybatisplus.join.version}</version>
</dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.4.1</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index e06ea23..1a642f2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -90,10 +90,9 @@
private String copyFromVersion;
- // @VciUseEnum(
-// value = "Enumsecretgrade",
-// showTextField = "secretGradeText"
-// )
+ /**
+ * 闇�瑕佷娇鐢ㄥ瘑绾х殑鏃跺�欙紝闇�瑕佺户鎵胯繖涓睘鎬�
+ */
@TableField(exist = false)
private Integer secretGrade;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseModelVO.java
new file mode 100644
index 0000000..86f9061
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseModelVO.java
@@ -0,0 +1,301 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+package com.vci.ubcs.starter.web.pagemodel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.data.annotation.Transient;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 鏄剧ず瀵硅薄
+ */
+public class BaseModelVO implements Serializable {
+ private String oid;
+ private String id;
+ private String name;
+ private String description;
+ private String revisionOid;
+ private String nameOid;
+ private String btmname;
+ private String lastR;
+ private String firstR;
+ private String lastV;
+ private String firstV;
+ private String creator;
+ private Date createTime;
+ private String lastModifier;
+ private Date lastModifyTime;
+ private String revisionRule;
+ private Integer revisionSeq;
+ private String revisionValue;
+ private String versionRule;
+ private Integer versionSeq;
+ private String versionValue;
+ private String lcStatus;
+ private String lcStatusText;
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
+ private String owner;
+ private String copyFromVersion;
+ private Integer secretGrade;
+ private String secretGradeText;
+ private String lctid;
+ @Transient
+ private Map<String, String> data;
+
+ public BaseModelVO() {
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getRevisionOid() {
+ return this.revisionOid;
+ }
+
+ public void setRevisionOid(String revisionOid) {
+ this.revisionOid = revisionOid;
+ }
+
+ public String getNameOid() {
+ return this.nameOid;
+ }
+
+ public void setNameOid(String nameOid) {
+ this.nameOid = nameOid;
+ }
+
+ public String getBtmname() {
+ return this.btmname;
+ }
+
+ public void setBtmname(String btmname) {
+ this.btmname = btmname;
+ }
+
+ public String getLastR() {
+ return this.lastR;
+ }
+
+ public void setLastR(String lastR) {
+ this.lastR = lastR;
+ }
+
+ public String getFirstR() {
+ return this.firstR;
+ }
+
+ public void setFirstR(String firstR) {
+ this.firstR = firstR;
+ }
+
+ public String getLastV() {
+ return this.lastV;
+ }
+
+ public void setLastV(String lastV) {
+ this.lastV = lastV;
+ }
+
+ public String getFirstV() {
+ return this.firstV;
+ }
+
+ public void setFirstV(String firstV) {
+ this.firstV = firstV;
+ }
+
+ public String getCreator() {
+ return this.creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public String getLastModifier() {
+ return this.lastModifier;
+ }
+
+ public void setLastModifier(String lastModifier) {
+ this.lastModifier = lastModifier;
+ }
+
+ public Date getLastModifyTime() {
+ return this.lastModifyTime;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+ public String getRevisionRule() {
+ return this.revisionRule;
+ }
+
+ public void setRevisionRule(String revisionRule) {
+ this.revisionRule = revisionRule;
+ }
+
+ public String getVersionRule() {
+ return this.versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
+ public Integer getRevisionSeq() {
+ return this.revisionSeq;
+ }
+
+ public void setRevisionSeq(Integer revisionSeq) {
+ this.revisionSeq = revisionSeq;
+ }
+
+ public String getRevisionValue() {
+ return this.revisionValue;
+ }
+
+ public void setRevisionValue(String revisionValue) {
+ this.revisionValue = revisionValue;
+ }
+
+ public Integer getVersionSeq() {
+ return this.versionSeq;
+ }
+
+ public void setVersionSeq(Integer versionSeq) {
+ this.versionSeq = versionSeq;
+ }
+
+ public String getVersionValue() {
+ return this.versionValue;
+ }
+
+ public void setVersionValue(String versionValue) {
+ this.versionValue = versionValue;
+ }
+
+ public String getLcStatus() {
+ return this.lcStatus;
+ }
+
+ public void setLcStatus(String lcStatus) {
+ this.lcStatus = lcStatus;
+ }
+
+ public Date getTs() {
+ return this.ts;
+ }
+
+ public void setTs(Date ts) {
+ this.ts = ts;
+ }
+
+ public String getOwner() {
+ return this.owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+
+ public String getCopyFromVersion() {
+ return this.copyFromVersion;
+ }
+
+ public void setCopyFromVersion(String copyFromVersion) {
+ this.copyFromVersion = copyFromVersion;
+ }
+
+ public String getLcStatusText() {
+ return this.lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
+ }
+
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Integer getSecretGrade() {
+ return this.secretGrade;
+ }
+
+ public void setSecretGrade(Integer secretGrade) {
+ this.secretGrade = secretGrade;
+ }
+
+ public String getSecretGradeText() {
+ return this.secretGradeText;
+ }
+
+ public void setSecretGradeText(String secretGradeText) {
+ this.secretGradeText = secretGradeText;
+ }
+
+ public String getLctid() {
+ return this.lctid;
+ }
+
+ public void setLctid(String lctid) {
+ this.lctid = lctid;
+ }
+
+ public Map<String, String> getData() {
+ return this.data;
+ }
+
+ public void setData(Map<String, String> data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index 7bf4b8b..4a3e097 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -5,6 +5,8 @@
// (powered by FernFlower decompiler)
//
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -52,7 +54,12 @@
}
public static String getPk() {
- return UUID.randomUUID().toString();
+ return String.valueOf(getPKLong(1,1));
+ }
+
+ public static Long getPKLong(long workerId,long dataCenterId){
+ Snowflake snowflake = IdUtil.getSnowflake(workerId,dataCenterId);
+ return snowflake.nextId();
}
public static int getIntForBoolean(boolean b) {
--
Gitblit v1.9.3