productDev/dmvisit.git

			@@ -205,6 +205,9 @@
			@ApiModelProperty(value = "openid")
			@ExcelColumn(name="openid")
			private String openid;
			@ApiModelProperty(value = "访客二维码")
			@ExcelColumn(name="访客二维码")
			private String qrcode;


			@ApiModelProperty(value = "访客预约方式：0登记预约 1免登记预约", example = "1")

			@@ -408,14 +408,14 @@
			retention.setType(visits.getMemberType());
			retention.setCompanyId(visits.getCompanyId());
			retention.setCompanyName(visits.getCompanyName());
			retention.setEventCode(request.getEventType()+"");
			retention.setEventCode(request.getSrcType()+"");
			retention.setEventDate(retention.getCreateDate());
			retention.setFaceImg(visits.getFaceImg());
			retention.setImgurl(visits.getImgurl());
			retention.setPhone(visits.getPhone());
			retention.setMemberId(visits.getMemberId());
			retention.setDeviceName(request.getSrcName());
			retention.setDeviceIndex(request.getSrcIndex());
			// retention.setDeviceName(request.getSrcName());
			// retention.setDeviceIndex(request.getSrcIndex());

			return retention;
			}

			@@ -230,6 +230,7 @@
			private void getUpdateModelByResponse( Visits c,Date date,String type,List<DeviceRole> roleList,String path ) {
			String code = null;
			String id = null;
			String qrcode = null;
			//发起海康预约接口
			if(StringUtils.equals(type,"0")){
			//（需要登记）
			@@ -244,9 +245,12 @@
			}
			BaseResponse<VisitAppointmentResponse> response = HKService.visitAppiontment(request);
			code =response!=null ?response.getCode():null;
			id = (response!=null && response.getData()!=null
			if((response!=null && response.getData()!=null
			&& response.getData().getAppointmentInfoList() !=null
			&& response.getData().getAppointmentInfoList().size()>0)?response.getData().getAppointmentInfoList().get(0).getOrderId():null;
			&& response.getData().getAppointmentInfoList().size()>0)){
			id =response.getData().getAppointmentInfoList().get(0).getOrderId();
			qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
			}
			}else{
			//免登记
			VisitAppointmentMDJRequest request =getHkMDJRequestPara(c,roleList,path);
			@@ -260,16 +264,20 @@
			}
			BaseResponse<VisitAppointmentMDJResponse> response = HKService.visitAppiontmentMDJ(request );
			code =response!=null ?response.getCode():null;
			id = (response!=null && response.getData()!=null)?response.getData().getOrderId():null;
			if(response!=null && response.getData()!=null){
			id = response.getData().getOrderId();
			qrcode =response.getData().getQRCode();
			}
			}

			if (code!= null && id!=null) {
			//海康下发成功
			c.setHkId( id);//预约标识
			c.setQrcode(qrcode);
			c.setRemark("下发海康成功！【"+type+"】");
			c.setStatus(Constants.VisitStatus.xfSuccess);//下发海康成功
			} else {
			//海康下发成功
			//海康下发失败
			c.setRemark("下发海康失败！【"+type+"】");
			c.setStatus(Constants.VisitStatus.xfFail);//下发海康失败
			}

	server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史