From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 8546f5c..327c46c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -1,50 +1,55 @@
-package ${packageName}.vo;
+package ${packageName}.domain.vo;
-import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
#foreach ($import in $importList)
import ${import};
#end
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.excel.annotation.ExcelDictFormat;
+import com.ruoyi.common.excel.convert.ExcelDictConvert;
import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
/**
- * ${functionName}瑙嗗浘瀵硅薄 mall_package
+ * ${functionName}瑙嗗浘瀵硅薄 ${tableName}
*
* @author ${author}
* @date ${datetime}
*/
@Data
-@ApiModel("${functionName}瑙嗗浘瀵硅薄")
-public class ${ClassName}Vo {
- private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+public class ${ClassName}Vo implements Serializable {
- /** $pkColumn.columnComment */
- @ApiModelProperty("$pkColumn.columnComment")
- private ${pkColumn.javaType} ${pkColumn.javaField};
+ @Serial
+ private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
#if($column.isList)
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else
#set($comment=$column.columnComment)
#end
-#if($parentheseIndex != -1)
- @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
- @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+#if(${column.dictType} && ${column.dictType} != '')
+ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "${column.dictType}")
+#elseif($parentheseIndex != -1)
+ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
#else
- @Excel(name = "${comment}")
+ @ExcelProperty(value = "${comment}")
#end
- @ApiModelProperty("$column.columnComment")
- private $column.javaType $column.javaField;
+ private $column.javaType $column.javaField;
+
#end
#end
--
Gitblit v1.9.3