1

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AppFunListController.java

@@ -0,0 +1,107 @@
+package org.dromara.property.controller;
+
+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.property.domain.bo.AppFunListBo;
+import org.dromara.property.domain.vo.AppFunListVo;
+import org.dromara.property.service.IAppFunListService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP功能列表
+ * 前端访问路由地址为:/system/funList
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/funList")
+public class AppFunListController extends BaseController {
+
+    private final IAppFunListService appFunListService;
+
+    /**
+     * 查询APP功能列表列表
+     */
+    @SaCheckPermission("system:funList:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppFunListVo> list(AppFunListBo bo, PageQuery pageQuery) {
+        return appFunListService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出APP功能列表列表
+     */
+    @SaCheckPermission("system:funList:export")
+    @Log(title = "APP功能列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppFunListBo bo, HttpServletResponse response) {
+        List<AppFunListVo> list = appFunListService.queryList(bo);
+        ExcelUtil.exportExcel(list, "APP功能列表", AppFunListVo.class, response);
+    }
+
+    /**
+     * 获取APP功能列表详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:funList:query")
+    @GetMapping("/{id}")
+    public R<AppFunListVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(appFunListService.queryById(id));
+    }
+
+    /**
+     * 新增APP功能列表
+     */
+    @SaCheckPermission("system:funList:add")
+    @Log(title = "APP功能列表", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppFunListBo bo) {
+        return toAjax(appFunListService.insertByBo(bo));
+    }
+
+    /**
+     * 修改APP功能列表
+     */
+    @SaCheckPermission("system:funList:edit")
+    @Log(title = "APP功能列表", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppFunListBo bo) {
+        return toAjax(appFunListService.updateByBo(bo));
+    }
+
+    /**
+     * 删除APP功能列表
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:funList:remove")
+    @Log(title = "APP功能列表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(appFunListService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AppFunList.java

@@ -0,0 +1,67 @@
+package org.dromara.property.domain;
+
+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;
+
+/**
+ * APP功能列表对象 app_fun_list
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_fun_list")
+public class AppFunList extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    private Long roleid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * icon
+     */
+    private String icon;
+
+    /**
+     * url
+     */
+    private String url;
+
+    /**
+     * 创建人id
+     */
+    private Long createById;
+
+    /**
+     * 更新人id
+     */
+    private Long updateById;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AppFunListBo.java

@@ -0,0 +1,49 @@
+package org.dromara.property.domain.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.property.domain.AppFunList;
+
+/**
+ * APP功能列表业务对象 app_fun_list
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppFunList.class, reverseConvertGenerate = false)
+public class AppFunListBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    private Long roleid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * icon
+     */
+    private String icon;
+
+    /**
+     * url
+     */
+    private String url;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java

@@ -58,7 +58,7 @@ public class TbVisitorManagementBo extends BaseEntity {
     /**
      * 拜访事由
      */
-    @NotBlank(message = "拜访事由不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "拜访事由不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitingReason;
 
     //@NotNull(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
@@ -93,7 +93,7 @@ public class TbVisitorManagementBo extends BaseEntity {
     /**
      * 预约车位（0：预约，1：不预约）
      */
-    @NotNull(message = "预约车位（0：预约，1：不预约）不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "预约车位（0：预约，1：不预约）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long bookingParkingSpace;
 
     /**
@@ -104,7 +104,7 @@ public class TbVisitorManagementBo extends BaseEntity {
     /**
      * 人脸图片
      */
-    @NotBlank(message = "人脸图片不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "人脸图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String facePictures;
 
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AppFunListVo.java

@@ -0,0 +1,66 @@
+package org.dromara.property.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.property.domain.AppFunList;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * APP功能列表视图对象 app_fun_list
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppFunList.class)
+public class AppFunListVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @ExcelProperty(value = "角色id")
+    private Long roleid;
+
+    /**
+     * 角色id
+     */
+    @ExcelProperty(value = "角色id")
+    private String roleName;
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * icon
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
+    @ExcelProperty(value = "icon")
+    private String icon;
+
+    /**
+     * url
+     */
+    @ExcelProperty(value = "url")
+    private String url;
+
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java

@@ -137,6 +137,8 @@ public class TbVisitorManagementVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
+    private String url;
+
 
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AppFunListMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.property.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.property.domain.AppFunList;
+import org.dromara.property.domain.vo.AppFunListVo;
+
+/**
+ * APP功能列表Mapper接口
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+public interface AppFunListMapper extends BaseMapperPlus<AppFunList, AppFunListVo> {
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAppFunListService.java

@@ -0,0 +1,68 @@
+package org.dromara.property.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.property.domain.bo.AppFunListBo;
+import org.dromara.property.domain.vo.AppFunListVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * APP功能列表Service接口
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+public interface IAppFunListService {
+
+    /**
+     * 查询APP功能列表
+     *
+     * @param id 主键
+     * @return APP功能列表
+     */
+    AppFunListVo queryById(Long id);
+
+    /**
+     * 分页查询APP功能列表列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return APP功能列表分页列表
+     */
+    TableDataInfo<AppFunListVo> queryPageList(AppFunListBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的APP功能列表列表
+     *
+     * @param bo 查询条件
+     * @return APP功能列表列表
+     */
+    List<AppFunListVo> queryList(AppFunListBo bo);
+
+    /**
+     * 新增APP功能列表
+     *
+     * @param bo APP功能列表
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppFunListBo bo);
+
+    /**
+     * 修改APP功能列表
+     *
+     * @param bo APP功能列表
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppFunListBo bo);
+
+    /**
+     * 校验并批量删除APP功能列表信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java

@@ -0,0 +1,142 @@
+package org.dromara.property.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 lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+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.property.domain.AppFunList;
+import org.dromara.property.domain.bo.AppFunListBo;
+import org.dromara.property.domain.vo.AppFunListVo;
+import org.dromara.property.mapper.AppFunListMapper;
+import org.dromara.property.service.IAppFunListService;
+import org.dromara.system.api.RemoteUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP功能列表Service业务层处理
+ *
+ * @author mocheng
+ * @date 2025-07-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppFunListServiceImpl implements IAppFunListService {
+
+    private final AppFunListMapper baseMapper;
+
+    @DubboReference
+    private final RemoteUserService remoteUserService;
+
+
+    /**
+     * 查询APP功能列表
+     *
+     * @param id 主键
+     * @return APP功能列表
+     */
+    @Override
+    public AppFunListVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询APP功能列表列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return APP功能列表分页列表
+     */
+    @Override
+    public TableDataInfo<AppFunListVo> queryPageList(AppFunListBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppFunList> lqw = buildQueryWrapper(bo);
+        Page<AppFunListVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(r -> r.setRoleName(remoteUserService.selectUserNameById(r.getRoleid())));
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的APP功能列表列表
+     *
+     * @param bo 查询条件
+     * @return APP功能列表列表
+     */
+    @Override
+    public List<AppFunListVo> queryList(AppFunListBo bo) {
+        LambdaQueryWrapper<AppFunList> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppFunList> buildQueryWrapper(AppFunListBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppFunList> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppFunList::getId);
+        lqw.eq(bo.getRoleid() != null, AppFunList::getRoleid, bo.getRoleid());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), AppFunList::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getIcon()), AppFunList::getIcon, bo.getIcon());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), AppFunList::getUrl, bo.getUrl());
+        return lqw;
+    }
+
+    /**
+     * 新增APP功能列表
+     *
+     * @param bo APP功能列表
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppFunListBo bo) {
+        AppFunList add = MapstructUtils.convert(bo, AppFunList.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改APP功能列表
+     *
+     * @param bo APP功能列表
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppFunListBo bo) {
+        AppFunList update = MapstructUtils.convert(bo, AppFunList.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppFunList entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除APP功能列表信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java

@@ -94,14 +94,14 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
         //将排班人员信息添加到排班信息中
         vo.setUserGroupList(userGroupList);
 
-        //4.根据id查询区域信息
+//        //4.根据id查询区域信息
-        List<AttendanceArrangementArea> arrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.<AttendanceArrangementArea>lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, id));
+//        List<AttendanceArrangementArea> arrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.<AttendanceArrangementArea>lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, id));
-        //过滤出排班的区域id
+//        //过滤出排班的区域id
-        List<Long> areaIdList = arrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList());
+//        List<Long> areaIdList = arrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList());
-        //根据区域id查询出区域信息
+//        //根据区域id查询出区域信息
-        List<AttendanceArea> areaList = attendanceAreaMapper.selectList(Wrappers.<AttendanceArea>lambdaQuery().in(AttendanceArea::getId, areaIdList));
+//        List<AttendanceArea> areaList = attendanceAreaMapper.selectList(Wrappers.<AttendanceArea>lambdaQuery().in(AttendanceArea::getId, areaIdList));
-        //6.将区域信息添加到排班信息中
+//        //6.将区域信息添加到排班信息中
-        vo.setAreaList(areaList);
+//        vo.setAreaList(areaList);
         return vo;
     }
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java

@@ -226,13 +226,13 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
                 vo.setAttendanceGroup(attendanceGroup);
 
 
-                // 根据scheduleId查询出区域排班中间表
+//                // 根据scheduleId查询出区域排班中间表
-                List<AttendanceArrangementArea> attendanceArrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.<AttendanceArrangementArea>lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, scheduleId));
+//                List<AttendanceArrangementArea> attendanceArrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.<AttendanceArrangementArea>lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, scheduleId));
-                vo.setAttendanceArrangementAreaList(attendanceArrangementAreaList);
+//                vo.setAttendanceArrangementAreaList(attendanceArrangementAreaList);
-                //根据中间表查询出区域信息
+//                //根据中间表查询出区域信息
-                List<Long> areaIdList = attendanceArrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList());
+//                List<Long> areaIdList = attendanceArrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList());
-                List<AttendanceArea> attendanceAreaList = attendanceAreaMapper.selectBatchIds(areaIdList);
+//                List<AttendanceArea> attendanceAreaList = attendanceAreaMapper.selectBatchIds(areaIdList);
-                vo.setAttendanceAreaList(attendanceAreaList);
+//                vo.setAttendanceAreaList(attendanceAreaList);
 
                 // 判断当前考勤组的班制是固定班制还是排班制
                 if (Objects.equals(attendanceGroup.getAttendanceType(), StatusConstant.FIXEDSCHEDULE)) {

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java

@@ -15,10 +15,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.property.domain.bo.QrCodeInfo;
+import org.dromara.resource.api.RemoteFileService;
 import org.dromara.sis.api.RemoteVisitorService;
 import org.dromara.sis.api.domain.RemoteVisitor;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbVisitorManagementBo;
 import org.dromara.property.domain.vo.TbVisitorManagementVo;
@@ -49,6 +51,10 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
     @DubboReference
     private RemoteVisitorService remoteVisitorService;
 
+    @DubboReference
+    private RemoteFileService remoteFileService;
+
+
     /**
      * 查询访客管理
      *
@@ -57,7 +63,18 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
      */
     @Override
     public TbVisitorManagementVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+//        TbVisitorManagementVo tbVisitorManagementVo = baseMapper.selectVoById(id);
+        //获取ossId
+        TbVisitorManagementVo tbVisitorManagementVo = baseMapper.selectVoById(id);
+        if (tbVisitorManagementVo.getFacePictures() == null) {
+            return baseMapper.selectVoById(id);
+        } else {
+            String facePictures = tbVisitorManagementVo.getFacePictures();
+            String url = remoteFileService.selectUrlByIds(facePictures);
+            tbVisitorManagementVo.setUrl(url);
+
+            return baseMapper.selectVoById(id);
+        }
     }
 
     /**
@@ -123,7 +140,10 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
         add.setTenantId(userInfoById.getTenantId());
         add.setCreateBy(userInfoById.getUserId());
         add.setUpdateById(userInfoById.getUserId());
-        //调用SysOssController.upload方法上传图片
+
+        //文件上传时，获取ossId
+        String ossId = String.valueOf(remoteFileService.uploadImg(bo.getFacePictures().getBytes()).getOssId());
+        add.setFacePictures(ossId);
 
         add.setUpdateBy(userInfoById.getUserId());
         add.setCreateDept(userInfoById.getDeptId());
@@ -149,6 +169,11 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
     public Boolean insertVistorManagementByBo(TbVisitorManagementBo bo) {
 //        QrCodeInfo info = RedisUtils.getCacheObject("Qrcode" + bo.getQrCodeId());
         TbVisitorManagement add = MapstructUtils.convert(bo, TbVisitorManagement.class);
+
+        //文件上传时，获取ossId
+        String ossId = String.valueOf(remoteFileService.uploadImg(bo.getFacePictures().getBytes()).getOssId());
+        add.setFacePictures(ossId);
+
         validEntityBeforeSave(add);
 //        add.setCreateById(info.getUserid());
         boolean flag = baseMapper.insert(add) > 0;