fix 常用人员

ruoyi-admin/src/main/resources/application.yml

@@ -130,6 +130,7 @@ tenant:
     - sys_oss_config
     - sys_user_tenant
     - update_app
+    - frequently_visitor_manage
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/visitor/FrequentlyVisitorManageController.java

@@ -0,0 +1,105 @@
+package org.dromara.controller.visitor;
+
+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.visitor.bo.FrequentlyVisitorManageBo;
+import org.dromara.domain.visitor.vo.FrequentlyVisitorManageVo;
+import org.dromara.service.IFrequentlyVisitorManageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * 常用访客管理
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wuYe/frequentlyVisitorManage")
+public class FrequentlyVisitorManageController extends BaseController {
+
+    private final IFrequentlyVisitorManageService frequentlyVisitorManageService;
+
+    /**
+     * 查询常用访客管理列表
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:list")
+    @GetMapping("/list")
+    public TableDataInfo<FrequentlyVisitorManageVo> list(FrequentlyVisitorManageBo bo, PageQuery pageQuery) {
+        return frequentlyVisitorManageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出常用访客管理列表
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:export")
+    @Log(title = "常用访客管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FrequentlyVisitorManageBo bo, HttpServletResponse response) {
+        List<FrequentlyVisitorManageVo> list = frequentlyVisitorManageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "常用访客管理", FrequentlyVisitorManageVo.class, response);
+    }
+
+    /**
+     * 获取常用访客管理详细信息
+     *
+     * @param frequentlyVisitorManageId 主键
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:query")
+    @GetMapping("/{frequentlyVisitorManageId}")
+    public R<FrequentlyVisitorManageVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long frequentlyVisitorManageId) {
+        return R.ok(frequentlyVisitorManageService.queryById(frequentlyVisitorManageId));
+    }
+
+    /**
+     * 新增常用访客管理
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:add")
+    @Log(title = "常用访客管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FrequentlyVisitorManageBo bo) {
+        return toAjax(frequentlyVisitorManageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改常用访客管理
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:edit")
+    @Log(title = "常用访客管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FrequentlyVisitorManageBo bo) {
+        return toAjax(frequentlyVisitorManageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除常用访客管理
+     *
+     * @param frequentlyVisitorManageIds 主键串
+     */
+    @SaCheckPermission("wuYe:frequentlyVisitorManage:remove")
+    @Log(title = "常用访客管理", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{frequentlyVisitorManageIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] frequentlyVisitorManageIds) {
+        return toAjax(frequentlyVisitorManageService.deleteWithValidByIds(List.of(frequentlyVisitorManageIds), true));
+    }
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/FrequentlyVisitorManage.java

@@ -0,0 +1,86 @@
+package org.dromara.domain.visitor;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 常用访客管理对象 frequently_visitor_manage
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("frequently_visitor_manage")
+public class FrequentlyVisitorManage extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 常用访客主键
+     */
+    @TableId(value = "frequently_visitor_manage_id")
+    private Long frequentlyVisitorManageId;
+
+    /**
+     * 房屋id
+     */
+    private Long houseId;
+
+    /**
+     * 关联sys_user表中user_id
+     */
+    private Long userId;
+
+    /**
+     * 详细门牌号
+     */
+    private String houseAddress;
+
+    /**
+     * 访客姓名
+     */
+    private String name;
+
+    /**
+     * 来访人数
+     */
+    private String num;
+
+    /**
+     * 来访事由
+     */
+    private String reason;
+
+    /**
+     * 手机号码
+     */
+    private String mobileNumber;
+
+    /**
+     * 是否驾车 N:否 Y:是
+     */
+    private String isCar;
+
+    /**
+     * 车牌号码
+     */
+    private String plateNumber;
+
+    /**
+     * 人脸信息
+     */
+    private String photo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/bo/FrequentlyVisitorManageBo.java

@@ -0,0 +1,89 @@
+package org.dromara.domain.visitor.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.domain.visitor.FrequentlyVisitorManage;
+
+/**
+ * 常用访客管理业务对象 frequently_visitor_manage
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FrequentlyVisitorManage.class, reverseConvertGenerate = false)
+public class FrequentlyVisitorManageBo extends BaseEntity {
+
+    /**
+     * 常用访客主键
+     */
+    @NotNull(message = "常用访客主键不能为空", groups = { EditGroup.class })
+    private Long frequentlyVisitorManageId;
+
+    /**
+     * 房屋id
+     */
+    @NotNull(message = "房屋id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long houseId;
+
+    /**
+     * 关联sys_user表中user_id
+     */
+    private Long userId;
+
+    /**
+     * 详细门牌号
+     */
+    @NotBlank(message = "详细门牌号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String houseAddress;
+
+    /**
+     * 访客姓名
+     */
+    private String name;
+
+    /**
+     * 来访人数
+     */
+    private String num;
+
+    /**
+     * 来访事由
+     */
+    private String reason;
+
+    /**
+     * 手机号码
+     */
+    @NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mobileNumber;
+
+    /**
+     * 是否驾车 N:否 Y:是
+     */
+    private String isCar;
+
+    /**
+     * 车牌号码
+     */
+    private String plateNumber;
+
+    /**
+     * 人脸信息
+     */
+    private String photo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/vo/FrequentlyVisitorManageVo.java

@@ -0,0 +1,102 @@
+package org.dromara.domain.visitor.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.visitor.FrequentlyVisitorManage;
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+
+/**
+ * 常用访客管理视图对象 frequently_visitor_manage
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FrequentlyVisitorManage.class)
+public class FrequentlyVisitorManageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 常用访客主键
+     */
+    @ExcelProperty(value = "常用访客主键")
+    private Long frequentlyVisitorManageId;
+
+    /**
+     * 房屋id
+     */
+    @ExcelProperty(value = "房屋id")
+    private Long houseId;
+
+    /**
+     * 关联sys_user表中user_id
+     */
+    @ExcelProperty(value = "关联sys_user表中user_id")
+    private Long userId;
+
+    /**
+     * 详细门牌号
+     */
+    @ExcelProperty(value = "详细门牌号")
+    private String houseAddress;
+
+    /**
+     * 访客姓名
+     */
+    @ExcelProperty(value = "访客姓名")
+    private String name;
+
+    /**
+     * 来访人数
+     */
+    @ExcelProperty(value = "来访人数")
+    private String num;
+
+    /**
+     * 来访事由
+     */
+    @ExcelProperty(value = "来访事由")
+    private String reason;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String mobileNumber;
+
+    /**
+     * 是否驾车 N:否 Y:是
+     */
+    @ExcelProperty(value = "是否驾车 N:否 Y:是")
+    private String isCar;
+
+    /**
+     * 车牌号码
+     */
+    @ExcelProperty(value = "车牌号码")
+    private String plateNumber;
+
+    /**
+     * 人脸信息
+     */
+    @ExcelProperty(value = "人脸信息")
+    private String photo;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,16 @@
+package org.dromara.mapper;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.domain.visitor.FrequentlyVisitorManage;
+import org.dromara.domain.visitor.vo.FrequentlyVisitorManageVo;
+
+/**
+ * 常用访客管理Mapper接口
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+public interface FrequentlyVisitorManageMapper extends BaseMapperPlus<FrequentlyVisitorManage, FrequentlyVisitorManageVo> {
+
+}

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

@@ -0,0 +1,68 @@
+package org.dromara.service;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.domain.visitor.bo.FrequentlyVisitorManageBo;
+import org.dromara.domain.visitor.vo.FrequentlyVisitorManageVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 常用访客管理Service接口
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+public interface IFrequentlyVisitorManageService {
+
+    /**
+     * 查询常用访客管理
+     *
+     * @param frequentlyVisitorManageId 主键
+     * @return 常用访客管理
+     */
+    FrequentlyVisitorManageVo queryById(Long frequentlyVisitorManageId);
+
+    /**
+     * 分页查询常用访客管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 常用访客管理分页列表
+     */
+    TableDataInfo<FrequentlyVisitorManageVo> queryPageList(FrequentlyVisitorManageBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的常用访客管理列表
+     *
+     * @param bo 查询条件
+     * @return 常用访客管理列表
+     */
+    List<FrequentlyVisitorManageVo> queryList(FrequentlyVisitorManageBo bo);
+
+    /**
+     * 新增常用访客管理
+     *
+     * @param bo 常用访客管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(FrequentlyVisitorManageBo bo);
+
+    /**
+     * 修改常用访客管理
+     *
+     * @param bo 常用访客管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(FrequentlyVisitorManageBo bo);
+
+    /**
+     * 校验并批量删除常用访客管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,140 @@
+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.common.satoken.utils.LoginHelper;
+import org.dromara.domain.visitor.FrequentlyVisitorManage;
+import org.dromara.domain.visitor.bo.FrequentlyVisitorManageBo;
+import org.dromara.domain.visitor.vo.FrequentlyVisitorManageVo;
+import org.dromara.mapper.FrequentlyVisitorManageMapper;
+import org.dromara.service.IFrequentlyVisitorManageService;
+import org.springframework.stereotype.Service;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 常用访客管理Service业务层处理
+ *
+ * @author boman
+ * @date 2025-04-24
+ */
+@RequiredArgsConstructor
+@Service
+public class FrequentlyVisitorManageServiceImpl implements IFrequentlyVisitorManageService {
+
+    private final FrequentlyVisitorManageMapper baseMapper;
+
+    /**
+     * 查询常用访客管理
+     *
+     * @param frequentlyVisitorManageId 主键
+     * @return 常用访客管理
+     */
+    @Override
+    public FrequentlyVisitorManageVo queryById(Long frequentlyVisitorManageId){
+        return baseMapper.selectVoById(frequentlyVisitorManageId);
+    }
+
+    /**
+     * 分页查询常用访客管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 常用访客管理分页列表
+     */
+    @Override
+    public TableDataInfo<FrequentlyVisitorManageVo> queryPageList(FrequentlyVisitorManageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<FrequentlyVisitorManage> lqw = buildQueryWrapper(bo);
+        Page<FrequentlyVisitorManageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的常用访客管理列表
+     *
+     * @param bo 查询条件
+     * @return 常用访客管理列表
+     */
+    @Override
+    public List<FrequentlyVisitorManageVo> queryList(FrequentlyVisitorManageBo bo) {
+        LambdaQueryWrapper<FrequentlyVisitorManage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<FrequentlyVisitorManage> buildQueryWrapper(FrequentlyVisitorManageBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<FrequentlyVisitorManage> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(FrequentlyVisitorManage::getFrequentlyVisitorManageId);
+        lqw.eq(bo.getHouseId() != null, FrequentlyVisitorManage::getHouseId, bo.getHouseId());
+        lqw.eq(bo.getUserId() != null, FrequentlyVisitorManage::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), FrequentlyVisitorManage::getHouseAddress, bo.getHouseAddress());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), FrequentlyVisitorManage::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getNum()), FrequentlyVisitorManage::getNum, bo.getNum());
+        lqw.eq(StringUtils.isNotBlank(bo.getReason()), FrequentlyVisitorManage::getReason, bo.getReason());
+        lqw.eq(StringUtils.isNotBlank(bo.getMobileNumber()), FrequentlyVisitorManage::getMobileNumber, bo.getMobileNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsCar()), FrequentlyVisitorManage::getIsCar, bo.getIsCar());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), FrequentlyVisitorManage::getPlateNumber, bo.getPlateNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhoto()), FrequentlyVisitorManage::getPhoto, bo.getPhoto());
+        return lqw;
+    }
+
+    /**
+     * 新增常用访客管理
+     *
+     * @param bo 常用访客管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(FrequentlyVisitorManageBo bo) {
+        FrequentlyVisitorManage add = MapstructUtils.convert(bo, FrequentlyVisitorManage.class);
+        validEntityBeforeSave(add);
+        add.setUserId(LoginHelper.getUserId());
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setFrequentlyVisitorManageId(add.getFrequentlyVisitorManageId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改常用访客管理
+     *
+     * @param bo 常用访客管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(FrequentlyVisitorManageBo bo) {
+        FrequentlyVisitorManage update = MapstructUtils.convert(bo, FrequentlyVisitorManage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(FrequentlyVisitorManage 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-wuye/src/main/resources/mapper/wuYe/FrequentlyVisitorManageMapper.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.FrequentlyVisitorManageMapper">
+
+</mapper>