Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 场次 前端控制器
@@ -30,7 +32,7 @@ public class KylinTicketTimesPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次")
     @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
         return ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
     }
 
@@ -44,7 +46,7 @@ public class KylinTicketTimesPartnerController {
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次")
     @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
         return ticketTimesPartnerService.changeTimes(createTicketTimesParam);
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 票 前端控制器
@@ -30,14 +32,14 @@ public class KylinTicketsPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务")
     @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
         return ticketsPartnerService.createTicketSummary(ticketCreateParam);
     }
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改票务")
     @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
         return ticketsPartnerService.updateTicket(ticketCreateParam);
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ public class PerformancePartnerController {
     @PostMapping(value = "list")
     @ApiOperation(value = "演出列表")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody PerformancePartnerListParam performancePartnerListParam) {
+    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody @Valid PerformancePartnerListParam performancePartnerListParam) {
         return performancesPartnerService.getList(performancePartnerListParam);
     }
 
@@ -54,7 +55,7 @@ public class PerformancePartnerController {
     @PostMapping(value = "step1")
     @ApiOperation(value = "操作演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Map<String, String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
+    public ResponseDto<Map<String, String>> Step1(@RequestBody @Valid PerformanceStep1Param performanceStep1Param) {
         String result = performancesPartnerService.step1(performanceStep1Param);
         if (result.isEmpty()) {
             return ResponseDto.failure("操作失败");
@@ -71,7 +72,7 @@ public class PerformancePartnerController {
     @PostMapping(value = "step2")
     @ApiOperation(value = "操作演出第二步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> step2(@RequestBody PerformanceStep2Param performanceStep2Param) {
+    public ResponseDto<String> step2(@RequestBody @Valid PerformanceStep2Param performanceStep2Param) {
         return performancesPartnerService.step2(performanceStep2Param);
     }