嘉兴访客系统

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 <VisitorsPeopleAppDTO> otherPeople;
 
+
+
+	@Schema(description="邀约id")
+	private Long yyId;
+
 }

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查询访客表

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java

@@ -193,4 +193,8 @@ public class VisitorsEntity extends Model<VisitorsEntity> {
 
 	@Schema(description="验证码")
 	private String verificationCode;
+
+
+	@Schema(description="邀约id")
+	private Long yyId;
 }

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<VisitorsMapper, VisitorsEnt
     @Override
     @Transactional
     public Object vistorsSave(VisitorsAppDTO visitors) {
+
+
 //        //发起流程
 //        R<Process> processR = remoteFlowApiFlowService.getProcessByBusinessKey(IntegratedFlowConstant.INTEGRATED_VISITOR);
 //        if (!processR.isOk() || processR.getData() == null) {
@@ -103,6 +106,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         List<VisitorInfo> 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<VisitorsMapper, VisitorsEnt
         VisitorsEntity bean = BeanUtils.toBean(visitors, VisitorsEntity.class);
         bean.setType(VisitorTypeEnum.FKSQ.getType());
 //        bean.setProcessInstanceId(processInstanceId);
-        bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
+//        bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
 
         String uniqueToken = UUID.randomUUID().toString();
         String token = uniqueToken.replace("-", "");
         bean.setToken(token);
         bean.setUserId(userId);
 
+        //如果yyIda不为空，就是被邀约了，需要把那条员工的邀约信息改为审核通过
+        if (visitors.getYyId() != null){
+            //被邀约直接通过
+            bean.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode());
+
+            //查询当前数据是否被接受过
+            LambdaQueryWrapper<VisitorsEntity> 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<VisitorsPeopleAppDTO> visitorsPeopleAppDTOList = visitors.getOtherPeople();
@@ -243,7 +274,9 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
 //        bean.setProcessInstanceId(processInstanceId);
         bean.setUserId(user.getId());
         bean.setDeptId(deptId);
-        bean.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode());
+        R<UserInfo> 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("-", "");

pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml

@@ -35,5 +35,6 @@
         <result property="appointRecordId" column="appoint_record_id"/>
         <result property="qrcode" column="qrcode"/>
         <result property="verificationCode" column="verification_code"/>
+        <result property="yyId" column="yy_id"/>
   </resultMap>
 </mapper>

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<AddPersonResponse> 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<BatchAddPersonResponse> 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<UpdatePersonResponse> 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<BatchDeletePersonResponse> 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<AddFaceResponse> 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<AddFaceResponse> 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<DeleteFaceResponse> 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<GetPersonListResponse> 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<GetPersonInfoResponse> getPersonInfoV1(@Valid @RequestBody GetPersonInfoRequest request);
 }

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);
         

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<Boolean> syncHKUser() {
         List<SysUser> list = userService.list();