From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java | 98 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 46 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 7b51771..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
@@ -1,25 +1,28 @@
package com.kidgrow.oprationcenter.model;
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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.*;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 医院服务信息表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:04 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,43 +30,46 @@
@AllArgsConstructor
@TableName("business_server")
public class BusinessServer extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 医生账户数量
- */
- @NotBlank(message = "医生账户数量不能为空")
- private Integer doctorCount;
- /**
- * 服务到期时间
- */
- @NotBlank(message = "服务到期时间不能为空")
- private Date serverEndDate;
- /**
- * 累积读片量
- */
- private Long totalRayCount;
- /**
- * 累积报告量
- */
- private Long totalRecordCount;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Boolean enabled;
- }
+ /**
+ * 科室ID
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 医生账户数量
+ */
+ @NotNull(message = "医生账户数量不能为空")
+ private Integer doctorCount;
+ /**
+ * 服务到期时间
+ */
+ @NotNull(message = "服务到期时间不能为空")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date serverEndDate;
+ /**
+ * 累积读片量
+ */
+ private Long totalRayCount;
+ /**
+ * 累积报告量
+ */
+ private Long totalRecordCount;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
--
Gitblit v1.8.0