From 19f5a9324c98a6c398dd495bec1f3d8fb20afbe2 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 17 Oct 2025 17:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/ImportTableDataMapper.java | 1 - .../manage/mapper/UserRoleMapper.java | 1 - .../manage/pojo/other/PublishParam.java | 5 ++++- .../manage/pojo/other/SingleUserResponse.java | 5 ++++- .../pojo/req/ChangePasswordRequest.java | 22 +++---------------- .../manage/pojo/req/EDDataRequest.java | 2 ++ .../manage/pojo/req/GetSingleUserRequest.java | 2 ++ .../manage/pojo/req/SearchUserRequest.java | 2 ++ .../manage/pojo/req/UserDeleteRequest.java | 2 ++ .../manage/pojo/req/UserLoginRequest.java | 2 ++ .../manage/pojo/req/UserModiRequest.java | 2 ++ .../manage/pojo/req/UserPublishRequest.java | 2 ++ .../software/manage/pojo/req/UserRequest.java | 2 ++ .../manage/pojo/req/UserWorkNumRequest.java | 2 ++ .../pojo/req/ValidateOldPasswordRequest.java | 20 +++-------------- 15 files changed, 32 insertions(+), 40 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java index 20871a5..f9283ef 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/ImportTableDataMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.electromagnetic.industry.software.manage.pojo.models.ImportTableData; import org.apache.ibatis.annotations.Mapper; - @Mapper public interface ImportTableDataMapper extends BaseMapper { } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java index a8c2e58..0d6e915 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.electromagnetic.industry.software.manage.pojo.models.UserRole; import org.apache.ibatis.annotations.Mapper; - @Mapper public interface UserRoleMapper extends BaseMapper { } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/PublishParam.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/PublishParam.java index 2d839a6..11755e7 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/PublishParam.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/PublishParam.java @@ -2,10 +2,13 @@ package com.electromagnetic.industry.software.manage.pojo.other; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; @Data -public class PublishParam { +public class PublishParam implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java index 31f6b9a..fd732ec 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java @@ -4,12 +4,15 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; import java.util.List; @Data -public class SingleUserResponse { +public class SingleUserResponse implements Serializable { + @Serial private static final long serialVersionUID = -7475233976453471059L; /** diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ChangePasswordRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ChangePasswordRequest.java index 922c96c..eed60a6 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ChangePasswordRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ChangePasswordRequest.java @@ -1,25 +1,9 @@ package com.electromagnetic.industry.software.manage.pojo.req; +import lombok.Data; + +@Data public class ChangePasswordRequest { private String userId; - private String newPassword; - - // Getters and Setters - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - - public String getNewPassword() { - return newPassword; - } - - public void setNewPassword(String newPassword) { - this.newPassword = newPassword; - } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/EDDataRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/EDDataRequest.java index ec00f38..8983eb5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/EDDataRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/EDDataRequest.java @@ -1,11 +1,13 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.util.Date; +@EqualsAndHashCode(callSuper = true) @Data public class EDDataRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/GetSingleUserRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/GetSingleUserRequest.java index 0c5480b..6dddc6e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/GetSingleUserRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/GetSingleUserRequest.java @@ -1,9 +1,11 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class GetSingleUserRequest extends BaseRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/SearchUserRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/SearchUserRequest.java index 2b28c12..1eb8341 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/SearchUserRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/SearchUserRequest.java @@ -1,9 +1,11 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class SearchUserRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserDeleteRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserDeleteRequest.java index 53df248..ee3223b 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserDeleteRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserDeleteRequest.java @@ -1,9 +1,11 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class UserDeleteRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserLoginRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserLoginRequest.java index 1f388b2..c2c49d2 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserLoginRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserLoginRequest.java @@ -1,9 +1,11 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class UserLoginRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserModiRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserModiRequest.java index 0f66c67..c5d9111 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserModiRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserModiRequest.java @@ -3,10 +3,12 @@ package com.electromagnetic.industry.software.manage.pojo.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; +@EqualsAndHashCode(callSuper = true) @Data public class UserModiRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserPublishRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserPublishRequest.java index a04cb7d..aa42801 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserPublishRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserPublishRequest.java @@ -2,10 +2,12 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.List; +@EqualsAndHashCode(callSuper = true) @Data public class UserPublishRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java index c41cf5b..fd64490 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRequest.java @@ -2,10 +2,12 @@ package com.electromagnetic.industry.software.manage.pojo.req; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; +@EqualsAndHashCode(callSuper = true) @Data public class UserRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserWorkNumRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserWorkNumRequest.java index f1ebb67..c6cafe6 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserWorkNumRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserWorkNumRequest.java @@ -1,9 +1,11 @@ package com.electromagnetic.industry.software.manage.pojo.req; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; +@EqualsAndHashCode(callSuper = true) @Data public class UserWorkNumRequest extends BaseRequest implements Serializable { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ValidateOldPasswordRequest.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ValidateOldPasswordRequest.java index 66f2d21..8a1fbbc 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ValidateOldPasswordRequest.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/ValidateOldPasswordRequest.java @@ -1,23 +1,9 @@ package com.electromagnetic.industry.software.manage.pojo.req; +import lombok.Data; + +@Data public class ValidateOldPasswordRequest { private String userId; private String oldPassword; - - // Getters and Setters - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getOldPassword() { - return oldPassword; - } - - public void setOldPassword(String oldPassword) { - this.oldPassword = oldPassword; - } }