From f802ee3375e72025c83f87245b8d5e1703d61956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 25 Jan 2025 14:59:50 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=BF=E9=97=AE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/query/DeviceComponentQuery.java | 2 + .../admin/pojo/query/DeviceTypeQuery.java | 2 + .../request/DictionaryItemSearchRequest.java | 2 + .../pojo/request/DictionarySearchRequest.java | 2 + .../repository/entity/AdminMenu.java | 9 ++-- .../repository/entity/AdminMessage.java | 9 ++-- .../repository/entity/AdminRole.java | 9 ++-- .../repository/entity/AdminUser.java | 7 +-- .../repository/entity/AppArea.java | 9 ++-- .../repository/entity/AppMessage.java | 9 ++-- .../repository/entity/AppUser.java | 9 ++-- .../repository/entity/AppUserApplyfor.java | 9 ++-- .../repository/entity/Company.java | 7 +-- .../repository/entity/Config.java | 9 ++-- .../repository/entity/Device.java | 50 ++++++++++++++++--- .../repository/entity/DeviceComponent.java | 9 ++-- .../repository/entity/Dictionary.java | 9 ++-- .../repository/entity/DictionaryItem.java | 9 ++-- .../entity/DictionaryItemTranslate.java | 9 ++-- .../repository/entity/Language.java | 9 ++-- .../repository/entity/TBaseArea.java | 9 ++-- .../repository/entity/TBaseDepartment.java | 9 ++-- .../repository/entity/TBaseDeviceType.java | 9 ++-- .../repository/entity/TBaseRequestLog.java | 9 ++-- .../entity/TBaseRequestLogDetail.java | 7 +-- .../repository/entity/Ticket.java | 9 ++-- .../repository/entity/TicketFollow.java | 9 ++-- .../repository/entity/VAdminUserMenu.java | 7 +-- .../service/IAppUserApplyforService.java | 8 ++- .../repository/service/IAppUserService.java | 9 ++-- .../IDictionaryItemTranslateService.java | 7 +-- 31 files changed, 171 insertions(+), 110 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java index f4f6d2f6..a2f024cc 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java @@ -2,7 +2,9 @@ package com.nflg.mobilebroken.admin.pojo.query; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class DeviceComponentQuery extends PageBaseQuery { private String modelNo; diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceTypeQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceTypeQuery.java index 51d22a8b..22a0b557 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceTypeQuery.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceTypeQuery.java @@ -2,7 +2,9 @@ package com.nflg.mobilebroken.admin.pojo.query; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class DeviceTypeQuery extends PageBaseQuery { //设备类型 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionaryItemSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionaryItemSearchRequest.java index 5d354fa2..e345f2db 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionaryItemSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionaryItemSearchRequest.java @@ -1,7 +1,9 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class DictionaryItemSearchRequest extends PageRequest { diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionarySearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionarySearchRequest.java index 80bedb16..924f37c9 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionarySearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DictionarySearchRequest.java @@ -1,7 +1,9 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = false) @Data public class DictionarySearchRequest extends PageRequest { diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java index 058c2b84..2fca3cfc 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 后台-菜单 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java index 5199d307..0632e1d1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java index e8044fe7..55dadcc2 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 后台-角色 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java index 93b6c4f5..d19ef77b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java @@ -3,18 +3,19 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 后台-用户 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java index 96025f2c..3821eecd 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 用户端-区域 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java index f3613cff..b413e87a 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 消息 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java index 30ce2851..066bd0ec 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 用户端-用户 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java index e37fa8d5..2e7a2802 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 用户端-用户申请 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java index 848541bb..85bc361a 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java @@ -1,17 +1,18 @@ package com.nflg.mobilebroken.repository.entity; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 公司 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Config.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Config.java index aab3ea77..6cd7fa11 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Config.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Config.java @@ -2,19 +2,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 系统配置 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java index f70e9350..02192c56 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java @@ -2,20 +2,21 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** *

* 设备 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter @@ -52,11 +53,46 @@ public class Device implements Serializable { */ private Integer customerId; + /** + * 客户名称 + */ + private String customerName; + + /** + * 设备状态 1-正常 2-已取消 3-已报废 4-已回收 + */ + private Boolean deviceState; + + /** + * 代理商编码 + */ + private String agentCode; + + /** + * 代理商名称 + */ + private String agentName; + + /** + * 区域编码 + */ + private String areaCode; + + /** + * 区域名称 + */ + private String areaName; + /** * 发货日期 */ private LocalDate shipmentDate; + /** + * 质保状态 + */ + private String warrantyState; + /** * 开始质保日期 */ @@ -68,9 +104,9 @@ public class Device implements Serializable { private Integer warrantyMonth; /** - * 是否启用 + * 行数据是否有效 0-无效 1-有效 */ - private Boolean enable; + private Boolean dataValidState; /** * 创建人 diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java index f8bb88b9..56d85e21 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 机型部件 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java index 31e85efc..d4a28971 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java @@ -2,19 +2,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 字典 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java index 02892ce2..784be78e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 字典值 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.java index ecfa3a69..1fdca36e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 字典值翻译 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java index ae140727..227918ea 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java @@ -2,19 +2,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 字典 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java index 0c7f46e5..8a3ffacb 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 基础信息-区域 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java index 956dae63..560ce427 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 部门表 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java index b15dede3..44f9a3df 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 设备类型 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java index a4bacf97..8ebc7405 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java @@ -2,19 +2,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 访问日志 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java index 6e6b5454..3e68d947 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java @@ -2,18 +2,19 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java index b6e2439d..ca547ca3 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java @@ -2,19 +2,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 工单 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java index 7d4b3f72..276d332b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java @@ -3,19 +3,20 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 工单-关注 *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/VAdminUserMenu.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/VAdminUserMenu.java index 14aae742..f2806cc1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/VAdminUserMenu.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/VAdminUserMenu.java @@ -1,18 +1,19 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* VIEW *

* - * @author 曹鹏飞 - * @since 2025-01-24 + * @author 代码生成器生成 + * @since 2025-01-25 */ @Getter @Setter diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserApplyforService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserApplyforService.java index 4d41f00f..711b6174 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserApplyforService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserApplyforService.java @@ -1,12 +1,10 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.request.AddUserRequest; import com.nflg.mobilebroken.common.pojo.request.ApplyForExtensionRequest; import com.nflg.mobilebroken.common.pojo.request.EnableRequest; import com.nflg.mobilebroken.repository.entity.AppUserApplyfor; -import com.baomidou.mybatisplus.extension.service.IService; - -import javax.validation.Valid; /** *

@@ -20,7 +18,7 @@ public interface IAppUserApplyforService extends IService { void add(AddUserRequest request); - void addEnable(@Valid EnableRequest request); + void addEnable(EnableRequest request); - void applyForExtension(@Valid ApplyForExtensionRequest request); + void applyForExtension(ApplyForExtensionRequest request); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserService.java index ae14d2e0..ae1cd9d6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppUserService.java @@ -2,12 +2,11 @@ package com.nflg.mobilebroken.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.request.*; +import com.nflg.mobilebroken.common.pojo.request.UpdatePasswordRequest; +import com.nflg.mobilebroken.common.pojo.request.UserSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.AppUserVO; import com.nflg.mobilebroken.repository.entity.AppUser; -import javax.validation.Valid; - /** *

* 用户端-用户 服务类 @@ -24,9 +23,9 @@ public interface IAppUserService extends IService { String resetPassword(Integer id, String password); - void search(@Valid UserSearchRequest request, IPage page); + void search(UserSearchRequest request, IPage page); - void updatePassword(@Valid UpdatePasswordRequest request); + void updatePassword(UpdatePasswordRequest request); AppUserVO getInfo(Integer userId); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java index 563f88ad..a1116157 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java @@ -5,9 +5,6 @@ import com.nflg.mobilebroken.common.pojo.dto.DictionaryItemTranslateDTO; import com.nflg.mobilebroken.common.pojo.vo.DictionaryItemTranslateVO; import com.nflg.mobilebroken.repository.entity.DictionaryItemTranslate; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -20,9 +17,9 @@ import java.util.List; */ public interface IDictionaryItemTranslateService extends IService { - List getListByDictionaryItemId(@Valid @NotNull Integer id); + List getListByDictionaryItemId(Integer id); - List getAllLanguageByDictionaryItemIds(@NotEmpty List dictionaryItemIds); + List getAllLanguageByDictionaryItemIds(List dictionaryItemIds); Integer getId(Integer dictionaryItemId, String code); }