fix 居住人员认证

ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -190,8 +190,8 @@ public class SysLoginService {
         //查询用户的员工信息和居住人员信息
         StaffManageVo staffManage = staffManageService.getInfoByUserId(userId);
         loginUser.setStaffManage(BeanUtil.toBean(staffManage, StaffManageDTO.class));
-        ResidentInfoVo infoByUserId = residentInfoService.getInfoByUserId(userId);
-        loginUser.setResidentInfo(BeanUtil.toBean(infoByUserId, ResidentInfoDTO.class));
+        List<ResidentInfoVo> infoByUserId = residentInfoService.getInfoByUserId(userId);
+        loginUser.setResidentInfoDTOList(BeanUtil.copyToList(infoByUserId, ResidentInfoDTO.class));
         return loginUser;
     }
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -71,10 +71,9 @@ public class SysRegisterService {
         sysUser.setPassword(BCrypt.hashpw(password));
         sysUser.setUserType(userType);
         sysUser.setPhonenumber(username);
-        boolean exist = TenantHelper.dynamic(tenantId, () -> {
-            return userMapper.exists(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUserName, sysUser.getUserName()));
-        });
+        boolean exist =  TenantHelper.ignore(() -> {
+            return  userMapper.exists(new LambdaQueryWrapper<SysUser>()
+            .eq(SysUser::getPhonenumber, sysUser.getUserName()));});
         if (exist) {
             throw new UserException("user.register.save.error", username);
         }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java

