云上添加用户功能实现

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/BizUserController.java

+package org.dromara.server.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.server.domain.bo.BizUserBo;
+import org.dromara.server.domain.vo.BizUserVo;
+import org.dromara.server.service.IBizUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 云上用户信息
+ * 前端访问路由地址为:/server/user
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/user")
+public class BizUserController extends BaseController {
+
+    private final IBizUserService bizUserService;
+
+    /**
+     * 查询云上用户信息列表
+     */
+    @SaCheckPermission("server:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<BizUserVo> list(BizUserBo bo, PageQuery pageQuery) {
+        return bizUserService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出云上用户信息列表
+     */
+    @SaCheckPermission("server:user:export")
+    @Log(title = "云上用户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(BizUserBo bo, HttpServletResponse response) {
+        List<BizUserVo> list = bizUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "云上用户信息", BizUserVo.class, response);
+    }
+
+    /**
+     * 获取云上用户信息详细信息
+     *
+     * @param userId 主键
+     */
+    @SaCheckPermission("server:user:query")
+    @GetMapping("/{userId}")
+    public R<BizUserVo> getInfo(@NotNull(message = "主键不能为空")
+                                @PathVariable Long userId) {
+        return R.ok(bizUserService.queryById(userId));
+    }
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/BizUser.java

+package org.dromara.server.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 云上用户信息对象 biz_user
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("biz_user")
+public class BizUser extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id")
+    private Long userId;
+
+    /**
+     * 用户编码
+     */
+    private String userNo;
+
+    /**
+     * 系统用户id
+     */
+    private Long systemUserId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/BizUserBo.java

+package org.dromara.server.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.server.domain.BizUser;
+
+/**
+ * 云上用户信息业务对象 biz_user
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BizUser.class, reverseConvertGenerate = false)
+public class BizUserBo extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {EditGroup.class})
+    private Long userId;
+
+    /**
+     * 用户编码
+     */
+    @NotBlank(message = "用户编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String userNo;
+
+    /**
+     * 系统用户id
+     */
+    @NotNull(message = "系统用户id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long systemUserId;
+
+    /**
+     * 用户账号
+     */
+    @NotBlank(message = "用户账号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String userName;
+
+    /**
+     * 身份证
+     */
+    @NotBlank(message = "身份证不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    @NotBlank(message = "手机号码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String phonenumber;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/BizUserVo.java

+package org.dromara.server.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.server.domain.BizUser;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 云上用户信息视图对象 biz_user
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = BizUser.class)
+public class BizUserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 用户编码
+     */
+    @ExcelProperty(value = "用户编码")
+    private String userNo;
+
+    /**
+     * 系统用户id
+     */
+    @ExcelProperty(value = "系统用户id")
+    private Long systemUserId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "用户账号")
+    private String userName;
+
+    /**
+     * 身份证
+     */
+    @ExcelProperty(value = "身份证")
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteServerServiceImpl.java

 package org.dromara.server.dubbo;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.ys.config.Config;
+import org.dromara.common.ys.constant.Status;
+import org.dromara.common.ys.model.req.org.EditEmployeeModel;
+import org.dromara.common.ys.service.IOrgService;
 import org.dromara.server.api.RemoteServerService;
 import org.dromara.server.api.domain.RemoteUser;
+import org.dromara.server.domain.BizUser;
+import org.dromara.server.mapper.BizUserMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * 云上服务
  *
@@ -16,13 +26,42 @@ import org.springframework.stereotype.Service;
 @DubboService
 public class RemoteServerServiceImpl implements RemoteServerService {
 
+    private final BizUserMapper userMapper;
+    private final IOrgService orgService;
+
     @Override
     public boolean saveOrUpdateUser(RemoteUser user) {
+        String userNo = user.getTenantId() + "-" + user.getPhoneNumber();
+        BizUser bz = userMapper.selectOne(new LambdaQueryWrapper<>(BizUser.class).eq(BizUser::getUserNo, userNo));
+        if (Objects.isNull(bz)) {
+            //新增
+            BizUser entity = new BizUser();
+            entity.setUserNo(userNo);
+            entity.setTenantId(user.getTenantId());
+            entity.setSystemUserId(user.getSystemUserId());
+            entity.setUserName(user.getUserName());
+            entity.setIdCard(user.getIdCard());
+            entity.setPhonenumber(user.getPhoneNumber());
+            userMapper.insert(bz);
+            //新增用户
+            orgService.saveOrUpdateEmployee(Config.USE_ID,
+                new EditEmployeeModel()
+                    .setEmpNo(entity.getUserNo())
+                    .setEmpName(entity.getUserName())
+                    .setPhoneNumber(entity.getPhonenumber())
+                    .setLoginVip(Status.TRUE.getCode()));
+        } else {
+            //跟新
+            bz.setUserName(user.getUserName());
+            bz.setIdCard(user.getIdCard());
+            userMapper.updateById(bz);
+        }
         return false;
     }
 
     @Override
     public RemoteUser getUserByPhone(String tenantId, String phone) {
-        return null;
+        String userNo = tenantId + "-" + phone;
+        return BeanUtil.copyProperties(userMapper.selectOne(new LambdaQueryWrapper<>(BizUser.class).eq(BizUser::getUserNo, userNo)), RemoteUser.class);
     }
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/mapper/BizUserMapper.java

+package org.dromara.server.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.server.domain.BizUser;
+import org.dromara.server.domain.vo.BizUserVo;
+
+/**
+ * 云上用户信息Mapper接口
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+public interface BizUserMapper extends BaseMapperPlus<BizUser, BizUserVo> {
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IBizUserService.java

+package org.dromara.server.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.server.domain.bo.BizUserBo;
+import org.dromara.server.domain.vo.BizUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 云上用户信息Service接口
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+public interface IBizUserService {
+
+    /**
+     * 查询云上用户信息
+     *
+     * @param userId 主键
+     * @return 云上用户信息
+     */
+    BizUserVo queryById(Long userId);
+
+    /**
+     * 分页查询云上用户信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 云上用户信息分页列表
+     */
+    TableDataInfo<BizUserVo> queryPageList(BizUserBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的云上用户信息列表
+     *
+     * @param bo 查询条件
+     * @return 云上用户信息列表
+     */
+    List<BizUserVo> queryList(BizUserBo bo);
+
+    /**
+     * 新增云上用户信息
+     *
+     * @param bo 云上用户信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(BizUserBo bo);
+
+    /**
+     * 修改云上用户信息
+     *
+     * @param bo 云上用户信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(BizUserBo bo);
+
+    /**
+     * 校验并批量删除云上用户信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/BizUserServiceImpl.java

+package org.dromara.server.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+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.server.domain.BizUser;
+import org.dromara.server.domain.bo.BizUserBo;
+import org.dromara.server.domain.vo.BizUserVo;
+import org.dromara.server.mapper.BizUserMapper;
+import org.dromara.server.service.IBizUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 云上用户信息Service业务层处理
+ *
+ * @author hzh
+ * @date 2024-11-14
+ */
+@RequiredArgsConstructor
+@Service
+public class BizUserServiceImpl implements IBizUserService {
+
+    private final BizUserMapper baseMapper;
+
+    /**
+     * 查询云上用户信息
+     *
+     * @param userId 主键
+     * @return 云上用户信息
+     */
+    @Override
+    public BizUserVo queryById(Long userId) {
+        return baseMapper.selectVoById(userId);
+    }
+
+    /**
+     * 分页查询云上用户信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 云上用户信息分页列表
+     */
+    @Override
+    public TableDataInfo<BizUserVo> queryPageList(BizUserBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<BizUser> lqw = buildQueryWrapper(bo);
+        Page<BizUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的云上用户信息列表
+     *
+     * @param bo 查询条件
+     * @return 云上用户信息列表
+     */
+    @Override
+    public List<BizUserVo> queryList(BizUserBo bo) {
+        LambdaQueryWrapper<BizUser> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<BizUser> buildQueryWrapper(BizUserBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<BizUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getUserNo()), BizUser::getUserNo, bo.getUserNo());
+        lqw.eq(bo.getSystemUserId() != null, BizUser::getSystemUserId, bo.getSystemUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getUserName()), BizUser::getUserName, bo.getUserName());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), BizUser::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), BizUser::getPhonenumber, bo.getPhonenumber());
+        return lqw;
+    }
+
+    /**
+     * 新增云上用户信息
+     *
+     * @param bo 云上用户信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(BizUserBo bo) {
+        BizUser add = MapstructUtils.convert(bo, BizUser.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setUserId(add.getUserId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改云上用户信息
+     *
+     * @param bo 云上用户信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(BizUserBo bo) {
+        BizUser update = MapstructUtils.convert(bo, BizUser.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(BizUser entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除云上用户信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-server/src/main/resources/mapper/server/BizUserMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.server.mapper.BizUserMapper">
+
+</mapper>