chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码

This commit is contained in:
chenxudong 2025-04-25 11:21:53 +08:00
parent dbba7ea178
commit 0fe0d53d76
8 changed files with 8 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileFavorite.java
View File

@ -4,14 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_file_favorite") @TableName("ed_file_favorite")
@ -27,14 +23,6 @@ public class EdFileFavorite extends BaseModel {
private String fileId; private String fileId;
public void newInit() { public void newInit() {
String userId = UserThreadLocal.getUserId(); this.setId(IdWorker.getSnowFlakeIdString());
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);
} }
} }

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileRelation.java
View File

@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_file_relation") @TableName("ed_file_relation")
@ -35,14 +31,6 @@ public class EdFileRelation extends BaseModel {
private String relationship; private String relationship;
public void newInit() { public void newInit() {
String userId = UserThreadLocal.getUserId(); this.setId(IdWorker.getSnowFlakeIdString());
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);
} }
} }

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdTagLibrary.java
View File

@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.enums.PublishEnum;
import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
@TableName("ed_tag_library") @TableName("ed_tag_library")
public class EdTagLibrary extends BaseModel { public class EdTagLibrary extends BaseModel {
@ -23,15 +19,7 @@ public class EdTagLibrary extends BaseModel {
private Integer isPublished; // 是否已发布（0: 未发布, 1: 已发布） private Integer isPublished; // 是否已发布（0: 未发布, 1: 已发布）
public void newInit() { public void newInit() {
String id = IdWorker.getSnowFlakeIdString(); this.setTagId(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.setIsPublished(PublishEnum.UNPUBLISHED.getCode()); //默认未发布 this.setIsPublished(PublishEnum.UNPUBLISHED.getCode()); //默认未发布
} }
} }

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/FileTagRelation.java
View File

@ -1,14 +1,10 @@
package com.electromagnetic.industry.software.manage.pojo.models; package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("file_tag_relations") @TableName("file_tag_relations")
@ -19,14 +15,6 @@ public class FileTagRelation extends BaseModel {
private String tagId; private String tagId;
public void newInit() { public void newInit() {
String newId = IdWorker.getSnowFlakeIdString(); this.setId(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);
} }
} }

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Role.java
View File

@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_role") // 指定表名 @TableName("ed_role") // 指定表名
@ -30,15 +26,7 @@ public class Role extends BaseModel {
private String roleDesc; private String roleDesc;
public void newInit() { public void newInit() {
String userId = UserThreadLocal.getUserId(); this.setId(IdWorker.getSnowFlakeIdString());
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);
} }
} }

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/RolePermission.java
View File

@ -2,14 +2,10 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("ed_role_permission") @TableName("ed_role_permission")
@ -39,14 +35,6 @@ public class RolePermission extends BaseModel {
private String permissionCode; private String permissionCode;
public void newInit() { public void newInit() {
String userId = UserThreadLocal.getUserId(); this.setId(IdWorker.getSnowFlakeIdString());
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);
} }
} }

10
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java
View File

@ -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.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.util.IdWorker; import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.SignUtils; import com.electromagnetic.industry.software.common.util.SignUtils;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -93,14 +92,7 @@ public class User extends BaseModel {
private String salt; private String salt;
public void newInit() { public void newInit() {
String id = IdWorker.getSnowFlakeIdString(); this.setId(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.setEffectFlag(EffectFlagEnum.EFFECT.code); this.setEffectFlag(EffectFlagEnum.EFFECT.code);
this.setSalt(RandomUtil.randomString(16)); this.setSalt(RandomUtil.randomString(16));
this.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + this.getSalt())); this.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + this.getSalt()));

14
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java
View File

@ -2,13 +2,9 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; 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.IdWorker;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
@TableName("ed_user_role") @TableName("ed_user_role")
public class UserRole extends BaseModel { public class UserRole extends BaseModel {
@ -31,14 +27,6 @@ public class UserRole extends BaseModel {
private String roleId; private String roleId;
public void newInit() { public void newInit() {
String id = IdWorker.getSnowFlakeIdString(); this.setId(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);
} }
} }