k94314517
2025-05-06 e83db5d645106ed93a6c8aff154b1b17ab984891
代码初始化
已修改1个文件
67 ■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1814,11 +1814,7 @@
 
            //今日在园人数
            pcWorkPlatformDataVO.setTodayInParkUserNum(
                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
                            .isNotNull(InoutRecord::getMemberPhone)
                            .isNull(InoutRecord::getCarCode)
                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
                    //retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
                    retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
            );
            pcWorkPlatformDataVO.setTodayInUserNum(Constants.ZERO);
@@ -1826,13 +1822,7 @@
            //在园长期相关方人数
            pcWorkPlatformDataVO.setInParkLwUserNum(
                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
                            .eq(InoutRecord::getMemberType,Constants.TWO)
                            .isNotNull(InoutRecord::getMemberPhone)
                            .isNull(InoutRecord::getCarCode)
                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
//                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
//                            && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR)).count()
            );
            pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
            pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1840,30 +1830,18 @@
            //在园访客数量
            pcWorkPlatformDataVO.setInParkVisitUserNum(
                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
                            .eq(InoutRecord::getMemberType,Constants.ZERO)
                            .isNotNull(InoutRecord::getMemberPhone)
                            .isNull(InoutRecord::getCarCode)
                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
                    //retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
            );
            pcWorkPlatformDataVO.setVisitUserNum(Constants.ZERO);
            pcWorkPlatformDataVO.setSignLevelNum(Constants.ZERO);
            //在园货运车辆司机
            pcWorkPlatformDataVO.setInParkDriverUserNum(inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
                    .eq(InoutRecord::getMemberType,Constants.THREE)
                    .isNotNull(InoutRecord::getMemberPhone)
                    .isNull(InoutRecord::getCarCode)
                    .apply( " DATE(TIME_INFO) = CURDATE() " )));
            pcWorkPlatformDataVO.setInParkDriverUserNum(
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)&&Objects.isNull(i.getCompanyType())).count());
            //在园车辆
            pcWorkPlatformDataVO.setTodayInParkCarNum(
                    inoutRecordMapper.selectCount(new QueryWrapper<InoutRecord>().lambda()
                            .isNotNull(InoutRecord::getCarCode)
                            .isNull(InoutRecord::getMemberPhone)
                            .apply( " DATE(TIME_INFO) = CURDATE() " ))
                    //retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
            );
            pcWorkPlatformDataVO.setTodayInCarNum(Constants.ZERO);
            pcWorkPlatformDataVO.setTodayOutCarNum(Constants.ZERO);
@@ -1894,6 +1872,11 @@
                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
            );
            List<InoutRecord> inoutRecordList = inoutRecordMapper.selectList(new QueryWrapper<InoutRecord>().lambda()
                    .eq(InoutRecord::getInOrOut,Constants.ZERO).eq(InoutRecord::getIsdeleted,Constants.ZERO)
                    .apply(" STARTTIME >   CURDATE() - INTERVAL 7 DAY " )
            );
            List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
                    .in(CarEvent::getEventType,"771760131","771760130")
                    .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY  " )
@@ -1902,10 +1885,17 @@
            for (String days:weekDays) {
                InterestedListVO visitVO = new InterestedListVO();
                visitVO.setName(days);
                if(CollectionUtils.isNotEmpty(visitsList)){
                if(CollectionUtils.isNotEmpty(inoutRecordList)){
                    //处理访客人员数量
                    List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
//                    List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
//                    List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
                    List<String> memberIds  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                    Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .collect(Collectors.toList());
                    if(CollectionUtils.isNotEmpty(memberIds)){
                        visitVO.setNum(new HashSet<String>(memberIds).size());
                    }
@@ -1919,11 +1909,16 @@
                InterestedListVO carVO = new InterestedListVO();
                carVO.setName(days);
                if(CollectionUtils.isNotEmpty(carEventList)){
                if(CollectionUtils.isNotEmpty(inoutRecordList)){
                    //处理访客人员数量
                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
//                    List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
//                    List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
                    List<String> carCodeList  = inoutRecordList.stream().filter(i->
                                    Objects.isNull(i.getCarCode())&&
                                            Objects.nonNull(i.getMemberPhone())&&DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM-dd").equals(days)
                            )
                            .map(i->i.getMemberPhone())
                            .collect(Collectors.toList());
                    if(CollectionUtils.isNotEmpty(carCodeList)){
                        carVO.setNum(new HashSet<String>(carCodeList).size());
                    }
@@ -1950,7 +1945,7 @@
                    List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getType,Constants.TWO)
                                    .eq(Retention::getType,Constants.FOUR)
                                    .in(Retention::getCompanyId,lwCompanyIds)
                    );
                    for (Company company:lwCompanyList) {