From a58e748aea6c9026626cce0b3f26e67263a373e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= Date: Tue, 5 Jan 2021 18:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/controller/OrderController.java | 7 +++---- web/src/main/java/com/zhehekeji/web/entity/Camera.java | 2 ++ web/src/main/java/com/zhehekeji/web/entity/CameraIO.java | 2 ++ web/src/main/java/com/zhehekeji/web/entity/Order.java | 4 ++++ web/src/main/java/com/zhehekeji/web/entity/Street.java | 3 +++ .../main/java/com/zhehekeji/web/pojo/OrderSearch.java | 8 ++++++-- .../java/com/zhehekeji/web/service/OrderService.java | 9 ++++++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java index b0250d8..59800f3 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java @@ -60,9 +60,8 @@ public class OrderController { @ApiOperation("工单被告警打断") @GetMapping("/error") - public Result orderError(@ApiParam("工单号") @RequestParam String orderNum){ - //validatorUtil.validate(saveReq); - //Assert.isTrue(postToken.equals(saveReq.getToken()),"token不正确"); + public Result orderError(@ApiParam("工单号") @RequestParam String plcId){ + orderService.error(plcId); return Result.success(); } @@ -70,7 +69,7 @@ public class OrderController { @ApiOperation(value = "查询") //@SessionHandler public Result> orders(@RequestBody OrderSearch orderSearch) { - validatorUtil.validate(orderSearch); + //validatorUtil.validate(orderSearch); return Result.success(orderService.orders(orderSearch)); } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Camera.java b/web/src/main/java/com/zhehekeji/web/entity/Camera.java index 235088b..7a0408b 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Camera.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Camera.java @@ -3,6 +3,7 @@ package com.zhehekeji.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,5 +32,6 @@ public class Camera { @ApiModelProperty(value = "预置点 增长值",hidden = true) private Integer ptzId; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java b/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java index bc1aad0..a676fe8 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java +++ b/web/src/main/java/com/zhehekeji/web/entity/CameraIO.java @@ -3,6 +3,7 @@ package com.zhehekeji.web.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,5 +34,6 @@ public class CameraIO { private Integer ptzId; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Order.java b/web/src/main/java/com/zhehekeji/web/entity/Order.java index 7b0b5d3..fc677d6 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Order.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Order.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,9 +51,12 @@ public class Order { @ApiModelProperty("货位照片") private String goodsPath; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/web/src/main/java/com/zhehekeji/web/entity/Street.java b/web/src/main/java/com/zhehekeji/web/entity/Street.java index a07b650..9fd591a 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Street.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Street.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -67,7 +68,9 @@ public class Street { @TableField(strategy = FieldStrategy.IGNORED) private Integer camera2Id; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java index 70873bb..e0626be 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java @@ -1,8 +1,10 @@ package com.zhehekeji.web.pojo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotEmpty; +import java.time.LocalDateTime; @Data public class OrderSearch { @@ -10,7 +12,9 @@ public class OrderSearch { @NotEmpty(message = "订单号不能为空") private String orderNum; - private Long startTimestamp; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTimestamp; - private Long endTimestamp; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTimestamp; } diff --git a/web/src/main/java/com/zhehekeji/web/service/OrderService.java b/web/src/main/java/com/zhehekeji/web/service/OrderService.java index ac6b5cf..4a972c0 100644 --- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java +++ b/web/src/main/java/com/zhehekeji/web/service/OrderService.java @@ -16,6 +16,7 @@ import com.zhehekeji.web.pojo.OrderSearch; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -39,7 +40,13 @@ public class OrderService { private String mp4Path; public List orders(OrderSearch orderSearch) { - QueryWrapper queryWrapper = new QueryWrapper().eq("order_num", orderSearch.getOrderNum()); + QueryWrapper queryWrapper = new QueryWrapper(); + if(!StringUtils.isEmpty(orderSearch.getOrderNum())){ + queryWrapper.eq("order_num", orderSearch.getOrderNum()); + } + if(orderSearch.getStartTimestamp() != null && orderSearch.getEndTimestamp() != null){ + queryWrapper.between("create_time",orderSearch.getStartTimestamp(),orderSearch.getEndTimestamp()); + } List orders = orderMapper.selectList(queryWrapper); return orders; }