修复bug

jiangping

2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4

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

@@ -16,6 +16,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.VisitEventVo;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -234,8 +235,22 @@
    }

    @Override
    public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
    public PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap) {

        IPage<VisitEvent> visitEventDTOIPage = getDataInfo(pageWrap);
        if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
            visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
        }
        return PageData.from(visitEventDTOIPage);
    }

    @Override
    public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
        IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
        return newVisitEvent(visitEventExcel.getRecords());
    }

    private IPage<VisitEvent> getDataInfo(PageWrap<VisitEvent> pageWrap) {
        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
@@ -245,54 +260,55 @@

        IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
        queryWrapper.selectAll(VisitEvent.class)
                    .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
        queryWrapper.selectAll(VisitEvent.class);
        queryWrapper.like(number,
                            VisitEvent::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like((b ||hasWord),
                            VisitEvent::getPersonName,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                            VisitEvent::getCarNo,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                            Company::getName,
                            pageWrap.getModel().getCompanyName())
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                            VisitEvent::getEventType,
                            pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                            VisitEvent::getHappenTime,
                            pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                            VisitEvent::getHappenTime,
                            pageWrap.getModel().getEndTime());
                VisitEvent::getPhone,
                pageWrap.getModel().getKeyWords())
                .like((b ||hasWord),
                        VisitEvent::getPersonName,
                        pageWrap.getModel().getKeyWords())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                        VisitEvent::getCarNo,
                        pageWrap.getModel().getCarNo())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
                        VisitEvent::getVisitorWorkUint,
                        pageWrap.getModel().getVisitorWorkUint())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        VisitEvent::getEventType,
                        pageWrap.getModel().getEventType())
                .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getStartTime())
                .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getEndTime())
                .eq(VisitEvent::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByDesc(VisitEvent::getHappenTime);
        IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
        if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
            visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
        }
        return PageData.from(visitEventDTOIPage);
        IPage<VisitEvent> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEvent.class, queryWrapper);
        return visitEventDTOIPage;
    }

    private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {

    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()));
        List<VisitEventDTO> newDataList = new ArrayList<>();
        VisitEventDTOList.stream().forEach(obj->{
            obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
                    +dataMap.get(Constants.MEMBER_IMG).getCode()
                    +obj.getCaptureUrl());
            if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
                obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
            }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
                obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());

            if(StringUtils.isNotBlank( obj.getCaptureUrl())
                    && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
                    && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
                if(null != list && list.size() > 0) {
                    obj.setCaptureUrlFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
                            +dataMap.get(Constants.VISIT_EVENT_IMG).getCode()
                            +obj.getCaptureUrl());
                }
            }
            newDataList.add(obj);
            obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
        });
        return newDataList;
        return  VisitEventDTOList;
    }
}