server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -71,7 +71,7 @@ @ApiOperation("【海康】门禁事件订阅推送对接处理接口") @PostMapping("/push/acs") public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) { try { /* try { BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8")); String line = null; StringBuffer sb = new StringBuffer(); @@ -83,7 +83,7 @@ System.out.println(sb.toString()); } catch (IOException e) { throw new RuntimeException(e); } }*/ String result = hkSyncPushService.dealAcsEvent(param,response); return ApiResponse.success(result); } server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -58,7 +58,7 @@ @ApiModelProperty(value = "事件类型") @ExcelColumn(name="事件类型") private String eventType; private Integer eventType; @ApiModelProperty(value = "事件源类型,如“acsDevice”") @ExcelColumn(name="事件源类型,如“acsDevice”") server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
@@ -86,7 +86,7 @@ HKService.eventSub(param);//访客事件 param.setEventDest(path+"/acs"); param.setEventTypes(new Integer[]{HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()}); param.setEventTypes(new Integer[]{HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey(),HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()}); HKService.eventSub(param);//门禁事件 } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
@@ -1,31 +1,23 @@ package com.doumee.service.business.impl.hksync; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.BaseResponse; import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest; import com.doumee.core.haikang.model.param.request.CarChargeAddRequest; import com.doumee.core.haikang.model.param.request.CarChargeDelRequest; import com.doumee.core.haikang.model.param.request.ParkListRequest; import com.doumee.core.haikang.model.param.respose.AcsDeviceInfoResponse; import com.doumee.core.haikang.model.param.respose.AcsDeviceListResponse; import com.doumee.core.haikang.model.param.respose.ParkListResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.dao.business.DeviceMapper; import com.doumee.dao.business.ParkBookMapper; import com.doumee.dao.business.ParksMapper; import com.doumee.dao.business.join.ParkBookJoinMapper; import com.doumee.dao.business.join.ParksJoinMapper; import com.doumee.dao.business.model.*; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -149,11 +149,12 @@ event.setIsdeleted(Constants.ZERO); event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime())); event.setEventId(request.getEventId()); event.setEventType( request.getData().getExtEventType()!=null?request.getData().getExtEventType()+"":null); event.setEventType(request.getEventType()); event.setAccessChannel(request.getData().getExtAccessChannel()); event.setUserType(request.getData().getUserType()); event.setSvrIndexCode(request.getData().getSvrIndexCode()); event.setStatus(request.getStatus()); event.setExtEventType(request.getData().getExtEventType()!=null?request.getData().getExtEventType():null); event.setSrcType(request.getSrcType()); event.setSrcName(request.getSrcName()); event.setSrcIndex(request.getSrcIndex());