From 82a91a80b5e4512bb9cf12310ac941ef76d0591a Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 29 Jul 2025 17:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppVisitorUserController.java | 8 +++ .../service/impl/VisitorsServiceImpl.java | 49 ++++++------------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java index 2ccc3e0eb..6a64d3fae 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorUserController.java @@ -6,9 +6,11 @@ import com.auth0.jwt.algorithms.Algorithm; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.bsd.pjcloud.common.core.constant.CacheConstants; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.integrated.entity.VisitorUserEntity; import com.bsd.pjcloud.integrated.service.VisitorUserService; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -50,6 +52,8 @@ public class AppVisitorUserController { // 登录验证 @PostMapping("/login") @Transactional + @Operation(summary = "访客登录" , description = "app访客登录" ) + @SysLog("访客登录" ) public R> login( @RequestParam String phone, @RequestParam String smsCode, @@ -122,6 +126,10 @@ public class AppVisitorUserController { } String result = s.replace("\"", ""); boolean equals = result.equals(smsCode); + System.out.println("请求传的验证码"); + System.out.println(smsCode); + System.out.println("缓存的验证码"); + System.out.println(result); return equals; } diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index 56b1531ee..7f9231bc2 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.integrated.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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.admin.api.dto.UserInfo; @@ -286,50 +287,28 @@ public class VisitorsServiceImpl extends ServiceImpl processR = remoteFlowApiFlowService.getProcessByBusinessKey(IntegratedFlowConstant.INTEGRATED_VISITOR); -// if (!processR.isOk() || processR.getData() == null) { -// throw new ServiceException("流程配置获取失败: " + processR.getMsg()); -// } -// String flowId = processR.getData().getFlowId(); -// ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto(); -// processInstanceParamDto.setFlowId(flowId); -// R stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto); -// if (!stringR.isOk() || stringR.getData() == null) { -// throw new ServiceException("流程实例启动失败: " + stringR.getMsg()); -// } -// String processInstanceId = stringR.getData(); - Long userId = getCurrentVisitorUserId(); - String username = getCurrentVisitorUsername(); - + + //先查询被邀约者是否存在系统中，不存在就自动新增 + VisitorUserEntity visitUser = visitorUserService.getOne(Wrappers.lambdaQuery().eq(VisitorUserEntity::getPhone, visitors.getMobile())); + if (visitUser == null){ + visitUser = new VisitorUserEntity(); + visitUser.setPhone(visitors.getMobile()); + visitUser.setIdCard(visitors.getIdCard()); + visitUser.setRealName(visitors.getName()); + visitUser.setRegisterTime(LocalDateTime.now()); + visitorUserService.save(visitUser); + } VisitorsEntity bean = BeanUtils.toBean(visitors, VisitorsEntity.class); bean.setType(VisitorTypeEnum.ZDYQ.getType()); -// bean.setProcessInstanceId(processInstanceId); // 设置数据归属信息 - bean.setUserId(userId); - bean.setCreateBy(username); + bean.setUserId(visitUser.getId()); + bean.setCreateBy(visitUser.getRealName()); bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); String uniqueToken = UUID.randomUUID().toString(); String token = uniqueToken.replace("-", ""); bean.setToken(token); int insert = baseMapper.insert(bean); -// List visitorsCarAppDTOList = visitors.getCarList(); -// if (!CollectionUtils.isEmpty(visitorsCarAppDTOList)){ -// List visitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class); -// visitorsCarEntities.forEach(i->{ -// i.setVisitorsId(bean.getId()); -// }); -// visitorsCarMapper.insert(visitorsCarEntities); -// } -// List visitorsPeopleAppDTOList = visitors.getOtherPeople(); -// if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){ -// List visitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class); -// visitorsPeopleEntities.forEach(i->{ -// i.setVisitorsId(bean.getId()); -// }); -// visitorsPeopleMapper.insert(visitorsPeopleEntities); -// } return insert; }