From 91f173b2090c9125e1bdc83c17ad8ef05ee8cf7f Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 03 Apr 2020 14:32:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysLogger.java | 79
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 64
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysLogger.java | 80
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java | 7
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorAnswer.java | 37
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/MybatisPlusConfig.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessServer.java | 91 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/WebMvcConfig.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java | 132 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java | 45
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java | 27
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/PasswordConfig.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java | 9
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java | 182 ++--
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java | 79
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 7
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java | 126 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 110 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java | 27
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java | 25
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java | 118 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/ExceptionAdvice.java | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 7
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorServer.java | 63
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDictionaries.java | 50
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java | 64
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java | 108 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorSigning.java | 28
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java | 9
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java | 100 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java | 79
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java | 91 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java | 9
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java | 122 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 27
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java | 130 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 93 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 7
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java | 76
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java | 9
/dev/null | 39
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/AsycTaskExecutorConfig.java | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java | 111 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java | 25
49 files changed, 1,317 insertions(+), 1,230 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
index 65d83c4..d2f1139 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
@@ -6,15 +6,16 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 业务操作记录<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,47 +23,47 @@
@AllArgsConstructor
@TableName("business_records")
public class BusinessRecords extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 记录标题
- */
- @NotBlank(message = "记录标题不能为空")
- private String recordTitle;
- /**
- * 操作人ID
- */
- @NotBlank(message = "操作人ID不能为空")
- private Long userId;
- /**
- * 操作人姓名
- */
- @NotBlank(message = "操作人姓名不能为空")
- private String userName;
- /**
- * 应用ID
- */
- @NotBlank(message = "应用ID不能为空")
- private Long appId;
- /**
- * 应用名称
- */
- @NotBlank(message = "应用名称不能为空")
- private String appName;
- /**
- * ip
- */
- private String recordIp;
- /**
- * 业务操作记录详情
- */
- private String recordDetail;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 记录标题
+ */
+ @NotEmpty(message = "记录标题不能为空")
+ private String recordTitle;
+ /**
+ * 操作人ID
+ */
+ @NotEmpty(message = "操作人ID不能为空")
+ private Long userId;
+ /**
+ * 操作人姓名
+ */
+ @NotEmpty(message = "操作人姓名不能为空")
+ private String userName;
+ /**
+ * 应用ID
+ */
+ @NotEmpty(message = "应用ID不能为空")
+ private Long appId;
+ /**
+ * 应用名称
+ */
+ @NotEmpty(message = "应用名称不能为空")
+ private String appName;
+ /**
+ * ip
+ */
+ private String recordIp;
+ /**
+ * 业务操作记录详情
+ */
+ private String recordDetail;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
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..bbe86f9 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,24 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
+
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 +26,43 @@
@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
+ */
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 医生账户数量
+ */
+ @NotEmpty(message = "医生账户数量不能为空")
+ private Integer doctorCount;
+ /**
+ * 服务到期时间
+ */
+ @NotEmpty(message = "服务到期时间不能为空")
+ private Date serverEndDate;
+ /**
+ * 累积读片量
+ */
+ private Long totalRayCount;
+ /**
+ * 累积报告量
+ */
+ private Long totalRecordCount;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
index 5df129b..f32429d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java
@@ -1,25 +1,23 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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 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,64 +25,64 @@
@AllArgsConstructor
@TableName("data_need")
public class DataNeed extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 需求类型 0就诊数据 1筛查
- */
- @NotBlank(message = "需求类型 0就诊数据 1筛查不能为空")
- private Integer needType;
- /**
- * 提需求的医生
- */
- @NotBlank(message = "提需求的医生不能为空")
- private Long doctorId;
- /**
- * 医生姓名
- */
- @NotBlank(message = "医生姓名不能为空")
- private String doctorName;
- /**
- * 医院名称
- */
- private String hospitalName;
- /**
- * 科室名称
- */
- private String departmentName;
- /**
- * 医生连续方式
- */
- private String doctorTel;
- /**
- * 需求数据的开始时间
- */
- @NotBlank(message = "需求数据的开始时间不能为空")
- private Date needBegintime;
- /**
- * 需求数据的结束时间
- */
- @NotBlank(message = "需求数据的结束时间不能为空")
- private Date needEndtime;
- /**
- * 需求标签
- */
- @NotBlank(message = "需求标签不能为空")
- private String needTags;
- /**
- * 是否删除，1删除（已下载），0未删除（未下载）
- */
- private Boolean isDel;
- /**
- * 文件路径
- */
- private String dataFile;
- /**
- * 下载时间
- */
- private Date downTime;
- /**
- * 状态，1已上传了数据文件，0未处理
- */
- private Boolean enabled;
- }
+ /**
+ * 需求类型 0就诊数据 1筛查
+ */
+ @NotEmpty(message = "需求类型 0就诊数据 1筛查不能为空")
+ private Integer needType;
+ /**
+ * 提需求的医生
+ */
+ @NotEmpty(message = "提需求的医生不能为空")
+ private Long doctorId;
+ /**
+ * 医生姓名
+ */
+ @NotEmpty(message = "医生姓名不能为空")
+ private String doctorName;
+ /**
+ * 医院名称
+ */
+ private String hospitalName;
+ /**
+ * 科室名称
+ */
+ private String departmentName;
+ /**
+ * 医生连续方式
+ */
+ private String doctorTel;
+ /**
+ * 需求数据的开始时间
+ */
+ @NotEmpty(message = "需求数据的开始时间不能为空")
+ private Date needBegintime;
+ /**
+ * 需求数据的结束时间
+ */
+ @NotEmpty(message = "需求数据的结束时间不能为空")
+ private Date needEndtime;
+ /**
+ * 需求标签
+ */
+ @NotEmpty(message = "需求标签不能为空")
+ private String needTags;
+ /**
+ * 是否删除，1删除（已下载），0未删除（未下载）
+ */
+ private Boolean isDel;
+ /**
+ * 文件路径
+ */
+ private String dataFile;
+ /**
+ * 下载时间
+ */
+ private Date downTime;
+ /**
+ * 状态，1已上传了数据文件，0未处理
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorAnswer.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorAnswer.java
index 5a06127..cedd506 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorAnswer.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorAnswer.java
@@ -1,25 +1,22 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 医答医生信息表-未完待续<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,16 +24,16 @@
@AllArgsConstructor
@TableName("doctor_answer")
public class DoctorAnswer extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Boolean enabled;
- }
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorServer.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorServer.java
index a7e5a2b..d89f08c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorServer.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorServer.java
@@ -1,25 +1,22 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 医生业务服务信息表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,29 +24,29 @@
@AllArgsConstructor
@TableName("doctor_server")
public class DoctorServer extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 是否医答医生 0否1是
- */
- private Boolean isAnswer;
- /**
- * 是否签约医生 0否1是
- */
- private Boolean isSigning;
- /**
- * 医生状态 1正常 0试用
- */
- @NotBlank(message = "医生状态 1正常 0试用不能为空")
- private Boolean doctorState;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Boolean enabled;
- }
+ /**
+ * 是否医答医生 0否1是
+ */
+ private Boolean isAnswer;
+ /**
+ * 是否签约医生 0否1是
+ */
+ private Boolean isSigning;
+ /**
+ * 医生状态 1正常 0试用
+ */
+ @NotEmpty(message = "医生状态 1正常 0试用不能为空")
+ private Boolean doctorState;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorSigning.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorSigning.java
index d58f7fd..0efd75b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorSigning.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorSigning.java
@@ -11,15 +11,17 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.*;
+
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 签约医生信息表-未完待续<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,16 +29,16 @@
@AllArgsConstructor
@TableName("doctor_signing")
public class DoctorSigning extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Boolean enabled;
- }
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
index 7cbf0ad..8d1ebf5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
@@ -1,25 +1,21 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 医生的模板<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,63 +23,63 @@
@AllArgsConstructor
@TableName("doctor_templete")
public class DoctorTemplete extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 医院标识id
- */
- @NotBlank(message = "医院标识id不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- @NotBlank(message = "医院名称不能为空")
- private String hospitalName;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 科室名称
- */
- @NotBlank(message = "科室名称不能为空")
- private String departmentName;
- /**
- * 医生id
- */
- @NotBlank(message = "医生id不能为空")
- private Long doctorId;
- /**
- * 医生姓名
- */
- @NotBlank(message = "医生姓名不能为空")
- private String doctorName;
- /**
- * 公开类型 0公开 1私有
- */
- private Boolean publicType;
- /**
- * 模板分类 0结论 1建议 2方案
- */
- private Integer templeteType;
- /**
- * 模板标题
- */
- @NotBlank(message = "模板标题不能为空")
- private String templeteTitle;
- /**
- * 模板内容
- */
- @NotBlank(message = "模板内容不能为空")
- private String templeteNote;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 医院标识id
+ */
+ @NotEmpty(message = "医院标识id不能为空")
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ @NotEmpty(message = "医院名称不能为空")
+ private String hospitalName;
+ /**
+ * 科室ID
+ */
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departmentName;
+ /**
+ * 医生id
+ */
+ @NotEmpty(message = "医生id不能为空")
+ private Long doctorId;
+ /**
+ * 医生姓名
+ */
+ @NotEmpty(message = "医生姓名不能为空")
+ private String doctorName;
+ /**
+ * 公开类型 0公开 1私有
+ */
+ private Boolean publicType;
+ /**
+ * 模板分类 0结论 1建议 2方案
+ */
+ private Integer templeteType;
+ /**
+ * 模板标题
+ */
+ @NotEmpty(message = "模板标题不能为空")
+ private String templeteTitle;
+ /**
+ * 模板内容
+ */
+ @NotEmpty(message = "模板内容不能为空")
+ private String templeteNote;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
index c296fdb..d856b5d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
@@ -1,25 +1,22 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 筛查医院信息表-未完待续<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,37 +24,37 @@
@AllArgsConstructor
@TableName("hospital_screening")
public class HospitalScreening extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 医院ID
- */
- @NotBlank(message = "医院ID不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- private String hospitalName;
- /**
- * 医院logo
- */
- private String hospitalLogo;
- /**
- * 筛查二维码图片
- */
- private String hospitalQrImage;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Boolean enabled;
- }
+ /**
+ * 医院ID
+ */
+ @NotEmpty(message = "医院ID不能为空")
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ private String hospitalName;
+ /**
+ * 医院logo
+ */
+ private String hospitalLogo;
+ /**
+ * 筛查二维码图片
+ */
+ private String hospitalQrImage;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
index a1cae89..32c138c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
@@ -1,25 +1,23 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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 java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 产品的充值记录-订单<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,57 +25,57 @@
@AllArgsConstructor
@TableName("product_order")
public class ProductOrder extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 医院标识id
- */
- @NotBlank(message = "医院标识id不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- @NotBlank(message = "医院名称不能为空")
- private String hospitalName;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 科室名称
- */
- @NotBlank(message = "科室名称不能为空")
- private String departmentName;
- /**
- * 合同编号
- */
- @NotBlank(message = "合同编号不能为空")
- private String contractNo;
- /**
- * 合同名称
- */
- @NotBlank(message = "合同名称不能为空")
- private String contractTitle;
- /**
- * 合同开始时间
- */
- private Date contractBeginTime;
- /**
- * 合同结束时间
- */
- private Date contractEndTime;
- /**
- * 合同签订日期
- */
- private Date contractTime;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 医院标识id
+ */
+ @NotEmpty(message = "医院标识id不能为空")
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ @NotEmpty(message = "医院名称不能为空")
+ private String hospitalName;
+ /**
+ * 科室ID
+ */
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departmentName;
+ /**
+ * 合同编号
+ */
+ @NotEmpty(message = "合同编号不能为空")
+ private String contractNo;
+ /**
+ * 合同名称
+ */
+ @NotEmpty(message = "合同名称不能为空")
+ private String contractTitle;
+ /**
+ * 合同开始时间
+ */
+ private Date contractBeginTime;
+ /**
+ * 合同结束时间
+ */
+ private Date contractEndTime;
+ /**
+ * 合同签订日期
+ */
+ private Date contractTime;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index 2929570..5865e22 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -1,25 +1,23 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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 java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 产品/明显的充值记录<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,53 +25,53 @@
@AllArgsConstructor
@TableName("product_order_detail")
public class ProductOrderDetail extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 对应product_order表中的id
- */
- @NotBlank(message = "对应product_order表中的id不能为空")
- private Long orderId;
- /**
- * 产品/明细ID
- */
- @NotBlank(message = "产品/明细ID不能为空")
- private Long proId;
- /**
- * 产品/明细名称
- */
- @NotBlank(message = "产品/明细名称不能为空")
- private String proName;
- /**
- * 是否共享 0否 1是
- */
- @NotBlank(message = "是否共享 0否 1是不能为空")
- private Boolean isShare;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 读片量
- */
- @NotBlank(message = "读片量不能为空")
- private Integer ailightCount;
- /**
- * 报告量
- */
- @NotBlank(message = "报告量不能为空")
- private Integer recordCount;
- /**
- * 有效的开始时间
- */
- private Date proBegintime;
- /**
- * 有效的结束时间
- */
- private Date proEndtime;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 对应product_order表中的id
+ */
+ @NotEmpty(message = "对应product_order表中的id不能为空")
+ private Long orderId;
+ /**
+ * 产品/明细ID
+ */
+ @NotEmpty(message = "产品/明细ID不能为空")
+ private Long proId;
+ /**
+ * 产品/明细名称
+ */
+ @NotEmpty(message = "产品/明细名称不能为空")
+ private String proName;
+ /**
+ * 是否共享 0否 1是
+ */
+ @NotEmpty(message = "是否共享 0否 1是不能为空")
+ private Boolean isShare;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Boolean isDel;
+ /**
+ * 读片量
+ */
+ @NotEmpty(message = "读片量不能为空")
+ private Integer ailightCount;
+ /**
+ * 报告量
+ */
+ @NotEmpty(message = "报告量不能为空")
+ private Integer recordCount;
+ /**
+ * 有效的开始时间
+ */
+ private Date proBegintime;
+ /**
+ * 有效的结束时间
+ */
+ private Date proEndtime;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
index ae77fb9..639fef6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
@@ -1,25 +1,21 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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,52 +23,52 @@
@AllArgsConstructor
@TableName("sys_feedback")
public class SysFeedback extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 提需求的医生
- */
- @NotBlank(message = "提需求的医生不能为空")
- private Long doctorId;
- /**
- * 医生姓名
- */
- @NotBlank(message = "医生姓名不能为空")
- private String doctorName;
- /**
- * 医生联系方式
- */
- private String doctorTel;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 科室名称
- */
- @NotBlank(message = "科室名称不能为空")
- private String departmentName;
- /**
- * 医院标识id
- */
- @NotBlank(message = "医院标识id不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- private String hospitalName;
- /**
- * 反馈的意见内容
- */
- @NotBlank(message = "反馈的意见内容不能为空")
- private String feedbackNote;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1已查收，0未处理
- */
- private Boolean enabled;
- }
+ /**
+ * 提需求的医生
+ */
+ @NotEmpty(message = "提需求的医生不能为空")
+ private Long doctorId;
+ /**
+ * 医生姓名
+ */
+ @NotEmpty(message = "医生姓名不能为空")
+ private String doctorName;
+ /**
+ * 医生联系方式
+ */
+ private String doctorTel;
+ /**
+ * 科室ID
+ */
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departmentName;
+ /**
+ * 医院标识id
+ */
+ @NotEmpty(message = "医院标识id不能为空")
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ private String hospitalName;
+ /**
+ * 反馈的意见内容
+ */
+ @NotEmpty(message = "反馈的意见内容不能为空")
+ private String feedbackNote;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1已查收，0未处理
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysLogger.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysLogger.java
index 7348fd2..87c1777 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysLogger.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysLogger.java
@@ -7,14 +7,16 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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)
@@ -22,42 +24,42 @@
@AllArgsConstructor
@TableName("sys_logger")
public class SysLogger extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 应用名
- */
- private String applicationName;
- /**
- * 类名
- */
- @NotBlank(message = "类名不能为空")
- private String className;
- /**
- * 方法名
- */
- @NotBlank(message = "方法名不能为空")
- private String methodName;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 用户名
- */
- private String userName;
- /**
- * 租户id
- */
- private String clientId;
- /**
- * 操作信息
- */
- @NotBlank(message = "操作信息不能为空")
- private String operation;
- /**
- * 创建时间
- */
- @NotBlank(message = "创建时间不能为空")
- private String timestamp;
- }
+ /**
+ * 应用名
+ */
+ private String applicationName;
+ /**
+ * 类名
+ */
+ @NotEmpty(message = "类名不能为空")
+ private String className;
+ /**
+ * 方法名
+ */
+ @NotEmpty(message = "方法名不能为空")
+ private String methodName;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 用户名
+ */
+ private String userName;
+ /**
+ * 租户id
+ */
+ private String clientId;
+ /**
+ * 操作信息
+ */
+ @NotEmpty(message = "操作信息不能为空")
+ private String operation;
+ /**
+ * 创建时间
+ */
+ @NotEmpty(message = "创建时间不能为空")
+ private String timestamp;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
index 4c30319..f822277 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
@@ -1,26 +1,23 @@
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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+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 java.math.BigDecimal;
-import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: <br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -28,44 +25,44 @@
@AllArgsConstructor
@TableName("sys_product")
public class SysProduct extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 产品名称
- */
- @NotBlank(message = "产品名称不能为空")
- private String proName;
- /**
- * 时长(天)
- */
- @NotBlank(message = "时长(天)不能为空")
- private Integer proTime;
- /**
- * 产品类型 0试用 1正式
- */
- @NotBlank(message = "产品类型 0试用 1正式不能为空")
- private Integer proType;
- /**
- * 建议售价
- */
- @NotBlank(message = "建议售价不能为空")
- private BigDecimal proPrice;
- /**
- * 报告量
- */
- @NotBlank(message = "报告量不能为空")
- private Integer recordCount;
- /**
- * 读片量
- */
- @NotBlank(message = "读片量不能为空")
- private Integer ailightCount;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 产品名称
+ */
+ @NotEmpty(message = "产品名称不能为空")
+ private String proName;
+ /**
+ * 时长(天)
+ */
+ @NotEmpty(message = "时长(天)不能为空")
+ private Integer proTime;
+ /**
+ * 产品类型 0试用 1正式
+ */
+ @NotEmpty(message = "产品类型 0试用 1正式不能为空")
+ private Integer proType;
+ /**
+ * 建议售价
+ */
+ @NotEmpty(message = "建议售价不能为空")
+ private BigDecimal proPrice;
+ /**
+ * 报告量
+ */
+ @NotEmpty(message = "报告量不能为空")
+ private Integer recordCount;
+ /**
+ * 读片量
+ */
+ @NotEmpty(message = "读片量不能为空")
+ private Integer ailightCount;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/AsycTaskExecutorConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/AsycTaskExecutorConfig.java
similarity index 91%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/AsycTaskExecutorConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/AsycTaskExecutorConfig.java
index b2b5f5b..edc75ef 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/AsycTaskExecutorConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/AsycTaskExecutorConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.config;
+package com.kidgrow.oprationcenter.config;
import com.kidgrow.common.config.DefaultAsycTaskConfig;
import org.springframework.context.annotation.Configuration;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/ExceptionAdvice.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/ExceptionAdvice.java
similarity index 89%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/ExceptionAdvice.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/ExceptionAdvice.java
index 4cf40d3..c18a569 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/ExceptionAdvice.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/ExceptionAdvice.java
@@ -1,4 +1,4 @@
-package com.kidgrow.config;
+package com.kidgrow.oprationcenter.config;
import com.kidgrow.common.exception.DefaultExceptionAdvice;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/MybatisPlusConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/MybatisPlusConfig.java
similarity index 92%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/MybatisPlusConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/MybatisPlusConfig.java
index 45a449b..ae4c8a1 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/MybatisPlusConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.config;
+package com.kidgrow.oprationcenter.config;
import com.kidgrow.db.config.DefaultMybatisPlusConfig;
import org.mybatis.spring.annotation.MapperScan;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/PasswordConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/PasswordConfig.java
similarity index 90%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/PasswordConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/PasswordConfig.java
index 01065c2..6db946b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/PasswordConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/PasswordConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.config;
+package com.kidgrow.oprationcenter.config;
import com.kidgrow.common.config.DefaultPasswordConfig;
import org.springframework.context.annotation.Configuration;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/WebMvcConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/WebMvcConfig.java
similarity index 90%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/WebMvcConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/WebMvcConfig.java
index 691c583..23bedfa 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/config/WebMvcConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/WebMvcConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.config;
+package com.kidgrow.oprationcenter.config;
import com.kidgrow.common.config.DefaultWebMvcConfig;
import org.springframework.context.annotation.Configuration;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
index a4948bc..eaa2068 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
@@ -1,27 +1,24 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.oprationcenter.model.BusinessServer;
+import com.kidgrow.oprationcenter.service.IBusinessServerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.BusinessServer;
-import com.kidgrow.oprationcenter.service.IBusinessServerService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,9 +80,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody BusinessServer businessServer, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= businessServerService.saveOrUpdate(businessServer);
if(v) {
return ResultBody.ok().data(businessServer).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
index 5d290e6..a1bc29d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody DoctorAnswer doctorAnswer, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= doctorAnswerService.saveOrUpdate(doctorAnswer);
if(v) {
return ResultBody.ok().data(doctorAnswer).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
index 9bd1765..e442dcd 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
@@ -1,27 +1,24 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.oprationcenter.model.DoctorServer;
+import com.kidgrow.oprationcenter.service.IDoctorServerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.DoctorServer;
-import com.kidgrow.oprationcenter.service.IDoctorServerService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,9 +80,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody DoctorServer doctorServer, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= doctorServerService.saveOrUpdate(doctorServer);
if(v) {
return ResultBody.ok().data(doctorServer).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
index ccd31cc..b2b3896 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody DoctorSigning doctorSigning, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= doctorSigningService.saveOrUpdate(doctorSigning);
if(v) {
return ResultBody.ok().data(doctorSigning).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
index bfe29d1..b4ddbb5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody DoctorTemplete doctorTemplete, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= doctorTempleteService.saveOrUpdate(doctorTemplete);
if(v) {
return ResultBody.ok().data(doctorTemplete).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
index ee98548..21a70fd 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody HospitalScreening hospitalScreening, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= hospitalScreeningService.saveOrUpdate(hospitalScreening);
if(v) {
return ResultBody.ok().data(hospitalScreening).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index 33628fa..c01aee6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= productOrderService.saveOrUpdate(productOrder);
if(v) {
return ResultBody.ok().data(productOrder).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index ca48f4a..863c578 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= productOrderDetailService.saveOrUpdate(productOrderDetail);
if(v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
index 3bead1d..5376e06 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= sysFeedbackService.saveOrUpdate(sysFeedback);
if(v) {
return ResultBody.ok().data(sysFeedback).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java
index c0c6375..ee6f3b1 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,9 +84,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysLogger sysLogger, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= sysLoggerService.saveOrUpdate(sysLogger);
if(v) {
return ResultBody.ok().data(sysLogger).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
index 9ab2466..dea3751 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
@@ -1,27 +1,24 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.oprationcenter.model.SysProduct;
+import com.kidgrow.oprationcenter.service.ISysProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.SysProduct;
-import com.kidgrow.oprationcenter.service.ISysProductService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,9 +80,13 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= sysProductService.saveOrUpdate(sysProduct);
if(v) {
return ResultBody.ok().data(sysProduct).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java
index 2dd07ff..7b93ba0 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java
@@ -9,11 +9,12 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 省市区数据表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,42 +22,42 @@
@AllArgsConstructor
@TableName("sys_area")
public class SysArea extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 区域名称
- */
- private String areaName;
- /**
- * 父级区域id
- */
- private Long areaParentId;
- /**
- * 简称
- */
- private String areaShortname;
- /**
- * 省市区级别
- */
- private Integer areaLeveltype;
- /**
- * 区号
- */
- private String areaCitycode;
- /**
- * 邮编
- */
- private String areaZipcode;
- /**
- * 纬度
- */
- private String areaLng;
- /**
- * 经度
- */
- private String areaLat;
- /**
- * 名称拼音
- */
- private String areaCh;
- }
+ /**
+ * 区域名称
+ */
+ private String areaName;
+ /**
+ * 父级区域id
+ */
+ private Long areaParentId;
+ /**
+ * 简称
+ */
+ private String areaShortname;
+ /**
+ * 省市区级别
+ */
+ private Integer areaLeveltype;
+ /**
+ * 区号
+ */
+ private String areaCitycode;
+ /**
+ * 邮编
+ */
+ private String areaZipcode;
+ /**
+ * 纬度
+ */
+ private String areaLng;
+ /**
+ * 经度
+ */
+ private String areaLat;
+ /**
+ * 名称拼音
+ */
+ private String areaCh;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
index 9dc789c..d75c4b1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 公司信息表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,48 +23,48 @@
@AllArgsConstructor
@TableName("sys_company")
public class SysCompany extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 组织id
- */
- @NotBlank(message = "组织id不能为空")
- private Long orgId;
- /**
- * 公司名称
- */
- @NotBlank(message = "公司名称不能为空")
- private String companyName;
- /**
- * 公司所在区域编号
- */
- private Long companyArea;
- /**
- * 公司联系电话
- */
- private String companyTel;
- /**
- * 公司地址
- */
- private String companyAdress;
- /**
- * 公司logo
- */
- private String companyLogo;
- /**
- * 公司简介
- */
- private String companyAbout;
- /**
- * 租户字段
- */
- private String tenantId;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- }
+ /**
+ * 组织id
+ */
+ @NotEmpty(message = "组织id不能为空")
+ private Long orgId;
+ /**
+ * 公司名称
+ */
+ @NotEmpty(message = "公司名称不能为空")
+ private String companyName;
+ /**
+ * 公司所在区域编号
+ */
+ private Long companyArea;
+ /**
+ * 公司联系电话
+ */
+ private String companyTel;
+ /**
+ * 公司地址
+ */
+ private String companyAdress;
+ /**
+ * 公司logo
+ */
+ private String companyLogo;
+ /**
+ * 公司简介
+ */
+ private String companyAbout;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index b78ca62..efa6b8c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -11,15 +11,17 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.*;
+
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 科室表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,34 +29,34 @@
@AllArgsConstructor
@TableName("sys_department")
public class SysDepartment extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 科室/部门名称 同组织名称
- */
- @NotBlank(message = "科室/部门名称 同组织名称不能为空")
- private String departmentName;
- /**
- * 组织Id
- */
- @NotBlank(message = "组织Id不能为空")
- private Long orgId;
- /**
- * 负责的销售代表
- */
- @NotBlank(message = "负责的销售代表不能为空")
- private Long serverUserId;
- /**
- * 销售代表的名字
- */
- @NotBlank(message = "销售代表的名字不能为空")
- private String serverUserName;
- /**
- * 科室/部门简介
- */
- private String departmentAbout;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 科室/部门名称 同组织名称
+ */
+ @NotEmpty(message = "科室/部门名称 同组织名称不能为空")
+ private String departmentName;
+ /**
+ * 组织Id
+ */
+ @NotEmpty(message = "组织Id不能为空")
+ private Long orgId;
+ /**
+ * 负责的销售代表
+ */
+ @NotEmpty(message = "负责的销售代表不能为空")
+ private Long serverUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String serverUserName;
+ /**
+ * 科室/部门简介
+ */
+ private String departmentAbout;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDictionaries.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDictionaries.java
index e17e06b..a04cd74 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDictionaries.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDictionaries.java
@@ -11,15 +11,17 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.*;
+
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 系统字典表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,27 +29,27 @@
@AllArgsConstructor
@TableName("sys_dictionaries")
public class SysDictionaries extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 字典值
- */
- @NotBlank(message = "字典值不能为空")
- private String dictionariesName;
- /**
- * 字典归属分类的标识(如果这个字典项是分类，则该字段为空)
- */
- private String dictionariesClassId;
- /**
- * 字段排序 默认0
- */
- private Integer dictionariesOrder;
- /**
- * 是否删除，1删除，0未删除
- */
- private Integer isDel;
- /**
- * 状态，1启用，0停用
- */
- private Integer enabled;
- }
+ /**
+ * 字典值
+ */
+ @NotEmpty(message = "字典值不能为空")
+ private String dictionariesName;
+ /**
+ * 字典归属分类的标识(如果这个字典项是分类，则该字段为空)
+ */
+ private String dictionariesClassId;
+ /**
+ * 字段排序 默认0
+ */
+ private Integer dictionariesOrder;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Integer isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Integer enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
index 2eda579..1927292 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: <br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,89 +23,89 @@
@AllArgsConstructor
@TableName("sys_doctor")
public class SysDoctor extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 关联的登录帐号ID
- */
- private Long userId;
- /**
- * 所属医院ID
- */
- @NotBlank(message = "所属医院ID不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- @NotBlank(message = "医院名称不能为空")
- private String hospitalName;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 科室名称
- */
- @NotBlank(message = "科室名称不能为空")
- private String departmentName;
- /**
- * 医生姓名
- */
- @NotBlank(message = "医生姓名不能为空")
- private String doctorName;
- /**
- * 医生的头像
- */
- private String doctorLogo;
- /**
- * 医生联系方式
- */
- @NotBlank(message = "医生联系方式不能为空")
- private String doctorTel;
- /**
- * 职称ID
- */
- private Long doctorRankId;
- /**
- * 职称
- */
- private String doctorRank;
- /**
- * 医生其它联系方式
- */
- private String doctorOtherLink;
- /**
- * 医生的email
- */
- private String doctorEmail;
- /**
- * 医生简介
- */
- private String doctorAbout;
- /**
- * 是否医答医生 0否1是
- */
- private Boolean isAnswer;
- /**
- * 是否签约医生 0否1是
- */
- private Boolean isSigning;
- /**
- * 是否置顶 0否1是
- */
- private Boolean isTop;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 医生状态 1正常 0试用
- */
- @NotBlank(message = "医生状态 1正常 0试用不能为空")
- private Boolean doctorState;
- /**
- * 启用禁用状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 关联的登录帐号ID
+ */
+ private Long userId;
+ /**
+ * 所属医院ID
+ */
+ @NotEmpty(message = "所属医院ID不能为空")
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ @NotEmpty(message = "医院名称不能为空")
+ private String hospitalName;
+ /**
+ * 科室ID
+ */
+ @NotEmpty(message = "科室ID不能为空")
+ private Long departmentId;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departmentName;
+ /**
+ * 医生姓名
+ */
+ @NotEmpty(message = "医生姓名不能为空")
+ private String doctorName;
+ /**
+ * 医生的头像
+ */
+ private String doctorLogo;
+ /**
+ * 医生联系方式
+ */
+ @NotEmpty(message = "医生联系方式不能为空")
+ private String doctorTel;
+ /**
+ * 职称ID
+ */
+ private Long doctorRankId;
+ /**
+ * 职称
+ */
+ private String doctorRank;
+ /**
+ * 医生其它联系方式
+ */
+ private String doctorOtherLink;
+ /**
+ * 医生的email
+ */
+ private String doctorEmail;
+ /**
+ * 医生简介
+ */
+ private String doctorAbout;
+ /**
+ * 是否医答医生 0否1是
+ */
+ private Boolean isAnswer;
+ /**
+ * 是否签约医生 0否1是
+ */
+ private Boolean isSigning;
+ /**
+ * 是否置顶 0否1是
+ */
+ private Boolean isTop;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 医生状态 1正常 0试用
+ */
+ @NotEmpty(message = "医生状态 1正常 0试用不能为空")
+ private Boolean doctorState;
+ /**
+ * 启用禁用状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
index 53d9055..6a9967e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
@@ -6,15 +6,15 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
*
* @version 1.0
- * @Description: <br>
+ * @Description: 医院基础信息表<br>
* @Project: 用户中心<br>
- * @CreateDate: Created in 2020-03-11 14:26:59 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
*/
@Data
@@ -26,20 +26,113 @@
private static final long serialVersionUID = 1L;
/**
- * 医院名称
+ * 医院名称 同组织名字
*/
- @NotBlank(message = "医院名称不能为空")
+ @NotEmpty(message = "医院名称 同组织名字不能为空")
private String hospitalName;
/**
- * 是否删除，1删除，0未删除
+ * 组织ID
*/
- private Integer isDel;
+ @NotEmpty(message = "组织ID不能为空")
+ private Long orgId;
+ /**
+ * 医院简称
+ */
+ private String hospitalShortName;
+ /**
+ * 医院编码
+ */
+ private String hospitalCode;
+ /**
+ * 医院类型ID 从字典表关联 社区/儿保等等之类
+ */
+ @NotEmpty(message = "医院类型ID 从字典表关联 社区/儿保等等之类不能为空")
+ private Long hospitalTypeId;
+ /**
+ * 医院类型 社区/儿保等等之类
+ */
+ @NotEmpty(message = "医院类型 社区/儿保等等之类不能为空")
+ private String hospitalTypeName;
+ /**
+ * 医院电话
+ */
+ @NotEmpty(message = "医院电话不能为空")
+ private String hospitalTel;
+ /**
+ * 医院所在地区行政编码
+ */
+ @NotEmpty(message = "医院所在地区行政编码不能为空")
+ private String hospitalArea;
+ /**
+ * 区号
+ */
+ @NotEmpty(message = "区号不能为空")
+ private String areaCode;
+ /**
+ * 医院地址
+ */
+ private String hospitalAdress;
+ /**
+ * 所在位置纬度
+ */
+ private String latitude;
+ /**
+ * 所在位置经度
+ */
+ private String longitude;
+ /**
+ * 资质ID
+ */
+ private Long hospitalQualifiedId;
+ /**
+ * 资质（三甲医院）
+ */
+ private String hospitalQualifiedName;
+ /**
+ * 医院logo 缩略图
+ */
+ private String hospitalLitLogo;
+ /**
+ * 医院logo 原图
+ */
+ private String hospitalLogo;
+ /**
+ * 医院简介图片
+ */
+ private String hospitalAdimage;
+ /**
+ * 医院简介
+ */
+ private String hospitalAbout;
+ /**
+ * 是否筛查医院 1是0否
+ */
+ private Boolean isScreen;
+ /**
+ * 负责的销售代表
+ */
+ @NotEmpty(message = "负责的销售代表不能为空")
+ private Long serverUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String serverUserName;
+ /**
+ * 服务状态 0试用 1正式
+ */
+ @NotEmpty(message = "服务状态 0试用 1正式不能为空")
+ private Integer hospitalState;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
/**
* 租户字段
*/
private String tenantId;
/**
- * 状态，1启用，0停用
+ * 是否删除，1删除，0未删除
*/
- private Integer enabled;
+ private Boolean isDel;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysLogger.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysLogger.java
index 419eb7f..be93255 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysLogger.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysLogger.java
@@ -10,11 +10,12 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: <br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,42 +23,42 @@
@AllArgsConstructor
@TableName("sys_logger")
public class SysLogger extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 应用名
- */
- private String applicationName;
- /**
- * 类名
- */
- @NotBlank(message = "类名不能为空")
- private String className;
- /**
- * 方法名
- */
- @NotBlank(message = "方法名不能为空")
- private String methodName;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 用户名
- */
- private String userName;
- /**
- * 租户id
- */
- private String clientId;
- /**
- * 操作信息
- */
- @NotBlank(message = "操作信息不能为空")
- private String operation;
- /**
- * 创建时间
- */
- @NotBlank(message = "创建时间不能为空")
- private String timestamp;
- }
+ /**
+ * 应用名
+ */
+ private String applicationName;
+ /**
+ * 类名
+ */
+ @NotBlank(message = "类名不能为空")
+ private String className;
+ /**
+ * 方法名
+ */
+ @NotBlank(message = "方法名不能为空")
+ private String methodName;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 用户名
+ */
+ private String userName;
+ /**
+ * 租户id
+ */
+ private String clientId;
+ /**
+ * 操作信息
+ */
+ @NotBlank(message = "操作信息不能为空")
+ private String operation;
+ /**
+ * 创建时间
+ */
+ @NotBlank(message = "创建时间不能为空")
+ private String timestamp;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
index d4ca6d4..8fac4c9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 系统功能菜单表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,61 +23,61 @@
@AllArgsConstructor
@TableName("sys_menu")
public class SysMenu extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 父ID
- */
- @NotBlank(message = "父ID不能为空")
- private Long parentId;
- /**
- * 菜单名称
- */
- @NotBlank(message = "菜单名称不能为空")
- private String name;
- /**
- * 菜单Url
- */
- private String url;
- /**
- * 菜单路径
- */
- private String path;
- /**
- * API 访问模式
- */
- private String pathMethod;
- /**
- * 样式表
- */
- private String css;
- /**
- * 排序
- */
- @NotBlank(message = "排序不能为空")
- private Integer sort;
- /**
- * 类型，1菜单，2API资源
- */
- @NotBlank(message = "类型，1菜单，2API资源不能为空")
- private Integer type;
- /**
- * 是否显示
- */
- @NotBlank(message = "是否显示不能为空")
- private Integer hidden;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Integer isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- /**
- * 是否启用，1启用，0停用
- */
- @NotBlank(message = "是否启用，1启用，0停用不能为空")
- private Integer enabled;
- }
+ /**
+ * 父ID
+ */
+ @NotEmpty(message = "父ID不能为空")
+ private Long parentId;
+ /**
+ * 菜单名称
+ */
+ @NotEmpty(message = "菜单名称不能为空")
+ private String name;
+ /**
+ * 菜单Url
+ */
+ private String url;
+ /**
+ * 菜单路径
+ */
+ private String path;
+ /**
+ * API 访问模式
+ */
+ private String pathMethod;
+ /**
+ * 样式表
+ */
+ private String css;
+ /**
+ * 排序
+ */
+ @NotEmpty(message = "排序不能为空")
+ private Integer sort;
+ /**
+ * 类型，1菜单，2API资源
+ */
+ @NotEmpty(message = "类型，1菜单，2API资源不能为空")
+ private Integer type;
+ /**
+ * 是否显示
+ */
+ @NotEmpty(message = "是否显示不能为空")
+ private Integer hidden;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Integer isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 是否启用，1启用，0停用
+ */
+ @NotEmpty(message = "是否启用，1启用，0停用不能为空")
+ private Integer enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java
index f89cf03..6d7f2b0 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 组织架构表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,36 +23,36 @@
@AllArgsConstructor
@TableName("sys_organization")
public class SysOrganization extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 节点级别取值 0-9
- */
- @NotBlank(message = "节点级别取值 0-9不能为空")
- private Integer orgLevel;
- /**
- * 节点属性（集团/公司/部门等，取值0，1，2，3，4）
- */
- private Integer orgAttr;
- /**
- * 上级组织ID
- */
- private Long orgParentId;
- /**
- * 组织名称
- */
- @NotBlank(message = "组织名称不能为空")
- private String orgName;
- /**
- * 排序
- */
- private Integer orgOrder;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 节点级别取值 0-9
+ */
+ @NotEmpty(message = "节点级别取值 0-9不能为空")
+ private Integer orgLevel;
+ /**
+ * 节点属性（集团/公司/部门等，取值0，1，2，3，4）
+ */
+ private Integer orgAttr;
+ /**
+ * 上级组织ID
+ */
+ private Long orgParentId;
+ /**
+ * 组织名称
+ */
+ @NotEmpty(message = "组织名称不能为空")
+ private String orgName;
+ /**
+ * 排序
+ */
+ private Integer orgOrder;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
index 239145e..8ec8dad 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 系统角色表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,30 +23,30 @@
@AllArgsConstructor
@TableName("sys_role")
public class SysRole extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 角色code
- */
- @NotBlank(message = "角色code不能为空")
- private String code;
- /**
- * 角色名
- */
- @NotBlank(message = "角色名不能为空")
- private String name;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Integer isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- /**
- * 状态，1启用，0停用
- */
- @NotBlank(message = "状态，1启用，0停用不能为空")
- private Integer enabled;
- }
+ /**
+ * 角色code
+ */
+ @NotEmpty(message = "角色code不能为空")
+ private String code;
+ /**
+ * 角色名
+ */
+ @NotEmpty(message = "角色名不能为空")
+ private String name;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Integer isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 状态，1启用，0停用
+ */
+ @NotEmpty(message = "状态，1启用，0停用不能为空")
+ private Integer enabled;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
index 0025b41..dbebe1b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.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.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 系统用户表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,59 +23,59 @@
@AllArgsConstructor
@TableName("sys_user")
public class SysUser extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 用户账号
- */
- @NotBlank(message = "用户账号不能为空")
- private String username;
- /**
- * 账号密码
- */
- @NotBlank(message = "账号密码不能为空")
- private String password;
- /**
- * 昵称
- */
- private String nickname;
- /**
- * 头像Url
- */
- private String headImgUrl;
- /**
- * 联系电话
- */
- private String mobile;
- /**
- * 性别
- */
- private Integer sex;
- /**
- * 是否启用，1启用，0停用
- */
- @NotBlank(message = "是否启用，1启用，0停用不能为空")
- private Integer enabled;
- /**
- *
- */
- @NotBlank(message = "不能为空")
- private String type;
- /**
- *
- */
- private String company;
- /**
- *
- */
- private String openId;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Integer isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- }
+ /**
+ * 用户账号
+ */
+ @NotEmpty(message = "用户账号不能为空")
+ private String username;
+ /**
+ * 账号密码
+ */
+ @NotEmpty(message = "账号密码不能为空")
+ private String password;
+ /**
+ * 昵称
+ */
+ private String nickname;
+ /**
+ * 头像Url
+ */
+ private String headImgUrl;
+ /**
+ * 联系电话
+ */
+ private String mobile;
+ /**
+ * 性别
+ */
+ private Integer sex;
+ /**
+ * 是否启用，1启用，0停用
+ */
+ @NotEmpty(message = "是否启用，1启用，0停用不能为空")
+ private Integer enabled;
+ /**
+ *
+ */
+ @NotEmpty(message = "不能为空")
+ private String type;
+ /**
+ *
+ */
+ private String company;
+ /**
+ *
+ */
+ private String openId;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Integer isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
index 21e046e..3f8ef05 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
@@ -6,15 +6,16 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 用户和组织关系表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,24 +23,24 @@
@AllArgsConstructor
@TableName("sys_user_org")
public class SysUserOrg extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 用户id
- */
- @NotBlank(message = "用户id不能为空")
- private Long userId;
- /**
- * 组织ID
- */
- @NotBlank(message = "组织ID不能为空")
- private Long orgId;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- }
+ /**
+ * 用户id
+ */
+ @NotEmpty(message = "用户id不能为空")
+ private Long userId;
+ /**
+ * 组织ID
+ */
+ @NotEmpty(message = "组织ID不能为空")
+ private Long orgId;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
index d0be6a6..ad22d4d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
@@ -12,9 +12,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@@ -77,8 +80,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysArea sysArea, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysAreaService.saveOrUpdate(sysArea);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
index fecf4da..343efba 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
@@ -1,27 +1,24 @@
package com.kidgrow.usercenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysCompany;
+import com.kidgrow.usercenter.service.ISysCompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysCompany;
-import com.kidgrow.usercenter.service.ISysCompanyService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,8 +80,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysCompanyService.saveOrUpdate(sysCompany);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
index df65704..4f68ff7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,8 +84,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysDepartmentService.saveOrUpdate(sysDepartment);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java
index 5dd2d71..47b328b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,8 +84,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysDictionaries sysDictionaries, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysDictionariesService.saveOrUpdate(sysDictionaries);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
index e7d520d..51be1e4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,8 +84,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysDoctor sysDoctor, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysDoctorService.saveOrUpdate(sysDoctor);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index b34f9a7..e673471 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -3,6 +3,7 @@
import java.util.Map;
import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -83,8 +84,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysHospitalService.saveOrUpdate(sysHospital);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
index c0ad40f..94c704b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
@@ -1,27 +1,24 @@
package com.kidgrow.usercenter.controller;
-import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysUserLogs;
+import com.kidgrow.usercenter.service.ISysUserLogsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysUserLogs;
-import com.kidgrow.usercenter.service.ISysUserLogsService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,8 +80,12 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody SysUserLogs sysUserLogs, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
boolean v= sysUserLogsService.saveOrUpdate(sysUserLogs);
if(v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/test/java/com/kidgrow/usercenter/HospitalMapperTest.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/test/java/com/kidgrow/usercenter/HospitalMapperTest.java
deleted file mode 100644
index 74bcbf0..0000000
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/test/java/com/kidgrow/usercenter/HospitalMapperTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.kidgrow.usercenter;
-
-import com.kidgrow.usercenter.mapper.SysHospitalMapper;
-import com.kidgrow.usercenter.model.SysHospital;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- *
- * @Description: <br>
- * @Project: <br>
- * @CreateDate: Created in 2020/3/10 14:25 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class HospitalMapperTest {
-
- @Autowired
- private SysHospitalMapper sysHospitalMapper;
-
- @Test
- public void addHospital(){
- SysHospital sysHospital = new SysHospital();
-
- sysHospital.setEnabled(1);
- sysHospital.setHospitalName("喜高医院");
- sysHospital.setIsDel(0);
- sysHospital.setTenantId("hospital");
- sysHospital.setCreateUserId(1);
- sysHospital.setCreateUserName("admin");
-
- sysHospitalMapper.insert(sysHospital);
- }
-}
--
Gitblit v1.8.0