From 64c9ab17a187d6087acbda902c01d14f5707922a Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Sun, 28 Jun 2020 16:34:36 +0800 Subject: [PATCH] 1.调整扣费业务支持feign调用 2.更新运营平台支持统一格式化时间 3.修改zuu网关,增加请求头doctorId字段,修改departmentId字段的取值 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java index 79457ae..c2fd96b 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java @@ -2,14 +2,17 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.kidgrow.common.model.SuperModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -32,17 +35,19 @@ /** * 科室ID */ + @JsonSerialize(using = ToStringSerializer.class) @NotEmpty(message = "科室ID不能为空") private Long departmentId; /** * 医生账户数量 */ - @NotEmpty(message = "医生账户数量不能为空") + @NotNull(message = "医生账户数量不能为空") private Integer doctorCount; /** * 服务到期时间 */ - @NotEmpty(message = "服务到期时间不能为空") + @NotNull(message = "服务到期时间不能为空") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date serverEndDate; /** * 累积读片量 -- Gitblit v1.8.0