From 015b0fa0ffb2841bb4147a557d9fea1d1f6669c0 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 8 Dec 2025 10:20:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E8=87=AA=E5=BB=BA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/wms/domain/SysUser.java | 108 ++++++++++++++++++ .../dromara/wms/domain/WmsBaseProduct.java | 5 + .../wms/domain/vo/WmsBaseProductVo.java | 3 +- .../org/dromara/wms/mapper/SysUserMapper.java | 7 ++ .../impl/WmsBaseProductServiceImpl.java | 14 ++- 5 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/SysUser.java create mode 100644 ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/SysUserMapper.java diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/SysUser.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/SysUser.java new file mode 100644 index 00000000..77cd697e --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/SysUser.java @@ -0,0 +1,108 @@ +package org.dromara.wms.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.tenant.core.TenantEntity; + +import java.util.Date; + +/** + * 用户对象 sys_user + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("sys_user") +public class SysUser extends TenantEntity { + + /** + * 用户ID + */ + @TableId(value = "user_id") + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户类型（sys_user系统用户） + */ + private String userType; + + /** + * 用户邮箱 + */ + private String email; + + /** + * 手机号码 + */ + private String phonenumber; + + /** + * 用户性别 + */ + private String sex; + + /** + * 用户头像 + */ + private Long avatar; + + /** + * 密码 + */ + @TableField( + insertStrategy = FieldStrategy.NOT_EMPTY, + updateStrategy = FieldStrategy.NOT_EMPTY, + whereStrategy = FieldStrategy.NOT_EMPTY + ) + private String password; + + /** + * 帐号状态（0正常 1停用） + */ + private String status; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + /** + * 最后登录IP + */ + private String loginIp; + + /** + * 最后登录时间 + */ + private Date loginDate; + + /** + * 备注 + */ + private String remark; + + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java index 4802cb8f..e3bba157 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java @@ -77,5 +77,10 @@ public class WmsBaseProduct extends TenantEntity { */ private String unitName; + @TableField(exist = false) + private String createByName; + @TableField(exist = false) + private String updateByName; + } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java index 3ed2d24d..a3e512d5 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java @@ -124,5 +124,6 @@ public class WmsBaseProductVo implements Serializable { * 计量单位名称 */ private String unitName; - + private String createByName; + private String updateByName; } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/SysUserMapper.java new file mode 100644 index 00000000..f5996771 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/SysUserMapper.java @@ -0,0 +1,7 @@ +package org.dromara.wms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.dromara.wms.domain.SysUser; + +public interface SysUserMapper extends BaseMapper { +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java index 6ff9d9b5..15b0ae6e 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java @@ -8,7 +8,9 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.BaseUnitInfo; +import org.dromara.wms.domain.SysUser; import org.dromara.wms.domain.WmsBaseProduct; import org.dromara.wms.domain.bo.WmsBaseProductBo; import org.dromara.wms.domain.vo.WmsBaseProductVo; @@ -76,7 +78,14 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { .eq(StringUtils.isNotBlank(bo.getProductCode()), WmsBaseProduct::getProductCode, bo.getProductCode()) .like(StringUtils.isNotBlank(bo.getProductName()), WmsBaseProduct::getProductName, bo.getProductName()) .like(StringUtils.isNotBlank(bo.getExternalBrand()), WmsBaseProduct::getExternalBrand, bo.getExternalBrand()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag()); + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag()) + .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getCreateBy) + .selectAs(SysUser::getNickName, WmsBaseProduct::getCreateByName) + .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getUpdateBy) + .selectAs(SysUser::getNickName, WmsBaseProduct::getUpdateByName) + ; + + } /** @@ -88,6 +97,8 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { @Override public Boolean insertByBo(WmsBaseProductBo bo) { WmsBaseProduct add = MapstructUtils.convert(bo, WmsBaseProduct.class); + + // add.setCreateByName(LoginHelper.getUsername()); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setProductId(add.getProductId()); @@ -104,6 +115,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { @Override public Boolean updateByBo(WmsBaseProductBo bo) { WmsBaseProduct update = MapstructUtils.convert(bo, WmsBaseProduct.class); + // update.setUpdateByName(LoginHelper.getUsername()); return baseMapper.updateById(update) > 0; }