From 824b1a4d9cc70a8421fde067541ce64369c517d4 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 03 Apr 2020 14:21:18 +0800
Subject: [PATCH] 1.为所有的controller中的save方法增加服务端验证代码 2.将所有的model中的实体种的  NotBlank非空验证改为 NotEmpty,并格式化代码 3.删除了user_center中test中的hospitalMapper.java测试文件(因控制器和model的修改有错误。) 4.将opration-server中的config目录移动到正确位置。

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java |  118 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 58 insertions(+), 60 deletions(-)

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;
+}

--
Gitblit v1.8.0