Merge branch 'master' of http://192.168.1.222:3000/hnsh-smart-steward/smart-steward-api

smart-steward-api/src/main/java/com/smartSteward/web/controller/ControllerException.java

@@ -0,0 +1,26 @@
+package com.smartSteward.web.controller;
+
+import com.smartSteward.common.core.AjaxResult;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Objects;
+
+/**
+ * 全局异常处理类
+ * @author smartSteward
+ */
+@ControllerAdvice
+public class ControllerException {
+
+    private final static String EXCEPTION_MSG_KEY = "Exception message : ";
+
+    @ResponseBody
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Object handleValidException(MethodArgumentNotValidException e) {
+        //将错误信息返回给前台
+        return AjaxResult.error(Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage());
+    }
+}

smart-steward-api/src/main/resources/vm/java/database.java.vm

@@ -1,4 +1,4 @@
-package ${packageName}.entity.database.${folder};;
+package ${packageName}.entity.database.${folder};
 
 #foreach ($import in $importList)
 import ${import};
@@ -13,6 +13,47 @@ import com.smartSteward.common.core.BaseEntity;
 #elseif($table.tree)
 import com.smartSteward.common.core.TreeEntity;
 #end
+## 根据字段类型动态导入校验注解
+#set($hasStringField = false)
+#set($hasNotBlank = false)
+#set($hasNotNull = false)
+#set($hasSize = false)
+#set($hasDigits = false)
+#set($hasMin = false)
+#set($hasMax = false)
+#foreach ($column in $columns)
+#if(!$table.isSuperColumn($column.javaField) && $column.required)
+  #if($column.javaType == 'String')
+    #set($hasStringField = true)
+    #set($hasNotBlank = true)
+    #if($column.columnLength && $column.columnLength > 0)
+      #set($hasSize = true)
+    #end
+  #elseif($column.javaType.contains("Enum") || $column.javaType == 'Date' ||
+          $column.javaType == 'Integer' || $column.javaType == 'Long' ||
+          $column.javaType == 'BigDecimal' || $column.javaType == 'Double' ||
+          $column.javaType == 'Float' || $column.javaType == 'Boolean')
+    #set($hasNotNull = true)
+  #end
+#end
+#end
+
+## 导入校验注解
+#if($hasNotBlank || $hasNotNull)
+import javax.validation.constraints.*;
+#end
+#if($hasSize)
+import javax.validation.constraints.Size;
+#end
+#if($hasDigits)
+import javax.validation.constraints.Digits;
+#end
+#if($hasMin)
+import javax.validation.constraints.Min;
+#end
+#if($hasMax)
+import javax.validation.constraints.Max;
+#end
 
 /**
  * ${functionName}对象 ${tableName}
@@ -33,14 +74,14 @@ public class ${ClassName} extends ${Entity}
 
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField))
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#set($comment = $column.columnComment)
+#set($parentheseIndex = $column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
+#set($comment = $column.columnComment.substring(0, $parentheseIndex))
 #end
+
+    /** $column.columnComment */
+#if($column.list)
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
@@ -55,6 +96,50 @@ public class ${ClassName} extends ${Entity}
 #else
     @ApiModelProperty("${comment}")
 #end
+
+## 添加校验注解逻辑
+## 如果是自增主键，不需要加@NotNull
+#if($column.isPk == '1' && $column.increment)
+    ## 自增主键，不添加校验注解
+#elseif($column.required)
+    ## 必填字段
+    #if($column.javaType == 'String')
+        #if($column.columnLength && $column.columnLength > 0)
+    @NotBlank(message = "${comment}不能为空")
+    @Size(max = ${column.columnLength}, message = "${comment}长度不能超过${column.columnLength}个字符")
+        #else
+    @NotBlank(message = "${comment}不能为空")
+        #end
+    #elseif($column.javaType.contains("Enum"))
+    @NotNull(message = "${comment}不能为空")
+    #elseif($column.javaType == 'Integer' || $column.javaType == 'int')
+    @NotNull(message = "${comment}不能为空")
+        #if($column.columnLength && $column.columnLength > 0)
+    @Min(value = 0, message = "${comment}最小值为0")
+    @Max(value = ${column.columnLength}, message = "${comment}最大值为${column.columnLength}")
+        #end
+    #elseif($column.javaType == 'Long' || $column.javaType == 'long')
+    @NotNull(message = "${comment}不能为空")
+    #elseif($column.javaType == 'BigDecimal')
+    @NotNull(message = "${comment}不能为空")
+        #if($column.columnPrecision)
+            #set($integerPart = $column.columnPrecision - $column.columnScale)
+    @Digits(integer = ${integerPart}, fraction = ${column.columnScale}, message = "${comment}整数部分最多${integerPart}位，小数部分最多${column.columnScale}位")
+        #end
+    #elseif($column.javaType == 'Date')
+    @NotNull(message = "${comment}不能为空")
+    #elseif($column.javaType == 'Boolean' || $column.javaType == 'boolean')
+        ## 布尔类型不需要@NotNull
+    #elseif(!$column.javaType.matches("^(byte|short|int|long|float|double|boolean|char|Byte|Short|Integer|Long|Float|Double|Boolean|Character)$"))
+        ## 其他引用类型
+    @NotNull(message = "${comment}不能为空")
+    #end
+#else
+    ## 非必填字段
+    #if($column.javaType == 'String' && $column.columnLength && $column.columnLength > 0)
+    @Size(max = ${column.columnLength}, message = "${comment}长度不能超过${column.columnLength}个字符")
+    #end
+#end
     private $column.javaType $column.javaField;
 
 #end
@@ -62,6 +147,7 @@ public class ${ClassName} extends ${Entity}
 #if($table.sub)
     /** $table.subTable.functionName信息 */
     @ApiModelProperty("$table.subTable.functionName信息")
+    @Valid  ## 嵌套校验
     private List<${subClassName}> ${subclassName}List;
 
 #end