server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.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.CarEventDTO; import com.doumee.dao.business.model.CarEvent; import com.doumee.service.business.CarEventService; import io.swagger.annotations.Api; @@ -69,9 +70,9 @@ @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:carevent:query") public ApiResponse<PageData<CarEvent>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) { return ApiResponse.success(carEventService.findPage(pageWrap)); //@RequiresPermissions("business:carevent:query") public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) { return ApiResponse.success(carEventService.findVisitCarPage(pageWrap)); } @ApiOperation("导出Excel") server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
@@ -71,7 +71,7 @@ @ApiOperation("分页查询") @PostMapping("/page") //@RequiresPermissions("business:retention:query") public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<RetentionQuery> pageWrap) { public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap) { return ApiResponse.success(retentionService.findTrainTimePage(pageWrap)); }
@@ -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; @@ -71,6 +72,10 @@ @ApiModelProperty(value = "事件类型") @ExcelColumn(name="事件类型") private String eventType; @ApiModelProperty(value = "事件类型名称") @TableField(exist = false) private String eventTypeName; @ApiModelProperty(value = "事件状态,0-瞬时 1-开始2-停止4-事件联动结果更新5-事件图片异步上传", example = "1") @ExcelColumn(name="事件状态,0-瞬时 1-开始2-停止4-事件联动结果更新5-事件图片异步上传") @@ -216,4 +221,26 @@ @ExcelColumn(name="图片服务器编号 ") private String svrIndex; // 条件查询参数 @ApiModelProperty(value = "姓名/手机号") @TableField(exist = false) private String keyWords; @ApiModelProperty(value = "公司/部门名称") @TableField(exist = false) private String companyName; @ApiModelProperty(value = "人员类型") @TableField(exist = false) private String memberType; @ApiModelProperty(value = "开始时间") @TableField(exist = false) private Date startTime; @ApiModelProperty(value = "结束时间") @TableField(exist = false) private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -120,4 +120,15 @@ @TableField(exist = false) public String companyName; // 条件查询参数 @ApiModelProperty(value = "姓名/手机号") private String keyWords; @ApiModelProperty(value = "开始时间") private Date startTime; @ApiModelProperty(value = "结束时间") private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -102,5 +102,5 @@ * @param pageWrap 分页对象 * @return PageData<CarEvent> */ PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap); PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap); } server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -99,5 +99,5 @@ long count(Retention retention); PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap); PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; /** * 停车场事件推送记录表Service实现 @@ -263,7 +264,7 @@ } @Override public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) { public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) { //是否是数字 boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); //是否包含中文 @@ -284,24 +285,28 @@ .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode) .selectAs(Member::getName,CarEventDTO::getPersonName) .selectAs(Company::getName,CarEventDTO::getPersonCompanyName); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()), CarEvent::getCardNo, pageWrap.getModel().getCarNo()) .like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b || hasWord), Member::getPhone, pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()), Member::getType, pageWrap.getModel().getMemberType()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()), CarEvent::getSrcType, pageWrap.getModel().getSrcType()); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()), CarEvent::getPlateNos, pageWrap.getModel().getPlateNos()) .like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b || hasWord), Member::getPhone, pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()), Member::getType, pageWrap.getModel().getMemberType()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()), CarEvent::getEventType, pageWrap.getModel().getEventType()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), CarEvent::getCreateDate, pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), CarEvent::getCreateDate, pageWrap.getModel().getEndTime()); IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper); return PageData.from(carEventDTOIPage); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -186,7 +186,7 @@ } @Override public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) { public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) { //是否是数字 boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
