Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java

@@ -253,22 +253,23 @@
                .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)
                .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
                );
        if(count!=null){
            data.setEventNum(count);
        }
        Long count1 = visitEventJoinMapper.selectCount(new QueryWrapper<VisitEvent>().lambda()
        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::getInOrOut,Constants.ZERO)
                .eq( VisitEvent::getIsdeleted,Constants.ZERO)
                .eq( VisitEvent::getInOrOut,Constants.ZERO)
                .isNotNull(VisitEvent::getVisitorId)
                .eq( VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS)
                .groupBy(VisitEvent::getVisitorId)
                .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
                );
        if(count1!=null){
            data.setVisitorNum(count);
            data.setVisitorNum((long)Constants.formatIntegerNum(count1.getNum()));
        }
        return data;
    }
@@ -322,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)) {
@@ -338,7 +337,7 @@
                            +obj.getCaptureUrl());
                }
            }
            obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
            obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
        });
        return  VisitEventDTOList;
    }