diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java index 9f4f5ec70..4cad34659 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java @@ -113,4 +113,9 @@ public class VisitorsAppDTO { @Schema(description="随行人员集合") private List otherPeople; + + + @Schema(description="邀约id") + private Long yyId; + } \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java index cf7685db7..ecf190314 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java @@ -154,6 +154,7 @@ public class VisitorsController { return R.ok(visitorsService.getByToken(token)); } + /** * 扫码发送请求确认是否能通过 * 通过token查询访客表 diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java index 57377071f..4920d10bb 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java @@ -193,4 +193,8 @@ public class VisitorsEntity extends Model { @Schema(description="验证码") private String verificationCode; + + + @Schema(description="邀约id") + private Long yyId; } \ No newline at end of file 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 cf51f8ec0..ce2aa8476 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 @@ -3,6 +3,7 @@ package com.bsd.pjcloud.integrated.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.dto.UserInfo; import com.bsd.pjcloud.admin.api.entity.SysDictItem; import com.bsd.pjcloud.admin.api.feign.RemoteDictService; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; @@ -85,6 +86,8 @@ public class VisitorsServiceImpl extends ServiceImpl processR = remoteFlowApiFlowService.getProcessByBusinessKey(IntegratedFlowConstant.INTEGRATED_VISITOR); // if (!processR.isOk() || processR.getData() == null) { @@ -103,6 +106,7 @@ public class VisitorsServiceImpl extends ServiceImpl visitorInfoList = new ArrayList<>(); VisitorInfo visitorInfo = new VisitorInfo(); VisitorAppointmentRequest visitorAppointmentRequest = new VisitorAppointmentRequest(); + visitorAppointmentRequest.setReceptionistId(visitors.getReceiveId().toString()); visitorAppointmentRequest.setVisitStartTime((TimeUtils.LocalDateTimeToISO8601(visitors.getVStartDate()))); visitorAppointmentRequest.setVisitEndTime(TimeUtils.LocalDateTimeToISO8601(visitors.getVEndDate())); visitorInfo.setVisitorName(visitors.getName()); @@ -114,13 +118,40 @@ public class VisitorsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(VisitorsEntity::getYyId, visitors.getYyId()); + VisitorsEntity visitorsEntitie = baseMapper.selectOne(queryWrapper); + + //设置邀约人的id + bean.setReceiveId(visitorsEntitie.getUserId()); + + if (null != visitorsEntitie){ + //如果被接受过,则不能再接受 + if (TaskCheckStatusEnum.RESULT.getCode().equals(visitorsEntitie.getCheckStatus())){ + throw new ServiceException("该邀约已被接受,请勿重复接受"); + } + } + VisitorsEntity visitorsUpdateYY = new VisitorsEntity(); + visitorsUpdateYY.setId(visitors.getYyId()); + visitorsUpdateYY.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode()); + baseMapper.updateById(visitorsUpdateYY); + }else { + //主动申请,需要审核 + bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); + } List visitorsPeopleAppDTOList = visitors.getOtherPeople(); @@ -243,7 +274,9 @@ public class VisitorsServiceImpl extends ServiceImpl byUserId = remoteUserService.getByUserId(user.getId()); + bean.setUserName(byUserId.getData().getSysUser().getUsername()); + bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); String uniqueToken = UUID.randomUUID().toString(); String token = uniqueToken.replace("-", ""); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml index 99d8794a9..f075f9bf2 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterVisitorService.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterVisitorService.java index 266bcbbca..e45392f4f 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterVisitorService.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterVisitorService.java @@ -96,7 +96,7 @@ public interface RemoterVisitorService { * @param request 添加人员请求参数 * @return 添加人员响应结果 */ - @PostMapping("/person/add") + @PostMapping("/visitors/person/add") @Operation(summary = "添加人员信息v2", description = "添加人员信息到海康平台") public R addPersonV2(@Valid @RequestBody AddPersonRequest request); @@ -105,7 +105,7 @@ public interface RemoterVisitorService { * @param request 批量添加人员请求参数 * @return 批量添加人员响应结果 */ - @PostMapping("/person/batch-add") + @PostMapping("/visitors/person/batch-add") @Operation(summary = "批量添加人员信息v1", description = "批量添加人员信息到海康平台") public R batchAddPersonV1(@Valid @RequestBody BatchAddPersonRequest request); @@ -114,7 +114,7 @@ public interface RemoterVisitorService { * @param request 修改人员请求参数 * @return 修改人员响应结果 */ - @PostMapping("/person/update") + @PostMapping("/visitors/person/update") @Operation(summary = "修改人员信息v1", description = "修改海康平台人员信息") public R updatePersonV1(@Valid @RequestBody UpdatePersonRequest request); @@ -123,7 +123,7 @@ public interface RemoterVisitorService { * @param request 批量删除人员请求参数 * @return 批量删除人员响应结果 */ - @PostMapping("/person/batch-delete") + @PostMapping("/visitors/person/batch-delete") @Operation(summary = "批量删除人员信息v1", description = "批量删除海康平台人员信息") public R batchDeletePersonV1(@Valid @RequestBody BatchDeletePersonRequest request); @@ -132,7 +132,7 @@ public interface RemoterVisitorService { * @param request 添加人脸请求参数 * @return 添加人脸响应结果 */ - @PostMapping("/face/add") + @PostMapping("/visitors/face/add") @Operation(summary = "添加人脸信息v1", description = "添加人脸信息到海康平台") public R addFaceV1(@Valid @RequestBody AddFaceRequest request); @@ -141,7 +141,7 @@ public interface RemoterVisitorService { * @param request 修改人脸请求参数 * @return 修改人脸响应结果 */ - @PostMapping("/face/update") + @PostMapping("/visitors/face/update") @Operation(summary = "修改人脸信息v1", description = "修改海康平台人脸信息") public R updateFaceV1(@Valid @RequestBody UpdateFaceRequest request); @@ -150,7 +150,7 @@ public interface RemoterVisitorService { * @param request 删除人脸请求参数 * @return 删除人脸响应结果 */ - @PostMapping("/face/delete") + @PostMapping("/visitors/face/delete") @Operation(summary = "删除人脸信息v1", description = "删除海康平台人脸信息") public R deleteFaceV1(@Valid @RequestBody DeleteFaceRequest request); @@ -159,7 +159,7 @@ public interface RemoterVisitorService { * @param request 获取人员列表请求参数 * @return 获取人员列表响应结果 */ - @PostMapping("/person/list") + @PostMapping("/visitors/person/list") @Operation(summary = "获取组织下人员列表v2", description = "根据组织编号获取组织下的人员信息列表") public R getPersonListV2(@Valid @RequestBody GetPersonListRequest request); @@ -168,7 +168,7 @@ public interface RemoterVisitorService { * @param request 获取人员详细信息请求参数 * @return 获取人员详细信息响应结果 */ - @PostMapping("/person/detail") + @PostMapping("/visitors/person/detail") @Operation(summary = "根据人员唯一字段获取人员详细信息v1", description = "根据实名标识精确查询人员详细信息") public R getPersonInfoV1(@Valid @RequestBody GetPersonInfoRequest request); } diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/VisitorService.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/VisitorService.java index 74fa4b3da..33bcdad5b 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/VisitorService.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/VisitorService.java @@ -59,7 +59,8 @@ public class VisitorService extends BaseHikvisionService { * @return */ public VisitorObjectResponse createVisitorAppointment(VisitorAppointmentRequest request) { - request.setReceptionistId(properties.getPersonId()); + //调试的时候写死 +// request.setReceptionistId(properties.getPersonId()); JSONObject body = convertRequestToJSON(request); String responseJson = sendPostRequest("visitor-appointment", body); diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index d52ed95f1..1a95f414d 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -476,7 +476,7 @@ public class SysUserController { } - @GetMapping("/syncHKUser") + @PostMapping("/syncHKUser") @Schema(description = "同步用户到海康") public R syncHKUser() { List list = userService.list();