init

.idea/encodings.xml

@@ -2,5 +2,9 @@
 <project version="4">
   <component name="Encoding" addBOMForNewFiles="with NO BOM">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/modules" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/modules/common" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/modules/filter" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/web" charset="UTF-8" />
   </component>
 </project>

web/src/main/java/com/zhehekeji/web/controller/OrderController.java

@@ -1,16 +1,19 @@
 package com.zhehekeji.web.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.zhehekeji.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
 import com.zhehekeji.filter.pojo.SessionHandler;
 import com.zhehekeji.filter.pojo.UserType;
 import com.zhehekeji.web.entity.Order;
+import com.zhehekeji.web.pojo.OrderSaveReq;
 import com.zhehekeji.web.pojo.OrderSearch;
 import com.zhehekeji.web.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -23,19 +26,26 @@ public class OrderController {
 
     @Resource
     private OrderService orderService;
+    @Resource
+    private ValidatorUtil validatorUtil;
+
+    @Value("${zhehe.filter.postToken}")
+    private String postToken;
 
     @ApiOperation("新增")
     @PostMapping("/")
     //@SessionHandler(userType = UserType.ACCOUNT)
-    public Result<Long> save(@RequestBody Order order){
+    public Result<Long> save(@RequestBody OrderSaveReq saveReq){
-
+        validatorUtil.validate(saveReq);
-        return Result.success(orderService.add(order));
+        Assert.isTrue(postToken.equals(saveReq.getToken()),"token不正确");
+        return Result.success(orderService.add(saveReq));
     }
 
     @PostMapping("/list")
     @ApiOperation(value = "查询")
     //@SessionHandler(userType = UserType.ACCOUNT)
     public Result<List<Order>> findRoleList(@RequestBody OrderSearch orderSearch) {
+        validatorUtil.validate(orderSearch);
         return new Result<>(orderService.orders(orderSearch));
     }
 

web/src/main/java/com/zhehekeji/web/entity/Order.java

@@ -15,6 +15,7 @@ public class Order {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty("流水号")
     private Long serialNum;
 
     @ApiModelProperty("订单号")
@@ -30,5 +31,7 @@ public class Order {
 
     private String deviceid;
 
+    private LocalDateTime execTime;
+
     private LocalDateTime createTime;
 }

web/src/main/java/com/zhehekeji/web/pojo/OrderSaveReq.java

@@ -0,0 +1,41 @@
+package com.zhehekeji.web.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Data
+public class OrderSaveReq {
+
+    @NotNull(message = "serialNum(流水号不能为空)")
+    private Long serialNum;
+
+    @ApiModelProperty("订单号")
+    @NotEmpty(message = "orderNum（订单号）不能为空")
+    private String orderNum;
+
+    @ApiModelProperty("仓位号")
+    @NotEmpty(message = "positionNum（仓位号）不能为空")
+    private String positionNum;
+
+    @ApiModelProperty("视频/图片地址")
+    private String filePath;
+
+    @ApiModelProperty("媒体类型  MP4 or jpg or ???")
+    private String mediaType;
+
+    @NotEmpty(message = "deviceid（设备）不能为空")
+    private String deviceid;
+
+    @ApiModelProperty("执行时间 形式：2019-09-09 12:12:12")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime execTime;
+
+    @ApiModelProperty("约定token")
+    @NotEmpty(message = "token不能为空")
+    private String token;
+}

web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java

@@ -7,5 +7,8 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class OrderSearch {
 
+    @NotEmpty(message = "订单号不能为空")
     private String orderNum;
+
+    private String deviceid;
 }

web/src/main/java/com/zhehekeji/web/service/OrderService.java

@@ -1,12 +1,18 @@
 package com.zhehekeji.web.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zhehekeji.core.util.Assert;
 import com.zhehekeji.web.entity.Order;
 import com.zhehekeji.web.mapper.OrderMapper;
+import com.zhehekeji.web.pojo.OrderSaveReq;
 import com.zhehekeji.web.pojo.OrderSearch;
+import org.springframework.beans.BeanUtils;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -16,12 +22,23 @@ public class OrderService {
     private OrderMapper orderMapper;
 
     public List<Order> orders(OrderSearch orderSearch){
-        List<Order> orders = orderMapper.selectList(new QueryWrapper<Order>().eq("order_num",orderSearch.getOrderNum()));
+        QueryWrapper<Order> queryWrapper = new QueryWrapper<Order>().eq("order_num",orderSearch.getOrderNum());
+        if(!StringUtils.isEmpty(orderSearch.getDeviceid())){
+            queryWrapper.eq("deviceid",orderSearch.getDeviceid());
+        }
+        List<Order> orders = orderMapper.selectList(queryWrapper);
         return orders;
     }
 
-    public Long add(Order order){
+    public Long add(OrderSaveReq saveReq){
-        orderMapper.insert(order);
+        Order order = new Order();
+        BeanUtils.copyProperties(saveReq,order);
+        order.setCreateTime(LocalDateTime.now());
+        try {
+            orderMapper.insert(order);
+        }catch (DuplicateKeyException e){
+            Assert.isTrue(false,"流水号不合法");
+        }
         return order.getId();
     }
 

web/src/main/resources/application-test.yml

@@ -28,5 +28,7 @@ zhehe:
       prefix: spring
   filter:
     enable: true
+    postToken: w89euijon2&UHBTY$%huni34ri
 server:
   port: 8099
+