From 131480306fa87aaeed4946c1f7f03e4340b31bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 1 Jul 2025 12:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/UserController.java | 9 ++ .../admin/service/UserControllerService.java | 12 +++ .../com/nflg/wms/common/pojo/dto/UserDTO.java | 84 +++++++++++++++++ .../com/nflg/wms/repository/entity/VUser.java | 90 +++++++++++++++++++ .../wms/repository/mapper/VUserMapper.java | 16 ++++ .../wms/repository/service/IVUserService.java | 16 ++++ .../service/impl/UserServiceImpl.java | 1 + .../service/impl/VUserServiceImpl.java | 20 +++++ .../src/main/resources/mapper/VUserMapper.xml | 5 ++ .../wms/repository/CodeGeneratorTest.java | 2 +- 10 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/UserDTO.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/VUser.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/VUserMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IVUserService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/VUserServiceImpl.java create mode 100644 nflg-wms-repository/src/main/resources/mapper/VUserMapper.xml diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java index b7c2117a..55c04a00 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java @@ -3,6 +3,7 @@ package com.nflg.wms.admin.controller; import com.nflg.wms.admin.service.UserControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.dto.UserDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.RoleSimpleVO; import com.nflg.wms.common.pojo.vo.UserVO; @@ -125,4 +126,12 @@ public class UserController extends BaseController { userControllerService.sendForgetPasswordEmail(email); return ApiResult.success(); } + + /** + * 获取当前用户信息 + */ + @GetMapping("getUserInfo") + public ApiResult getUserInfo() { + return ApiResult.success(userControllerService.getUserInfo()); + } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java index ed1004c3..8bedfe0d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java @@ -2,6 +2,7 @@ package com.nflg.wms.admin.service; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; @@ -15,6 +16,7 @@ import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.dto.AdDTO; import com.nflg.wms.common.pojo.dto.SupplierExcelDTO; import com.nflg.wms.common.pojo.dto.SupplierExcelExportDTO; +import com.nflg.wms.common.pojo.dto.UserDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.RoleSimpleVO; import com.nflg.wms.common.pojo.vo.UserSupplierVO; @@ -80,14 +82,19 @@ public class UserControllerService { @Resource private IDictionaryItemTranslateService dictionaryItemTranslateService; + @Resource private IUserSupplierService userSupplierService; + @Resource private FileUploadService fileUploadService; @Resource private IVUserSupplierService vUserSupplierService; + @Resource + private IVUserService vUserService; + @Transactional public void add(@Valid UserAddQO request) { VUtil.trueThrowBusinessError(uService.lambdaQuery() @@ -510,4 +517,9 @@ public class UserControllerService { public List getTypeList() { return dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SUPPLIERS_CATEGORY); } + + public UserDTO getUserInfo() { + VUser vUser=vUserService.getById(UserUtil.getUserId()); + return Convert.convert(UserDTO.class,vUser); + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/UserDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/UserDTO.java new file mode 100644 index 00000000..390cd8b1 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/UserDTO.java @@ -0,0 +1,84 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; + +@Data +public class UserDTO { + + private Long id; + + /** + * 用户名称 + */ + private String userName; + + /** + * 邮箱地址 + */ + private String email; + + /** + * 手机号码 + */ + private String phone; + + /** + * 头像 + */ + private String avatar; + + /** + * 状态，1-启用，2：禁用 + */ + private Integer state; + + /** + * 用户工号，登录号 + */ + private String userCode; + + /** + * 默认语言 + */ + private String languageCode; + + /** + * 用户类型，员工或者供应商 + */ + private String userType; + + /** + * 部门id + */ + private Long deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 职位id + */ + private Long positionId; + + /** + * 职位名称 + */ + private String positionName; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 供应商类别 + */ + private Long typeId; + + /** + * 供应商类别名称 + */ + private String typeName; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/VUser.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/VUser.java new file mode 100644 index 00000000..4f343647 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/VUser.java @@ -0,0 +1,90 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@TableName("v_user") +@Accessors(chain = true) +public class VUser implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private String userName; + + private String password; + + private String email; + + private String phone; + + private String avatar; + + private Short state; + + private String createBy; + + private LocalDateTime createTime; + + private String updateBy; + + private LocalDateTime updateTime; + + private Integer source; + + private String sourceId; + + private String userCode; + + private String remark; + + private Boolean mustResetPwd; + + private String languageCode; + + private Long adId; + + private Boolean enableMustResetPwd; + + private Long deptId; + + private String deptName; + + private Long positionId; + + private String positionName; + + private String supplierCode; + + private String supplierName; + + private String abbreviation; + + private String abbreviation1; + + private String abbreviation2; + + private Long typeId; + + private String typeName; + + private String userType; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/VUserMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/VUserMapper.java new file mode 100644 index 00000000..3888f68f --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/VUserMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.VUser; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface VUserMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IVUserService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IVUserService.java new file mode 100644 index 00000000..44019e21 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IVUserService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.repository.entity.VUser; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IVUserService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java index 3399bdb9..c65f19bb 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java @@ -79,6 +79,7 @@ public class UserServiceImpl extends ServiceImpl implements IU public void delete(Long id) { User user = getById(id); VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在"); + removeById(id); auditLogService.addDelete(User.class, user, UserUtil.getUserName()); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/VUserServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/VUserServiceImpl.java new file mode 100644 index 00000000..0abadcea --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/VUserServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.repository.entity.VUser; +import com.nflg.wms.repository.mapper.VUserMapper; +import com.nflg.wms.repository.service.IVUserService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class VUserServiceImpl extends ServiceImpl implements IVUserService { + +} diff --git a/nflg-wms-repository/src/main/resources/mapper/VUserMapper.xml b/nflg-wms-repository/src/main/resources/mapper/VUserMapper.xml new file mode 100644 index 00000000..5817016f --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/VUserMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java index 970849e6..51d3fbd5 100644 --- a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java +++ b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { ) .strategyConfig(builder -> { builder - .addInclude("v_user_supplier") //只生成指定表 + .addInclude("v_user") //只生成指定表 .entityBuilder().idType(IdType.ASSIGN_ID) .enableLombok() .enableChainModel()