Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: bf432223baae2ce514ca0c3584c9caf5ff6b4300
+  newTag: 2683db210415ee5fa4139688031516da9601eaf1

src/main/java/com/mmc/oms/controller/uav/UavCartController.java

 package com.mmc.oms.controller.uav;
 
+import com.mmc.oms.common.publicinterface.Page;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.controller.BaseController;
 import com.mmc.oms.feign.UserAppApi;
@@ -11,6 +12,7 @@ import com.mmc.oms.model.vo.uav.UavCartVO;
 import com.mmc.oms.service.uav.UavCartService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,7 +56,7 @@ public class UavCartController extends BaseController {
     @ApiOperation(value = "购物车列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavCartCompanyDTO.class)})
     @PostMapping("list")
-    public ResultBody list(@RequestBody UavCartQO uavCartQO,
+    public ResultBody list(@Validated(Page.class) @RequestBody UavCartQO uavCartQO,
                            HttpServletRequest request) {
         return uavCartService.list(uavCartQO, this.getCurrentAccount(request));
     }

src/main/java/com/mmc/oms/controller/uav/UavOrderController.java

 package com.mmc.oms.controller.uav;
 
+import com.mmc.oms.common.publicinterface.Page;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.controller.BaseController;
 import com.mmc.oms.model.dto.ContractInfoDTO;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -60,14 +62,14 @@ public class UavOrderController extends BaseController {
     @ApiOperation(value = "后台订单列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavOrderDTO.class)})
     @PostMapping("list")
-    public ResultBody<UavOrderDTO> list(@RequestBody UavOrderQO uavOrderQO, HttpServletRequest request) {
+    public ResultBody<UavOrderDTO> list(@Validated(Page.class) @RequestBody UavOrderQO uavOrderQO, HttpServletRequest request) {
         return uavOrderService.list(uavOrderQO, this.getCurrentAccount(request));
     }
 
     @ApiOperation(value = "个人订单列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavOrderDTO.class)})
     @PostMapping("listByUid")
-    public ResultBody<UavOrderDTO> listByUid(@RequestBody UavOrderQO uavOrderQO, HttpServletRequest request) {
+    public ResultBody<UavOrderDTO> listByUid(@Validated(Page.class) @RequestBody UavOrderQO uavOrderQO, HttpServletRequest request) {
         return uavOrderService.listByUid(uavOrderQO, this.getCurrentAccount(request));
     }
 

src/main/java/com/mmc/oms/controller/uav/UavPOController.java

 package com.mmc.oms.controller.uav;
 
+import com.mmc.oms.common.publicinterface.Page;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.controller.BaseController;
 import com.mmc.oms.model.dto.uav.UavPurchaseOrderDTO;
@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,7 +40,7 @@ public class UavPOController extends BaseController {
     @ApiOperation(value = "平台采购订单列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavPurchaseOrderDTO.class)})
     @PostMapping("listPurchaseOrder")
-    private ResultBody listPurchase(@RequestBody UavPOrderQO uavPOrderQO, HttpServletRequest request){
+    private ResultBody listPurchase(@Validated(Page.class) @RequestBody UavPOrderQO uavPOrderQO, HttpServletRequest request){
         return uavPOService.listPurchase(uavPOrderQO, this.getCurrentAccount(request));
     }