productDev/dmvisit.git

			@@ -27,6 +27,12 @@
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.StringUtils;
			import org.apache.http.HttpEntity;
			import org.apache.http.HttpResponse;
			import org.apache.http.client.HttpClient;
			import org.apache.http.client.methods.HttpGet;
			import org.apache.http.impl.client.HttpClientBuilder;
			import org.apache.http.util.EntityUtils;
			import org.checkerframework.checker.units.qual.C;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -34,6 +40,7 @@
			import org.springframework.util.CollectionUtils;

			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -88,6 +95,13 @@
			private PlatformLogMapper platformLogMapper;
			@Autowired
			private PlatformWarnEventServiceImpl platformWarnEventService;







			/**
			* 海康门禁事件推送
			* @param param
			@@ -519,7 +533,8 @@
			private Retention getRetentionModelByVisitRequest(Visits visits, String happentTime,String srcType) {
			Retention retention = new Retention();
			retention.setIsdeleted(Constants.ZERO);
			retention.setCreateDate(DateUtil.getISO8601DateByStr(happentTime));
			retention.setCreateDate(DateUtil.getISO8601DateByStr2(happentTime));
			retention.setCreateDate(retention.getCreateDate() == null?new Date():retention.getCreateDate());
			retention.setClasses(visits.getClasses());
			retention.setCode(visits.getCode());
			retention.setIdcardNo(visits.getIdcardNo());
			@@ -561,7 +576,8 @@
			event.setStartTime(request.getData().getVisitorInvoices().getBeginTime());
			event.setSrcType(request.getSrcType());
			event.setSrcParentIndex(request.getSrcParentIndex());
			event.setSrcName(request.getSrcName());
			event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
			request.getData().getParamValues().getSrcName():request.getSrcName());
			event.setSrcIndex(request.getSrcIndex());
			event.setSex(detail.getSex());
			event.setPurpose(request.getData().getVisitorInvoices().getVisitReason());
			@@ -838,10 +854,8 @@
			Constants.PlatformJobStatus.IN_WAIT.getKey(),
			Constants.PlatformJobStatus.CALLED.getKey(),
			Constants.PlatformJobStatus.WORKING.getKey(),
			Constants.PlatformJobStatus.DONE.getKey(),
			Constants.PlatformJobStatus.TRANSFERING.getKey(),
			Constants.PlatformJobStatus.EXCEPTION.getKey(),
			Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
			Constants.PlatformJobStatus.EXCEPTION.getKey()
			)
			)==Constants.ZERO){
			PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
			@@ -1261,12 +1275,12 @@
			if(StringUtils.isBlank(device.getHkId())){
			continue;
			}
			if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
			/*if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
			//如果是LED
			PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1);
			logList.add(log);
			ledList.add(device.getHkId());
			}else if(Constants.equalsInteger(device.getType(),Constants.TWO)){
			}else */if(Constants.equalsInteger(device.getType(),Constants.TWO)){
			//如果是广播点
			bNames += device.getName()+";";
			broadcastList.add(device.getHkId());