yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !50 from shexd/origin-master-vm-update

pull/50/MERGE
shexd 2023-11-08 00:30:11 +00:00 committed by Gitee
parent 95d5fc4a58 c514129772
commit e7f2d37dae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 118 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm
View File

@ -3,12 +3,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.javaType} == "BigDecimal") #if (${column.createOperation} && ${column.updateOperation} && ${column.listOperationResult})##通用操作
#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal; import java.math.BigDecimal;
#end #end
#if (${column.javaType} == "LocalDateTime") #if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end
import javax.validation.constraints.*; import javax.validation.constraints.*;

20
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm
View File

@ -4,14 +4,24 @@ import lombok.*;
import java.util.*; import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*; import javax.validation.constraints.*;
## 处理 Date 字段的引入 ## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}) #if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}))##不是通用字段
&& ${column.javaType} == "LocalDateTime")## 时间类型 #if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
import org.springframework.format.annotation.DateTimeFormat; #set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal;
#end
#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#break #end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end

22
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm
View File

@ -3,22 +3,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.javaType} == "BigDecimal") #if (${column.listOperationResult})##返回字段
#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal; import java.math.BigDecimal;
#end #end
#if (${column.javaType} == "LocalDateTime") #if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#end #end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end #end
import com.alibaba.excel.annotation.ExcelProperty;
#foreach ($column in $columns)
#if ("$!column.dictType" != "")## 有设置数据字典
import ${DictFormatClassName};
import ${DictConvertClassName};
#break
#end #end
#end #end

18
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm
View File

@ -4,14 +4,24 @@ import lombok.*;
import java.util.*; import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import ${PageParamClassName}; import ${PageParamClassName};
## 处理 Date 字段的引入 ## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型 #if (${column.listOperation})##查询操作
#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal;
#end
#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#break #end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end
## 字段模板 ## 字段模板

20
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm
View File

@ -4,14 +4,24 @@ import lombok.*;
import java.util.*; import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import ${PageParamClassName}; import ${PageParamClassName};
## 处理 Date 字段的引入 ## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型 #if (${column.listOperation})##查询操作
import org.springframework.format.annotation.DateTimeFormat; #if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal;
#end
#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#break #end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end
## 字段模板 ## 字段模板

18
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm
View File

@ -2,10 +2,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.javaType} == "LocalDateTime") #if (${column.listOperationResult} && (!${column.createOperation} || !${column.updateOperation}))##不是通用字段
#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal;
#end
#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
#break import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end

20
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm
View File

@ -4,14 +4,24 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
## 处理 Date 字段的引入 ## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult}) #if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult}))##不是通用字段
&& ${column.javaType} == "LocalDateTime")## 时间类型 #if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
import org.springframework.format.annotation.DateTimeFormat; #set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal;
#end
#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#break #end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end

16
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm
View File

@ -2,12 +2,24 @@ package ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.busines
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
#set($importedClasses = [])
#foreach ($column in $columns) #foreach ($column in $columns)
#if (${column.javaType} == "BigDecimal") #if (!${baseDOFields.contains(${column.javaField})})##排除 BaseDO 的字段
#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
#set($dummy = $importedClasses.add("java.math.BigDecimal"))
import java.math.BigDecimal; import java.math.BigDecimal;
#end #end
#if (${column.javaType} == "LocalDateTime") #if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
import java.time.LocalDateTime; import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
#end
#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
#set($dummy = $importedClasses.add("java.time.LocalDate"))
import java.time.LocalDate;
#end
#end #end
#end #end
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

5
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
View File

@ -14,6 +14,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Map; import java.util.Map;
import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.hutool.core.util.RandomUtil.randomEle;
@ -140,7 +141,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
o.setAccountId(10L); o.setAccountId(10L);
o.setTemplateId(100L); o.setTemplateId(100L);
o.setSendStatus(MailSendStatusEnum.INIT.getStatus()); o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
o.setSendTime(buildTime(2023, 2, 10)); o.setSendTime(LocalDateTime.now());
o.setTemplateParams(randomTemplateParams()); o.setTemplateParams(randomTemplateParams());
}); });
mailLogMapper.insert(dbMailLog); mailLogMapper.insert(dbMailLog);
@ -157,7 +158,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
// 测试 sendStatus 不匹配 // 测试 sendStatus 不匹配
mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus()))); mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus())));
// 测试 sendTime 不匹配 // 测试 sendTime 不匹配
mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(buildTime(2023, 3, 10)))); mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(LocalDateTime.now())));
// 准备参数 // 准备参数
MailLogPageReqVO reqVO = new MailLogPageReqVO(); MailLogPageReqVO reqVO = new MailLogPageReqVO();
reqVO.setUserId(1L); reqVO.setUserId(1L);