From ab38c1ef4e5870c32afaae5fd332f6f69ff4079a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 10:22:47 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index d8f00e9..82a6608 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.dao.business.vo.VisitEventCountVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -242,7 +243,36 @@
}
return PageData.from(visitEventDTOIPage);
}
-
+ @Override
+ public VisitEventCountVO countNum(VisitEvent model){
+ VisitEventCountVO data = new VisitEventCountVO();
+ data.setEventNum(0l);
+ data.setVisitorNum(0l);
+ Long count = visitEventJoinMapper.selectCount(new QueryWrapper<VisitEvent>().lambda()
+ .ge(StringUtils.isNotBlank(model.getStartTime()), VisitEvent::getCreateDate, model.getStartTime())
+ .le(StringUtils.isNotBlank(model.getEndTime()), VisitEvent::getCreateDate,model.getEndTime())
+ .eq(VisitEvent::getInOrOut,Constants.ZERO)
+ .isNotNull(VisitEvent::getVisitorId)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
+ );
+ if(count!=null){
+ data.setEventNum(count);
+ }
+ VisitEvent count1 = visitEventJoinMapper.selectOne(new QueryWrapper<VisitEvent>()
+ .select("count(distinct(visitor_id)) as num")
+ .lambda()
+ .ge(StringUtils.isNotBlank(model.getStartTime()),VisitEvent::getCreateDate, model.getStartTime())
+ .le(StringUtils.isNotBlank(model.getEndTime()), VisitEvent::getCreateDate,model.getEndTime())
+ .eq( VisitEvent::getIsdeleted,Constants.ZERO)
+ .eq( VisitEvent::getInOrOut,Constants.ZERO)
+ .isNotNull(VisitEvent::getVisitorId)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
+ );
+ if(count1!=null){
+ data.setVisitorNum((long)Constants.formatIntegerNum(count1.getNum()));
+ }
+ return data;
+ }
@Override
public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
@@ -293,13 +323,11 @@
return visitEventDTOIPage;
}
-
private List<VisitEvent> newVisitEvent(List<VisitEvent> VisitEventDTOList) {
List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
List<SystemDictData> list = systemDictDataMapper.list(codes);
Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
VisitEventDTOList.stream().forEach(obj->{
-
if(StringUtils.isNotBlank( obj.getCaptureUrl())
&& !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
&& !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
@@ -309,7 +337,7 @@
+obj.getCaptureUrl());
}
}
- obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
});
return VisitEventDTOList;
}
--
Gitblit v1.9.3