日期筛选
This commit is contained in:
parent
240706c11c
commit
df8345f504
@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.ycwl.basic.model.common.BaseQueryParameterReq;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.entity.FaceDetectLog;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.req.FaceDetectLogReqQuery;
|
||||
import com.ycwl.basic.service.pc.FaceDetectLogService;
|
||||
import com.ycwl.basic.utils.ApiResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -21,9 +22,9 @@ public class FaceDetectLogController {
|
||||
private FaceDetectLogService service;
|
||||
|
||||
@PostMapping("/page")
|
||||
public ApiResponse<PageInfo<FaceDetectLog>> pageQuery(@RequestBody BaseQueryParameterReq req) {
|
||||
public ApiResponse<PageInfo<FaceDetectLog>> pageQuery(@RequestBody FaceDetectLogReqQuery req) {
|
||||
PageHelper.startPage(req.getPageNum(), req.getPageSize());
|
||||
List<FaceDetectLog> list = service.listByTimeDesc();
|
||||
List<FaceDetectLog> list = service.listByTimeDesc(req);
|
||||
PageInfo<FaceDetectLog> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
}
|
||||
|
@ -0,0 +1,18 @@
|
||||
package com.ycwl.basic.model.pc.faceDetectLog.req;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.ycwl.basic.model.common.BaseQueryParameterReq;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class FaceDetectLogReqQuery extends BaseQueryParameterReq {
|
||||
private String scenicId;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date startTime;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date endTime;
|
||||
}
|
@ -2,6 +2,7 @@ package com.ycwl.basic.model.pc.faceSample.req;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.ycwl.basic.model.common.BaseQueryParameterReq;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -56,6 +57,8 @@ public class FaceSampleReqQuery extends BaseQueryParameterReq {
|
||||
*/
|
||||
@ApiModelProperty("是否匹配,0未匹配,1已匹配")
|
||||
private Integer status;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date startTime;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date endTime;
|
||||
}
|
||||
|
@ -74,9 +74,9 @@ public class OrderReqQuery extends BaseQueryParameterReq {
|
||||
* 订单创建时间
|
||||
*/
|
||||
@ApiModelProperty("订单创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date startCreateTime;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date endCreateTime;
|
||||
/**
|
||||
* 订单支付时间
|
||||
|
@ -1,22 +1,26 @@
|
||||
package com.ycwl.basic.service.impl.pc;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ycwl.basic.mapper.FaceDetectLogMapper;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.entity.FaceDetectLog;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.req.FaceDetectLogReqQuery;
|
||||
import com.ycwl.basic.service.pc.FaceDetectLogService;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Service
|
||||
public class FaceDetectLogServiceImpl extends ServiceImpl<FaceDetectLogMapper, FaceDetectLog> implements FaceDetectLogService {
|
||||
@Override
|
||||
public List<FaceDetectLog> listByTimeDesc() {
|
||||
public List<FaceDetectLog> listByTimeDesc(FaceDetectLogReqQuery req) {
|
||||
LambdaQueryWrapper<FaceDetectLog> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.orderByDesc(FaceDetectLog::getCreateTime);
|
||||
queryWrapper.gt(Objects.nonNull(req.getStartTime()), FaceDetectLog::getCreateTime, req.getStartTime());
|
||||
queryWrapper.lt(Objects.nonNull(req.getEndTime()), FaceDetectLog::getCreateTime, req.getEndTime());
|
||||
queryWrapper.likeLeft(StringUtils.isNotBlank(req.getScenicId()), FaceDetectLog::getDbName, req.getScenicId());
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
@ -2,9 +2,10 @@ package com.ycwl.basic.service.pc;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.entity.FaceDetectLog;
|
||||
import com.ycwl.basic.model.pc.faceDetectLog.req.FaceDetectLogReqQuery;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface FaceDetectLogService extends IService<FaceDetectLog> {
|
||||
List<FaceDetectLog> listByTimeDesc();
|
||||
List<FaceDetectLog> listByTimeDesc(FaceDetectLogReqQuery req);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user