@@ -145,7 +145,7 @@ public class LoginUser implements Serializable {
     /**
      * 居住人员信息
      */
-    private ResidentInfoDTO residentInfo;
+    private List<ResidentInfoDTO> residentInfoDTOList;
 
     /**
      * 获取登录id

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/houseInfo/HouseInfoRedidentController.java

@@ -0,0 +1,106 @@
+package org.dromara.controller.houseInfo;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+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.domain.houseInfo.bo.HouseInfoRedidentBo;
+import org.dromara.domain.houseInfo.vo.HouseInfoRedidentVo;
+import org.dromara.service.IHouseInfoRedidentService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wuYe/infoRedident")
+public class HouseInfoRedidentController extends BaseController {
+
+    private final IHouseInfoRedidentService houseInfoRedidentService;
+
+    /**
+     * 查询房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     */
+    @SaCheckPermission("wuYe:infoRedident:list")
+    @GetMapping("/list")
+    public TableDataInfo<HouseInfoRedidentVo> list(HouseInfoRedidentBo bo, PageQuery pageQuery) {
+        return houseInfoRedidentService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     */
+    @SaCheckPermission("wuYe:infoRedident:export")
+    @Log(title = "房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HouseInfoRedidentBo bo, HttpServletResponse response) {
+        List<HouseInfoRedidentVo> list = houseInfoRedidentService.queryList(bo);
+        ExcelUtil.exportExcel(list, "房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）", HouseInfoRedidentVo.class, response);
+    }
+
+    /**
+     * 获取房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）详细信息
+     *
+     * @param houseId 主键
+     */
+    @SaCheckPermission("wuYe:infoRedident:query")
+    @GetMapping("/{houseId}")
+    public R<HouseInfoRedidentVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long houseId) {
+        return R.ok(houseInfoRedidentService.queryById(houseId));
+    }
+
+    /**
+     * 新增房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     */
+    @SaCheckPermission("wuYe:infoRedident:add")
+    @Log(title = "房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody HouseInfoRedidentBo bo) {
+        return toAjax(houseInfoRedidentService.insertByBo(bo));
+    }
+
+    /**
+     * 修改房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     */
+    @SaCheckPermission("wuYe:infoRedident:edit")
+    @Log(title = "房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody HouseInfoRedidentBo bo) {
+        return toAjax(houseInfoRedidentService.updateByBo(bo));
+    }
+
+    /**
+     * 删除房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param houseIds 主键串
+     */
+    @SaCheckPermission("wuYe:infoRedident:remove")
+    @Log(title = "房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{houseIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] houseIds) {
+        return toAjax(houseInfoRedidentService.deleteWithValidByIds(List.of(houseIds), true));
+    }
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/residentInfo/ResidentInfoController.java

@@ -125,7 +125,7 @@ public class ResidentInfoController extends BaseController {
     /**
      * 修改居住人员信息，存储居住人员的详细信息
      */
-    @SaCheckPermission("wuYe:residentInfo:edit")
+    //@SaCheckPermission("wuYe:residentInfo:edit")
     @Log(title = "居住人员信息，存储居住人员的详细信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/HouseInfo.java

@@ -113,6 +113,9 @@ public class HouseInfo extends TenantEntity {
      * 备注
      */
     private String remark;
-
+    /**
+     * 房本照片
+     */
+    private String houseImage;
 
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/HouseInfoRedident.java

@@ -0,0 +1,121 @@
+package org.dromara.domain.houseInfo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）对象 house_info_redident
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("house_info_redident")
+public class HouseInfoRedident extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房屋信息主键，唯一标识每条房屋信息
+     */
+    @TableId(value = "house_id")
+    private Long houseId;
+
+    /**
+     * 权利人姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房屋坐落位置
+     */
+    private String location;
+
+    /**
+     * 权利类型，如所有权、使用权等
+     */
+    private String rightType;
+
+    /**
+     * 房屋面积，单位为平方米
+     */
+    private Long area;
+
+    /**
+     * 房屋相关的字第号
+     */
+    private String documentNumber;
+
+    /**
+     * 不动产单元号，唯一标识不动产单元
+     */
+    private String propertyUnitNumber;
+
+    /**
+     * 房屋的共有情况，如共有比例等
+     */
+    private String coOwnership;
+
+    /**
+     * 房屋用途，如住宅、商业等
+     */
+    private String usageType;
+
+    /**
+     * 房屋使用期限
+     */
+    private String usagePeriod;
+
+    /**
+     * 房屋登记日期
+     */
+    private Date registrationDate;
+
+    /**
+     * 共有人姓名，多个共有人可以用逗号分隔
+     */
+    private String coOwner;
+
+    /**
+     * 房屋的详细门牌号
+     */
+    private String detailedAddress;
+
+    /**
+     * 是否有车位，Y表示有，N表示无
+     */
+    private String hasParkingSpace;
+
+    /**
+     * 车位编号
+     */
+    private String parkingNumber;
+
+    /**
+     * 房屋所在小区名称
+     */
+    private String communityName;
+
+    /**
+     * 房屋状态：1-自住，2-空闲，3-待售空闲，4-出租
+     */
+    private Long houseStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 房本照片
+     */
+    private String houseImage;
+
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/bo/HouseInfoBo.java

@@ -117,5 +117,8 @@ public class HouseInfoBo extends BaseEntity {
      */
     private String remark;
 
-
+    /**
+     * 房本照片
+     */
+    private String houseImage;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/bo/HouseInfoRedidentBo.java

@@ -0,0 +1,120 @@
+package org.dromara.domain.houseInfo.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.domain.houseInfo.HouseInfoRedident;
+
+import java.util.Date;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）业务对象 house_info_redident
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = HouseInfoRedident.class, reverseConvertGenerate = false)
+public class HouseInfoRedidentBo extends BaseEntity {
+
+    /**
+     * 房屋信息主键，唯一标识每条房屋信息
+     */
+    @NotNull(message = "房屋信息主键，唯一标识每条房屋信息不能为空", groups = { EditGroup.class })
+    private Long houseId;
+
+    /**
+     * 权利人姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房屋坐落位置
+     */
+    private String location;
+
+    /**
+     * 权利类型，如所有权、使用权等
+     */
+    private String rightType;
+
+    /**
+     * 房屋面积，单位为平方米
+     */
+    private Long area;
+
+    /**
+     * 房屋相关的字第号
+     */
+    private String documentNumber;
+
+    /**
+     * 不动产单元号，唯一标识不动产单元
+     */
+    private String propertyUnitNumber;
+
+    /**
+     * 房屋的共有情况，如共有比例等
+     */
+    private String coOwnership;
+
+    /**
+     * 房屋用途，如住宅、商业等
+     */
+    private String usageType;
+
+    /**
+     * 房屋使用期限
+     */
+    private String usagePeriod;
+
+    /**
+     * 房屋登记日期
+     */
+    private Date registrationDate;
+
+    /**
+     * 共有人姓名，多个共有人可以用逗号分隔
+     */
+    private String coOwner;
+
+    /**
+     * 房屋的详细门牌号
+     */
+    private String detailedAddress;
+
+    /**
+     * 是否有车位，Y表示有，N表示无
+     */
+    private String hasParkingSpace;
+
+    /**
+     * 车位编号
+     */
+    private String parkingNumber;
+
+    /**
+     * 房屋所在小区名称
+     */
+    private String communityName;
+
+    /**
+     * 房屋状态：1-自住，2-空闲，3-待售空闲，4-出租
+     */
+    private Long houseStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 房本照片
+     */
+    private String houseImage;
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/vo/HouseInfoRedidentVo.java

@@ -0,0 +1,141 @@
+package org.dromara.domain.houseInfo.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.domain.houseInfo.HouseInfoRedident;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）视图对象 house_info_redident
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = HouseInfoRedident.class)
+public class HouseInfoRedidentVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房屋信息主键，唯一标识每条房屋信息
+     */
+    @ExcelProperty(value = "房屋信息主键，唯一标识每条房屋信息")
+    private Long houseId;
+
+    /**
+     * 权利人姓名
+     */
+    @ExcelProperty(value = "权利人姓名")
+    private String ownerName;
+
+    /**
+     * 房屋坐落位置
+     */
+    @ExcelProperty(value = "房屋坐落位置")
+    private String location;
+
+    /**
+     * 权利类型，如所有权、使用权等
+     */
+    @ExcelProperty(value = "权利类型，如所有权、使用权等")
+    private String rightType;
+
+    /**
+     * 房屋面积，单位为平方米
+     */
+    @ExcelProperty(value = "房屋面积，单位为平方米")
+    private Long area;
+
+    /**
+     * 房屋相关的字第号
+     */
+    @ExcelProperty(value = "房屋相关的字第号")
+    private String documentNumber;
+
+    /**
+     * 不动产单元号，唯一标识不动产单元
+     */
+    @ExcelProperty(value = "不动产单元号，唯一标识不动产单元")
+    private String propertyUnitNumber;
+
+    /**
+     * 房屋的共有情况，如共有比例等
+     */
+    @ExcelProperty(value = "房屋的共有情况，如共有比例等")
+    private String coOwnership;
+
+    /**
+     * 房屋用途，如住宅、商业等
+     */
+    @ExcelProperty(value = "房屋用途，如住宅、商业等")
+    private String usageType;
+
+    /**
+     * 房屋使用期限
+     */
+    @ExcelProperty(value = "房屋使用期限")
+    private String usagePeriod;
+
+    /**
+     * 房屋登记日期
+     */
+    @ExcelProperty(value = "房屋登记日期")
+    private Date registrationDate;
+
+    /**
+     * 共有人姓名，多个共有人可以用逗号分隔
+     */
+    @ExcelProperty(value = "共有人姓名，多个共有人可以用逗号分隔")
+    private String coOwner;
+
+    /**
+     * 房屋的详细门牌号
+     */
+    @ExcelProperty(value = "房屋的详细门牌号")
+    private String detailedAddress;
+
+    /**
+     * 是否有车位，Y表示有，N表示无
+     */
+    @ExcelProperty(value = "是否有车位，Y表示有，N表示无")
+    private String hasParkingSpace;
+
+    /**
+     * 车位编号
+     */
+    @ExcelProperty(value = "车位编号")
+    private String parkingNumber;
+
+    /**
+     * 房屋所在小区名称
+     */
+    @ExcelProperty(value = "房屋所在小区名称")
+    private String communityName;
+
+    /**
+     * 房屋状态：1-自住，2-空闲，3-待售空闲，4-出租
+     */
+    @ExcelProperty(value = "房屋状态：1-自住，2-空闲，3-待售空闲，4-出租")
+    private Long houseStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 房本照片
+     */
+    private String houseImage;
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/vo/HouseInfoVo.java

@@ -134,5 +134,8 @@ public class HouseInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 房本照片
+     */
+    private String houseImage;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/residentInfo/bo/ResidentInfoBo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.domain.houseInfo.HouseInfo;
+import org.dromara.domain.houseInfo.HouseInfoRedident;
 import org.dromara.domain.residentInfo.ResidentInfo;
 
 import java.util.List;
@@ -148,7 +148,7 @@ public class ResidentInfoBo extends BaseEntity {
     private Boolean isFilter;
 
     /**
-     * 用户房屋信息
+     * 用户房屋信息用户自己提交的
      */
-    private List<HouseInfo> houseInfoList;
+    private List<HouseInfoRedident> houseInfoRedidentList;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/residentInfo/vo/ResidentInfoVo.java

@@ -4,11 +4,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.domain.houseInfo.HouseInfoRedident;
 import org.dromara.domain.residentInfo.ResidentInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
-
+import java.util.List;
 
 
 /**
@@ -165,4 +166,9 @@ public class ResidentInfoVo implements Serializable {
      * 审核状态 1:未审核 2：审核通过 3：审核未通过
      */
     private String examine;
+
+    /**
+     * 用户房屋信息
+     */
+    private List<HouseInfoRedident> houseInfoRedidentList;
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/mapper/HouseInfoRedidentMapper.java

@@ -0,0 +1,16 @@
+package org.dromara.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.domain.houseInfo.HouseInfoRedident;
+import org.dromara.domain.houseInfo.vo.HouseInfoRedidentVo;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）Mapper接口
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+public interface HouseInfoRedidentMapper extends BaseMapperPlus<HouseInfoRedident, HouseInfoRedidentVo> {
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/mapper/ResidentInfoMapper.java

@@ -5,6 +5,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.domain.residentInfo.ResidentInfo;
 import org.dromara.domain.residentInfo.vo.ResidentInfoVo;
 
+import java.util.List;
+
 /**
  * 居住人员信息，存储居住人员的详细信息Mapper接口
  *
@@ -14,6 +16,6 @@ import org.dromara.domain.residentInfo.vo.ResidentInfoVo;
 public interface ResidentInfoMapper extends BaseMapperPlus<ResidentInfo, ResidentInfoVo> {
 
     @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
-    ResidentInfoVo getInfoByUserId(Long userId);
+    List<ResidentInfoVo> getInfoByUserId(Long userId);
 
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IHouseInfoRedidentService.java

@@ -0,0 +1,69 @@
+package org.dromara.service;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.domain.houseInfo.bo.HouseInfoRedidentBo;
+import org.dromara.domain.houseInfo.vo.HouseInfoRedidentVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）Service接口
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+public interface IHouseInfoRedidentService {
+
+    /**
+     * 查询房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param houseId 主键
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     */
+    HouseInfoRedidentVo queryById(Long houseId);
+
+    /**
+     * 分页查询房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）分页列表
+     */
+    TableDataInfo<HouseInfoRedidentVo> queryPageList(HouseInfoRedidentBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     *
+     * @param bo 查询条件
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     */
+    List<HouseInfoRedidentVo> queryList(HouseInfoRedidentBo bo);
+
+    /**
+     * 新增房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param bo 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(HouseInfoRedidentBo bo);
+
+    /**
+     * 修改房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param bo 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(HouseInfoRedidentBo bo);
+
+    /**
+     * 校验并批量删除房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IResidentInfoService.java

@@ -38,7 +38,7 @@ public interface IResidentInfoService {
      * @param userId
      * @return
      */
-    ResidentInfoVo getInfoByUserId(Long userId);
+    List<ResidentInfoVo> getInfoByUserId(Long userId);
 
     /**
      * 分页查询居住人员信息，存储居住人员的详细信息列表

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/HouseInfoRedidentServiceImpl.java

@@ -0,0 +1,145 @@
+package org.dromara.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.domain.houseInfo.HouseInfoRedident;
+import org.dromara.domain.houseInfo.bo.HouseInfoRedidentBo;
+import org.dromara.domain.houseInfo.vo.HouseInfoRedidentVo;
+import org.dromara.mapper.HouseInfoRedidentMapper;
+import org.dromara.service.IHouseInfoRedidentService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）Service业务层处理
+ *
+ * @author boman
+ * @date 2025-04-22
+ */
+@RequiredArgsConstructor
+@Service
+public class HouseInfoRedidentServiceImpl implements IHouseInfoRedidentService {
+
+    private final HouseInfoRedidentMapper baseMapper;
+
+    /**
+     * 查询房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param houseId 主键
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     */
+    @Override
+    public HouseInfoRedidentVo queryById(Long houseId){
+        return baseMapper.selectVoById(houseId);
+    }
+
+    /**
+     * 分页查询房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）分页列表
+     */
+    @Override
+    public TableDataInfo<HouseInfoRedidentVo> queryPageList(HouseInfoRedidentBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HouseInfoRedident> lqw = buildQueryWrapper(bo);
+        Page<HouseInfoRedidentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     *
+     * @param bo 查询条件
+     * @return 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）列表
+     */
+    @Override
+    public List<HouseInfoRedidentVo> queryList(HouseInfoRedidentBo bo) {
+        LambdaQueryWrapper<HouseInfoRedident> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<HouseInfoRedident> buildQueryWrapper(HouseInfoRedidentBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<HouseInfoRedident> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(HouseInfoRedident::getHouseId);
+        lqw.like(StringUtils.isNotBlank(bo.getOwnerName()), HouseInfoRedident::getOwnerName, bo.getOwnerName());
+        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), HouseInfoRedident::getLocation, bo.getLocation());
+        lqw.eq(StringUtils.isNotBlank(bo.getRightType()), HouseInfoRedident::getRightType, bo.getRightType());
+        lqw.eq(bo.getArea() != null, HouseInfoRedident::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocumentNumber()), HouseInfoRedident::getDocumentNumber, bo.getDocumentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getPropertyUnitNumber()), HouseInfoRedident::getPropertyUnitNumber, bo.getPropertyUnitNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoOwnership()), HouseInfoRedident::getCoOwnership, bo.getCoOwnership());
+        lqw.eq(StringUtils.isNotBlank(bo.getUsageType()), HouseInfoRedident::getUsageType, bo.getUsageType());
+        lqw.eq(StringUtils.isNotBlank(bo.getUsagePeriod()), HouseInfoRedident::getUsagePeriod, bo.getUsagePeriod());
+        lqw.eq(bo.getRegistrationDate() != null, HouseInfoRedident::getRegistrationDate, bo.getRegistrationDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoOwner()), HouseInfoRedident::getCoOwner, bo.getCoOwner());
+        lqw.eq(StringUtils.isNotBlank(bo.getDetailedAddress()), HouseInfoRedident::getDetailedAddress, bo.getDetailedAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getHasParkingSpace()), HouseInfoRedident::getHasParkingSpace, bo.getHasParkingSpace());
+        lqw.eq(StringUtils.isNotBlank(bo.getParkingNumber()), HouseInfoRedident::getParkingNumber, bo.getParkingNumber());
+        lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), HouseInfoRedident::getCommunityName, bo.getCommunityName());
+        lqw.eq(bo.getHouseStatus() != null, HouseInfoRedident::getHouseStatus, bo.getHouseStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param bo 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(HouseInfoRedidentBo bo) {
+        HouseInfoRedident add = MapstructUtils.convert(bo, HouseInfoRedident.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setHouseId(add.getHouseId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     *
+     * @param bo 房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(HouseInfoRedidentBo bo) {
+        HouseInfoRedident update = MapstructUtils.convert(bo, HouseInfoRedident.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(HouseInfoRedident entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除房屋信息业主上传（物业审核通过后，同步更新到house_info中数据）信息
+     *
+     * @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-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,10 +18,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.domain.houseInfo.HouseInfo;
+import org.dromara.domain.houseInfo.HouseInfoRedident;
+import org.dromara.domain.houseInfo.vo.HouseInfoRedidentVo;
 import org.dromara.domain.residentInfo.ResidentInfo;
 import org.dromara.domain.residentInfo.bo.ResidentInfoBo;
 import org.dromara.domain.residentInfo.vo.ResidentInfoVo;
 import org.dromara.mapper.HouseInfoMapper;
+import org.dromara.mapper.HouseInfoRedidentMapper;
 import org.dromara.mapper.ResidentInfoMapper;
 import org.dromara.service.IResidentInfoService;
 import org.dromara.system.domain.SysRole;
@@ -38,6 +42,7 @@ import org.dromara.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +66,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
     private final SysRoleMapper sysRoleMapper;
     private final SysUserRoleMapper userRoleMapper;
     private final HouseInfoMapper houseInfoMapper;
+    private final HouseInfoRedidentMapper houseInfoRedidentMapper;
 
 
     /**
@@ -71,7 +77,19 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
      */
     @Override
     public ResidentInfoVo queryById(Long residentId) {
-        return baseMapper.selectVoById(residentId);
+        ResidentInfoVo residentInfoVo = baseMapper.selectVoById(residentId);
+        String residentType = residentInfoVo.getResidentType();
+        if (ONE.equals(residentType)) {
+            Long houseId = residentInfoVo.getHouseId();
+            //去查询房本信息
+            HouseInfoRedidentVo houseInfoRedidentVo = houseInfoRedidentMapper.selectVoById(houseId);
+            //HouseInfo convert = MapstructUtils.convert(houseInfoRedidentVo, HouseInfo.class);
+            HouseInfoRedident convert = BeanUtil.toBean(houseInfoRedidentVo, HouseInfoRedident.class);
+            List<HouseInfoRedident> houseInfoRedidentList = new ArrayList<>();
+            houseInfoRedidentList.add(convert);
+            residentInfoVo.setHouseInfoRedidentList(houseInfoRedidentList);
+        }
+        return residentInfoVo;
     }
 
     /**
@@ -82,8 +100,19 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
     @Override
     public ResidentInfoVo getAuthenticationInfo(Long residentId) {
         return TenantHelper.ignore(() -> {
-            return
-                baseMapper.selectVoById(residentId);
+            ResidentInfoVo residentInfoVo = baseMapper.selectVoById(residentId);
+            String residentType = residentInfoVo.getResidentType();
+            if (ONE.equals(residentType)) {
+                Long houseId = residentInfoVo.getHouseId();
+                //去查询房本信息
+                HouseInfoRedidentVo houseInfoRedidentVo = houseInfoRedidentMapper.selectVoById(houseId);
+                //HouseInfo convert = MapstructUtils.convert(houseInfoRedidentVo, HouseInfo.class);
+                HouseInfoRedident convert = BeanUtil.toBean(houseInfoRedidentVo, HouseInfoRedident.class);
+                List<HouseInfoRedident> houseInfoRedidentList = new ArrayList<>();
+                houseInfoRedidentList.add(convert);
+                residentInfoVo.setHouseInfoRedidentList(houseInfoRedidentList);
+            }
+            return residentInfoVo;
         });
     }
 
@@ -94,7 +123,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
      * @return
      */
     @Override
-    public ResidentInfoVo getInfoByUserId(Long userId) {
+    public List<ResidentInfoVo> getInfoByUserId(Long userId) {
         return baseMapper.getInfoByUserId(userId);
     }
 
@@ -181,24 +210,23 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         add.setUserId(userId);
         String residentType = add.getResidentType();
         String isHouseholder = add.getIsHouseholder();
-        //必须是业主和户主才能去修改房本信息
+        //必须是业主和户主才能去新增房本信息
         if (ONE.equals(residentType) && Y.equals(isHouseholder)) {
-            List<HouseInfo> houseInfoList = bo.getHouseInfoList();
-            if (houseInfoList != null && !houseInfoList.isEmpty()) {
-                //修改房屋信息
-                return TenantHelper.ignore(() -> {
-                    return houseInfoMapper.updateBatchById(houseInfoList);
+            List<HouseInfoRedident> houseInfoRedidentList = bo.getHouseInfoRedidentList();
+            if (houseInfoRedidentList != null && !houseInfoRedidentList.isEmpty()) {
+                //新增房屋信息到房屋用户表中
+                TenantHelper.ignore(() -> {
+                    return houseInfoRedidentMapper.insertBatch(houseInfoRedidentList);
                 });
             }
         }
-        if (THR.equals(residentType)){
+        if (THR.equals(residentType)) {
             SysUserBo user = new SysUserBo();
             user.setUserId(userId);
             user.setTenantId(tenantId);
             user.setResidentType(residentType);
             //默认审核通过
             add.setExamine(TWO);
-            //赋予角色
             //sys_user_tenant表中
             SysUserTenant sysUserTenant = new SysUserTenant();
             sysUserTenant.setUserId(userId);
@@ -217,8 +245,13 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 Long[] longArray = new Long[1];
                 longArray[0] = sysRoleVo.getRoleId();
                 user.setRoleIds(longArray);
+                //判断该用户是否有游客角色
+                SysUserVo sysUserVo = userService.selectUserById(user.getUserId());
+                Long roleId = sysUserVo.getRoleId();
+                if (roleId != null && !roleId.equals(sysRoleVo.getRoleId())) {
+                    userService.insertUserRole(user, false);
+                }
             }
-            userService.insertUserRole(user, false);
 
             if (TenantHelper.isEnable()) {
                 //把租户id更新到sys_user表/sys_user_tenant表中
@@ -290,11 +323,26 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         add.setExamine(TWO);
         add.setUserId(userId);
         boolean flag = baseMapper.insert(add) > 0;
+
+        String residentType = add.getResidentType();
+        String isHouseholder = add.getIsHouseholder();
+        //必须是业主和户主才能去修改房本信息
+        if (ONE.equals(residentType) && Y.equals(isHouseholder)) {
+            List<HouseInfoRedident> houseInfoRedidentList = bo.getHouseInfoRedidentList();
+            if (houseInfoRedidentList != null && !houseInfoRedidentList.isEmpty()) {
+                //更新房屋信息到房屋用户表中
+                TenantHelper.ignore(() -> {
+                    List<HouseInfo> convert = BeanUtil.copyToList(houseInfoRedidentList, HouseInfo.class);
+                    //List<HouseInfo> convert = MapstructUtils.convert(houseInfoRedidentList, HouseInfo.class);
+                    return houseInfoMapper.updateBatchById(convert);
+                });
+            }
+        }
         //sys_user_tenant表中
         SysUserTenant sysUserTenant = new SysUserTenant();
         sysUserTenant.setUserId(userId);
         sysUserTenant.setTenantId(tenantId);
-        sysUserTenantMapper.insert(sysUserTenant);
+        sysUserTenantMapper.insertOrUpdate(sysUserTenant);
         //给该userId赋予角色
         // 新增用户与角色管理
         //根据权限字符去查询角色id
@@ -308,8 +356,14 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             Long[] longArray = new Long[1];
             longArray[0] = sysRoleVo.getRoleId();
             user.setRoleIds(longArray);
+            //判断该用户是否有住户角色
+            SysUserVo sysUserVo = userService.selectUserById(user.getUserId());
+            Long roleId = sysUserVo.getRoleId();
+            if (roleId != null && !roleId.equals(sysRoleVo.getRoleId())) {
+                userService.insertUserRole(user, false);
+            }
         }
-        userService.insertUserRole(user, false);
+
         if (flag) {
             bo.setResidentId(add.getResidentId());
         }
@@ -330,15 +384,16 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         if (checkIdCardUnique(update)) {
             throw new UserException("resident.register.save.error", update.getResidentName());
         }*/
+        update.setExamine(ONE);
         String residentType = update.getResidentType();
         String isHouseholder = update.getIsHouseholder();
         //必须是业主和户主才能去修改房本信息
         if (ONE.equals(residentType) && Y.equals(isHouseholder)) {
-            List<HouseInfo> houseInfoList = bo.getHouseInfoList();
-            if (houseInfoList != null && !houseInfoList.isEmpty()) {
-                //修改房屋信息
-                 TenantHelper.ignore(() -> {
-                    return houseInfoMapper.updateBatchById(houseInfoList);
+            List<HouseInfoRedident> houseInfoRedidentList = bo.getHouseInfoRedidentList();
+            if (houseInfoRedidentList != null && !houseInfoRedidentList.isEmpty()) {
+                //新增房屋信息到房屋用户表中
+                TenantHelper.ignore(() -> {
+                    return houseInfoRedidentMapper.updateBatchById(houseInfoRedidentList);
                 });
             }
         }
@@ -411,6 +466,8 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
     public Boolean examineResident(ResidentInfoBo bo) {
         ResidentInfo residentInfo = MapstructUtils.convert(bo, ResidentInfo.class);
         String tenantId = residentInfo.getTenantId();
+        String residentType = residentInfo.getResidentType();
+        String isHouseholder = residentInfo.getIsHouseholder();
         if (TWO.equals(residentInfo.getExamine())) {
             SysUserBo sysUser = new SysUserBo();
             sysUser.setUserId(bo.getUserId());
@@ -422,7 +479,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(residentInfo.getUserId());
                 sysUserTenant.setTenantId(tenantId);
-                sysUserTenantMapper.insert(sysUserTenant);
+                sysUserTenantMapper.insertOrUpdate(sysUserTenant);
             }
             //给该userId赋予角色
             // 新增用户与角色管理
@@ -437,8 +494,27 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 Long[] longArray = new Long[1];
                 longArray[0] = sysRoleVo.getRoleId();
                 sysUser.setRoleIds(longArray);
+                //判断该用户是否有住户角色
+                SysUserVo sysUserVo = userService.selectUserById(sysUser.getUserId());
+                Long roleId = sysUserVo.getRoleId();
+                if (roleId != null && !roleId.equals(sysRoleVo.getRoleId())) {
+                    userService.insertUserRole(sysUser, false);
+                }
+            }
+
+
+            //认证通过后 把用户提交的房本信息同步到房屋主表
+            if (ONE.equals(residentType) && Y.equals(isHouseholder)) {
+                List<HouseInfoRedident> houseInfoRedidentList = bo.getHouseInfoRedidentList();
+                if (houseInfoRedidentList != null && !houseInfoRedidentList.isEmpty()) {
+                    //新增房屋信息到房屋用户表中
+                    TenantHelper.ignore(() -> {
+                        //List<HouseInfo> convert = MapstructUtils.convert(houseInfoRedidentList, HouseInfo.class);
+                        List<HouseInfo> convert = BeanUtil.copyToList(houseInfoRedidentList, HouseInfo.class);
+                        return houseInfoMapper.updateBatchById(convert);
+                    });
+                }
             }
-            userService.insertUserRole(sysUser, false);
         }
         return baseMapper.updateById(residentInfo) > 0;
     }
@@ -455,6 +531,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         Long userId = bo.getUserId();
         Long residentId = bo.getResidentId();
         String tenantId = bo.getTenantId();
+        Long houseId = bo.getHouseId();
         boolean flag = baseMapper.deleteById(residentId) > 0;
         // userMapper.deleteById(userId);
         if (TenantHelper.isEnable()) {
@@ -471,6 +548,10 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                     sysUserMapper.updateById(sysUser);
                 });
             }
+            //删除用户提交的认证信息，如果有房屋id
+            if (houseId != null) {
+                houseInfoRedidentMapper.deleteById(houseId);
+            }
             // 删除用户与角色关联
             TenantHelper.ignore(() -> {
                 userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId).eq(SysUserRole::getTenantId, tenantId));
@@ -491,9 +572,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                     if (sysUserTenant != null) {
                         sysUser.setTenantId(sysUserTenant.getTenantId());
                     }
-
                 }
-
                 long count = residentInfoList.stream().filter(e -> e.getExamine().equals(TWO)).count();
                 if (count == 0) {
                     sysUser.setTenantId(TENANT_ID);

ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/HouseInfoRedidentMapper.xml

@@ -0,0 +1,7 @@
+<?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.mapper.HouseInfoRedidentMapper">
+
+</mapper>