server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -6,7 +6,6 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.admin.request.DeviceEventQuery; import com.doumee.dao.admin.response.DeviceEventDTO; import com.doumee.dao.business.model.DeviceEvent; import com.doumee.service.business.DeviceEventService; @@ -72,7 +71,7 @@ @ApiOperation("分页查询") @PostMapping("/page") //@RequiresPermissions("business:deviceevent:query") public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEventQuery> pageWrap) { public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) { return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap)); }
@@ -27,9 +27,9 @@ private String eventType; @ApiModelProperty(value = "开始时间") private String startTime; private Date startTime; @ApiModelProperty(value = "结束时间") private String endTime; private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -23,8 +23,8 @@ private String type; @ApiModelProperty(value = "开始时间") private String startTime; private Date startTime; @ApiModelProperty(value = "结束时间") private String endTime; private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -258,4 +258,21 @@ @ExcelColumn(name="通道总通行人数") private Integer totalTimes; // 条件查询参数 @ApiModelProperty(value = "关键字,姓名/手机号") @TableField(exist = false) private String keyWords; @ApiModelProperty(value = "人员类型") @TableField(exist = false) private String personType; @ApiModelProperty(value = "开始时间") @TableField(exist = false) private Date startTime; @ApiModelProperty(value = "结束时间") @TableField(exist = false) private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -103,5 +103,5 @@ * @param pageWrap 分页对象 * @return PageData<DeviceEvent> */ PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap); PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -286,7 +286,7 @@ } @Override public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap) { public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap) { IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>(); @@ -298,19 +298,16 @@ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords()); //是否包含英文 boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords()); queryWrapper.leftJoin(Member.class,Member::getId,DeviceEvent::getExtEventPersonNo) queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo) .leftJoin(Company.class,Company::getId,Member::getCompanyId) .selectAll(DeviceEvent.class) .selectAs(Member::getName,DeviceEventDTO::getPersonName) .selectAs(Member::getType,DeviceEventDTO::getPersonType) .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone) .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode) .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName); queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b||hasWord), Member::getName, pageWrap.getModel().getKeyWords()) queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()), Member::getType, pageWrap.getModel().getPersonType()) @@ -319,10 +316,10 @@ pageWrap.getModel().getEventType()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00") pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59"); pageWrap.getModel().getEndTime()); queryWrapper.orderByDesc(DeviceEvent::getHappenTime); IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper); return PageData.from(deviceEventDTOIPage); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; import java.util.Objects; @@ -209,11 +210,9 @@ Company::getName, pageWrap.getModel().getCompanyName()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), Retention::getEventDate, pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00") Retention::getEventDate,pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), Retention::getEventDate, pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getEndTime()+" 23:59:59"); Retention::getEventDate,pageWrap.getModel().getStartTime()); queryWrapper.orderByDesc(Retention::getCreateDate); IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper); return PageData.from(retentionIPage);
