记得上下班打卡 | git大法好,push需谨慎

Commit 38d4a59b authored by zhengfuxin's avatar zhengfuxin

做效验

parent 8c0d33f2
...@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
...@@ -38,12 +40,14 @@ public class KylinRecommendActiveParam implements Serializable { ...@@ -38,12 +40,14 @@ public class KylinRecommendActiveParam implements Serializable {
*/ */
@ApiModelProperty(value = "开启时间yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开启时间yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR) @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
@NotNull(message = "开启时间必传")
private LocalDateTime startTime; private LocalDateTime startTime;
/** /**
* 结束时间 * 结束时间
*/ */
@ApiModelProperty(value = "结束时间yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束时间yyyy-MM-dd HH:mm:ss")
@NotNull(message = "结束时间必传")
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR) @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime endTime; private LocalDateTime endTime;
...@@ -51,18 +55,21 @@ public class KylinRecommendActiveParam implements Serializable { ...@@ -51,18 +55,21 @@ public class KylinRecommendActiveParam implements Serializable {
* 活动名称 * 活动名称
*/ */
@ApiModelProperty(value = "活动名称") @ApiModelProperty(value = "活动名称")
@NotBlank(message = "活动名称必传")
private String activeName; private String activeName;
/** /**
* 1NFT2组合购3演出4商品 * 1NFT2组合购3演出4商品
*/ */
@ApiModelProperty(value = "1NFT2组合购3演出4商品") @ApiModelProperty(value = "1NFT2组合购3演出4商品")
@NotNull(message = "关联类型必传")
private Integer activeType; private Integer activeType;
/** /**
* 活动绑定id * 活动绑定id
*/ */
@ApiModelProperty(value = "活动绑定id") @ApiModelProperty(value = "活动绑定id")
@NotBlank(message = "关联名称必传")
private String activeBindId; private String activeBindId;
/** /**
...@@ -89,6 +96,7 @@ public class KylinRecommendActiveParam implements Serializable { ...@@ -89,6 +96,7 @@ public class KylinRecommendActiveParam implements Serializable {
* 0开启,1未开启 * 0开启,1未开启
*/ */
@ApiModelProperty(value = "0开启,1未开启") @ApiModelProperty(value = "0开启,1未开启")
@NotNull(message = "状态必传")
private Integer status; private Integer status;
......
...@@ -40,6 +40,7 @@ public class KylinRecommendActiveRelationParam implements Serializable { ...@@ -40,6 +40,7 @@ public class KylinRecommendActiveRelationParam implements Serializable {
* 1NFT2组合购3演出4商品 * 1NFT2组合购3演出4商品
*/ */
@ApiModelProperty(value = "1NFT2组合购3演出4商品") @ApiModelProperty(value = "1NFT2组合购3演出4商品")
private Integer type; private Integer type;
/** /**
......
...@@ -14,6 +14,9 @@ import io.swagger.annotations.Api; ...@@ -14,6 +14,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -93,7 +96,14 @@ public class KylinRecommendActiveController extends BaseController { ...@@ -93,7 +96,14 @@ public class KylinRecommendActiveController extends BaseController {
@PostMapping("updateKylinRecommendActive") @PostMapping("updateKylinRecommendActive")
@ApiOperation(value = "修改活动") @ApiOperation(value = "修改活动")
@ResponseBody @ResponseBody
public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) { public AjaxResult updateKylinRecommendActive(@Validated @RequestBody KylinRecommendActiveParam kylinRecommendActiveParam, BindingResult result) {
/*BindingResult result = exception.getBindingResult();*/
if (result!=null&&result.hasErrors()) {
List<ObjectError> errors = result.getAllErrors();
if (errors != null) {
return AjaxResult.error(errors.get(0).getDefaultMessage());
}
}
KylinRecommendActive kylinRecommendActive = new KylinRecommendActive(); KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive); BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) { if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment