From 0fe0d53d76c8a7611a193c70b33a7f50d9dca998 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 25 Apr 2025 11:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pojo/models/EdFileFavorite.java | 14 +------------- .../manage/pojo/models/EdFileRelation.java | 14 +------------- .../software/manage/pojo/models/EdTagLibrary.java | 14 +------------- .../manage/pojo/models/FileTagRelation.java | 14 +------------- .../industry/software/manage/pojo/models/Role.java | 14 +------------- .../manage/pojo/models/RolePermission.java | 14 +------------- .../industry/software/manage/pojo/models/User.java | 10 +--------- .../software/manage/pojo/models/UserRole.java | 14 +------------- 8 files changed, 8 insertions(+), 100 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java index 3f69c89..fb2258c 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java @@ -4,14 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data @TableName("ed_file_favorite") @@ -27,14 +23,6 @@ public class EdFileFavorite extends BaseModel { private String fileId; public void newInit() { - String userId = UserThreadLocal.getUserId(); - String newId = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - this.setId(newId); - this.setCreatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedTime(now); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java index fc9ee80..4c816ae 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java @@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data @TableName("ed_file_relation") @@ -35,14 +31,6 @@ public class EdFileRelation extends BaseModel { private String relationship; public void newInit() { - String userId = UserThreadLocal.getUserId(); - String newId = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - this.setId(newId); - this.setCreatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedTime(now); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java index 2dc364d..c0112d1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java @@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.enums.PublishEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; -import java.util.Date; - @Data @TableName("ed_tag_library") public class EdTagLibrary extends BaseModel { @@ -23,15 +19,7 @@ public class EdTagLibrary extends BaseModel { private Integer isPublished; // 是否已发布（0: 未发布, 1: 已发布） public void newInit() { - String id = IdWorker.getSnowFlakeIdString(); - String userId = UserThreadLocal.getUserId(); - this.setTagId(id); - Date now = new Date(); - this.setCreatedTime(now); - this.setUpdatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setTagId(IdWorker.getSnowFlakeIdString()); this.setIsPublished(PublishEnum.UNPUBLISHED.getCode()); //默认未发布 } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java index 0ba44f0..212eb39 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java @@ -1,14 +1,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data @TableName("file_tag_relations") @@ -19,14 +15,6 @@ public class FileTagRelation extends BaseModel { private String tagId; public void newInit() { - String newId = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - String userId = UserThreadLocal.getUserId(); - this.setId(newId); - this.setCreatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedTime(now); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java index 0e71808..93654c0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java @@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data @TableName("ed_role") // 指定表名 @@ -30,15 +26,7 @@ public class Role extends BaseModel { private String roleDesc; public void newInit() { - String userId = UserThreadLocal.getUserId(); - String newId = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - this.setId(newId); - this.setCreatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedTime(now); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java index 2855951..261feef 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java @@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data @TableName("ed_role_permission") @@ -39,14 +35,6 @@ public class RolePermission extends BaseModel { private String permissionCode; public void newInit() { - String userId = UserThreadLocal.getUserId(); - String newId = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - this.setId(newId); - this.setCreatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedTime(now); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java index 6413083..7971276 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java @@ -6,7 +6,6 @@ import com.electromagnetic.industry.software.common.cons.UserConstants; import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.SignUtils; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; import lombok.EqualsAndHashCode; @@ -93,14 +92,7 @@ public class User extends BaseModel { private String salt; public void newInit() { - String id = IdWorker.getSnowFlakeIdString(); - String userId = UserThreadLocal.getUserId(); - this.setId(id); - Date now = new Date(); - this.setCreatedTime(now); - this.setUpdatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedBy(userId); + this.setId(IdWorker.getSnowFlakeIdString()); this.setEffectFlag(EffectFlagEnum.EFFECT.code); this.setSalt(RandomUtil.randomString(16)); this.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + this.getSalt())); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java index 735778e..d1f041f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java @@ -2,13 +2,9 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.util.IdWorker; -import com.electromagnetic.industry.software.common.util.UserThreadLocal; import lombok.Data; -import java.util.Date; - @Data @TableName("ed_user_role") public class UserRole extends BaseModel { @@ -31,14 +27,6 @@ public class UserRole extends BaseModel { private String roleId; public void newInit() { - String id = IdWorker.getSnowFlakeIdString(); - Date now = new Date(); - String userId = UserThreadLocal.getUserId(); - this.setId(id); - this.setCreatedTime(now); - this.setUpdatedTime(now); - this.setCreatedBy(userId); - this.setUpdatedBy(userId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); + this.setId(IdWorker.getSnowFlakeIdString()); } }