Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

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

@@ -149,6 +149,24 @@ public class TbVisitorManagementController extends BaseController {
         return toAjax(tbVisitorManagementService.insertByBo(bo));
     }
 
+    /**
+     * h5端新增访客管理
+     * @param bo
+     * @return
+     */
+    @SaCheckPermission("property:visitorManagement:addH5VistorManagement")
+    @Log(title = "访客管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/addH5VistorManagement")
+    public R<Void> addH5VistorManagement(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) {
+        QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + bo.getQrCodeId());
+        if (info==null){
+            return R.fail("请确认Qr码有效");
+        }
+        bo.setType(0);
+        return toAjax(tbVisitorManagementService.insertH5ByBo(bo));
+    }
+
     /**
      * pc端新增访客管理
      */

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

@@ -56,6 +56,14 @@ public interface ITbVisitorManagementService {
      */
     Boolean insertByBo(TbVisitorManagementBo bo);
 
+    /**
+     * 新增访客管理
+     *
+     * @param bo 访客管理
+     * @return 是否新增成功
+     */
+    Boolean insertH5ByBo(TbVisitorManagementBo bo);
+
 
     Boolean insertVistorManagementByBo(TbVisitorManagementBo bo);
 

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

@@ -159,6 +159,37 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
     }
 
 
+    /**
+     * H5端新增访客管理
+     *
+     * @param bo 访客管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertH5ByBo(TbVisitorManagementBo bo) {
+        QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + "Qrcode" + bo.getQrCodeId());
+        RedisUtils.deleteKeys(GlobalConstants.CAPTCHA_CODE_KEY + "Qrcode" + bo.getQrCodeId());
+        TbVisitorManagement add = MapstructUtils.convert(bo, TbVisitorManagement.class);
+        validEntityBeforeSave(add);
+        assert add != null;
+        add.setCreateById(info.getUserid());
+        RemoteUserVo userInfoById = remoteUserService.getUserInfoById(info.getUserid());
+        add.setTenantId(userInfoById.getTenantId());
+        add.setCreateBy(userInfoById.getUserId());
+        add.setUpdateById(userInfoById.getUserId());
+        add.setUpdateBy(userInfoById.getUserId());
+        add.setCreateDept(userInfoById.getDeptId());
+        boolean flag = baseMapper.insert(add) > 0;
+
+        if (flag){
+            bo.setId(add.getId());
+            Long e8Id = syncE8PlatVisitor(bo);
+            add.setEEightId(e8Id);
+            baseMapper.updateById(add);
+        }
+        return flag;
+    }
+
     /**
      * pc端新增访客管理
      *