访客事件信息

lishuai

2023-12-14 4ba6249cc7d516f95dd8d39e3cba87ad01dfae81

访客事件信息

 server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java

@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.service.business.VisitEventService;
import io.swagger.annotations.Api;
@@ -69,9 +70,9 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:visitevent:query")
    public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
        return ApiResponse.success(visitEventService.findPage(pageWrap));
    //@RequiresPermissions("business:visitevent:query")
    public ApiResponse<PageData<VisitEventDTO>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
        return ApiResponse.success(visitEventService.findVisitPage(pageWrap));
    }

    @ApiOperation("导出Excel")

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -170,4 +171,12 @@
    @ExcelColumn(name="被访问人所属组织id")
    private String idcardDecode;

    // 条件查询参数
    @ApiModelProperty(value = "姓名/手机号")
    @TableField(exist = false)
    private String keyWords;

    @ApiModelProperty(value = "公司/部门名称")
    @TableField(exist = false)
    private String companyName;
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java

@@ -104,7 +104,7 @@
     * @param pageWrap 分页对象
     * @return PageData<VisitEvent>
     */
    PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap);
    PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap);


}

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

@@ -10,10 +10,7 @@
import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -228,7 +225,7 @@
    }

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

        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
@@ -239,38 +236,30 @@

        IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper .leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(VisitEvent.class)
                    .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
                    .selectAs(Member::getType,VisitEventDTO::getPersonType)
                    .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
                    .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);

        queryWrapper.like(number,
                            Member::getPhone,
                            VisitEvent::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like((b ||hasWord),
                            Member::getPhone,
                            VisitEvent::getPersonName,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                            Member::getPhone,
                            VisitEvent::getCarNo,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                            Company::getName,
                            pageWrap.getModel().getCompanyName())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
                            VisitEvent::getSrcType,
                            pageWrap.getModel().getSrcType())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                            VisitEvent::getEventType,
                            pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                            VisitEvent::getHappenTime,
                            Utils.Date.getStart(pageWrap.getModel().getStartTime()))
                            pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                            VisitEvent::getHappenTime,
                            Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
                            pageWrap.getModel().getEndTime());
        queryWrapper.orderByDesc(VisitEvent::getHappenTime);
        IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
        return PageData.from(visitEventDTOIPage);