Merge remote-tracking branch 'origin/eitc-erm' into eitc-erm

eitc-manage/src/main/java/com/eitc/manage/controller/SysClinicInfoController.java

@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 

eitc-manage/src/main/java/com/eitc/manage/domain/SysClinicInfo.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 
@@ -39,48 +41,60 @@ public class SysClinicInfo extends EitcBaseEntity
 
     @TableField(value = "clinic_name")
     @ApiModelProperty(value = "诊所名称", name = "password")
+    @NotBlank(message = " 诊所名称不能为空")
     private String clinicName;
 
     @TableField(value = "clinic_ip")
     @ApiModelProperty(value = "服务IP", name = "clinicIp")
+    @NotBlank(message = " 服务器IP不能为空")
     private String clinicIp;
 
     @TableField(value = "server_user")
     @ApiModelProperty(value = "服务用户", name = "serverUser")
+    @NotBlank(message = " 服务器用户不能为空")
     private String serverUser;
 
     @TableField(value = "server_password")
     @ApiModelProperty(value = "服务密码", name = "serverPassword")
+    @NotBlank(message = " 服务器密码不能为空")
     private String serverPassword;
 
     @TableField(value = "realm_name")
     @ApiModelProperty(value = "诊所域名", name = "realmName")
+    @NotBlank(message = " 诊所域名不能为空")
     private String realmName;
 
     @TableField(value = "creat_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间", name = "creatTime")
+    @NotNull(message = "创建时间不能为空")
     private Date creatTime;
 
     @TableField(value = "expire_time")
     @ApiModelProperty(value = "到期时间", name = "expireTime")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "到期时间不能为空")
+//    @NotBlank(message = "到期时间不能为空")
     private Date expireTime;
 
     @TableField(value = "version_info")
     @ApiModelProperty(value = "版本信息", name = "versionInfo")
+    @NotBlank(message = "版本信息不能为空")
     private String versionInfo;
 
     @TableField(value = "region")
     @ApiModelProperty(value = "所在地区", name = "region")
+    @NotBlank(message = "所在地区不能为空")
     private String region;
 
     @TableField(value = "phone")
     @ApiModelProperty(value = "绑定手机", name = "phone")
+    @NotBlank(message = "手机号不能为空")
     private String phone;
 
     @TableField(value = "address")
     @ApiModelProperty(value = "详细地址", name = "address")
+    @NotBlank(message = "详细地址不能为空")
     private String address;
 
     @TableField(value = "status_int")
@@ -97,6 +111,7 @@ public class SysClinicInfo extends EitcBaseEntity
 
     @TableField(value = "version_refer")
     @ApiModelProperty(value = "版本描述", name = "VersionRefer")
+    @NotBlank(message = "版本描述不能为空")
     private String versionRefer;
 
     @TableField(value = "version_repair")