BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0d0f64e30adad5cdc2ae609cc0f9fd92ab95c631

Authored by xingyu
1 parent 824c5408

feat: 删除过期方法

Inline Side-by-side
Showing 31 changed files with 178 additions and 196 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
  View file @0d0f64e
... ... @@ -83,11 +83,6 @@ public class DateUtils {
83 83 return buildTime(year, mouth, day, 0, 0, 0);
84 84 }
85 85  
86   - @Deprecated
87   - public static LocalDateTime buildLocalDateTime(int year, int mouth, int day) {
88   - return LocalDateTime.of(year, mouth, day, 0, 0, 0);
89   - }
90   -
91 86 /**
92 87 * 创建指定时间
93 88 *
... ... @@ -132,11 +127,6 @@ public class DateUtils {
132 127 return a.isAfter(b) ? a : b;
133 128 }
134 129  
135   - @Deprecated
136   - public static boolean afterNow(LocalDateTime localDateTime) {
137   - return localDateTime.isAfter(LocalDateTime.now());
138   - }
139   -
140 130 /**
141 131 * 计算当期时间相差的日期
142 132 *
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/pubsub/AbstractChannelMessageListener.java
  View file @0d0f64e
... ... @@ -39,7 +39,7 @@ public abstract class AbstractChannelMessageListener<T extends AbstractChannelMe
39 39 @SneakyThrows
40 40 protected AbstractChannelMessageListener() {
41 41 this.messageType = getMessageClass();
42   - this.channel = messageType.newInstance().getChannel();
  42 + this.channel = messageType.getDeclaredConstructor().newInstance().getChannel();
43 43 }
44 44  
45 45 /**
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/stream/AbstractStreamMessageListener.java
  View file @0d0f64e
... ... @@ -50,7 +50,7 @@ public abstract class AbstractStreamMessageListener<T extends AbstractStreamMess
50 50 @SneakyThrows
51 51 protected AbstractStreamMessageListener() {
52 52 this.messageType = getMessageClass();
53   - this.streamKey = messageType.newInstance().getStreamKey();
  53 + this.streamKey = messageType.getDeclaredConstructor().newInstance().getStreamKey();
54 54 }
55 55  
56 56 @Override
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java
  View file @0d0f64e
... ... @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.service.definition;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
6 5 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
7 6 import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
8 7 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
... ... @@ -19,7 +18,7 @@ import javax.annotation.Resource;
19 18  
20 19 import java.time.LocalDateTime;
21 20  
22   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  21 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
23 22 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
24 23 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS;
25 24  
... ... @@ -106,7 +105,7 @@ public class BpmUserGroupServiceTest extends BaseDbUnitTest {
106 105 BpmUserGroupDO dbUserGroup = RandomUtils.randomPojo(BpmUserGroupDO.class, o -> { // 等会查询到
107 106 o.setName("芋道源码");
108 107 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
109   - o.setCreateTime(DateUtils.buildLocalDateTime(2021, 11, 11));
  108 + o.setCreateTime(buildTime(2021, 11, 11));
110 109 });
111 110 userGroupMapper.insert(dbUserGroup);
112 111 // 测试 name 不匹配
... ... @@ -114,12 +113,12 @@ public class BpmUserGroupServiceTest extends BaseDbUnitTest {
114 113 // 测试 status 不匹配
115 114 userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
116 115 // 测试 createTime 不匹配
117   - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2021, 12, 12))));
  116 + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setCreateTime(buildTime(2021, 12, 12))));
118 117 // 准备参数
119 118 BpmUserGroupPageReqVO reqVO = new BpmUserGroupPageReqVO();
120 119 reqVO.setName("源码");
121 120 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
122   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 10),buildLocalDateTime(2021, 11, 12)}));
  121 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 11, 10),buildTime(2021, 11, 12)}));
123 122  
124 123 // 调用
125 124 PageResult<BpmUserGroupDO> pageResult = userGroupService.getUserGroupPage(reqVO);
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceTest.java
  View file @0d0f64e
... ... @@ -22,7 +22,7 @@ import java.util.List;
22 22 import java.util.function.Consumer;
23 23  
24 24 import static cn.hutool.core.util.RandomUtil.randomEle;
25   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  25 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
26 26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
27 27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
28 28 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
... ... @@ -153,7 +153,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
153 153 o.setName("芋艿");
154 154 o.setConfigKey("yunai");
155 155 o.setType(ConfigTypeEnum.SYSTEM.getType());
156   - o.setCreateTime(buildLocalDateTime(2021, 2, 1));
  156 + o.setCreateTime(buildTime(2021, 2, 1));
157 157 });
158 158 configMapper.insert(dbConfig);
159 159 // 测试 name 不匹配
... ... @@ -163,13 +163,13 @@ public class ConfigServiceTest extends BaseDbUnitTest {
163 163 // 测试 type 不匹配
164 164 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
165 165 // 测试 createTime 不匹配
166   - configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
  166 + configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
167 167 // 准备参数
168 168 ConfigPageReqVO reqVO = new ConfigPageReqVO();
169 169 reqVO.setName("艿");
170 170 reqVO.setKey("nai");
171 171 reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
172   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 15),buildLocalDateTime(2021, 2, 15)}));
  172 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 15),buildTime(2021, 2, 15)}));
173 173  
174 174 // 调用
175 175 PageResult<ConfigDO> pageResult = configService.getConfigPage(reqVO);
... ... @@ -186,7 +186,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
186 186 o.setName("芋艿");
187 187 o.setConfigKey("yunai");
188 188 o.setType(ConfigTypeEnum.SYSTEM.getType());
189   - o.setCreateTime(buildLocalDateTime(2021, 2, 1));
  189 + o.setCreateTime(buildTime(2021, 2, 1));
190 190 });
191 191 configMapper.insert(dbConfig);
192 192 // 测试 name 不匹配
... ... @@ -196,13 +196,13 @@ public class ConfigServiceTest extends BaseDbUnitTest {
196 196 // 测试 type 不匹配
197 197 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
198 198 // 测试 createTime 不匹配
199   - configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
  199 + configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
200 200 // 准备参数
201 201 ConfigExportReqVO reqVO = new ConfigExportReqVO();
202 202 reqVO.setName("艿");
203 203 reqVO.setKey("nai");
204 204 reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
205   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 15),buildLocalDateTime(2021, 2, 15)}));
  205 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 15),buildTime(2021, 2, 15)}));
206 206  
207 207 // 调用
208 208 List<ConfigDO> list = configService.getConfigList(reqVO);
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
  View file @0d0f64e
... ... @@ -28,7 +28,7 @@ import java.time.LocalDateTime;
28 28 import java.util.Map;
29 29  
30 30 import static cn.hutool.core.util.RandomUtil.randomEle;
31   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  31 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
32 32 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
33 33 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
34 34 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
... ... @@ -219,8 +219,8 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
219 219 FileConfigPageReqVO reqVO = new FileConfigPageReqVO();
220 220 reqVO.setName("芋道");
221 221 reqVO.setStorage(FileStorageEnum.LOCAL.getStorage());
222   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 1, 1),
223   - buildLocalDateTime(2020, 1, 24)}));
  222 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1),
  223 + buildTime(2020, 1, 24)}));
224 224  
225 225 // 调用
226 226 PageResult<FileConfigDO> pageResult = fileConfigService.getFileConfigPage(reqVO);
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
  View file @0d0f64e
... ... @@ -17,7 +17,7 @@ import javax.annotation.Resource;
17 17  
18 18 import java.time.LocalDateTime;
19 19  
20   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
21 21 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
22 22 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
23 23 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS;
... ... @@ -43,7 +43,7 @@ public class FileServiceTest extends BaseDbUnitTest {
43 43 FileDO dbFile = randomPojo(FileDO.class, o -> { // 等会查询到
44 44 o.setPath("yunai");
45 45 o.setType("image/jpg");
46   - o.setCreateTime(buildLocalDateTime(2021, 1, 15));
  46 + o.setCreateTime(buildTime(2021, 1, 15));
47 47 });
48 48 fileMapper.insert(dbFile);
49 49 // 测试 path 不匹配
... ... @@ -54,13 +54,13 @@ public class FileServiceTest extends BaseDbUnitTest {
54 54 }));
55 55 // 测试 createTime 不匹配
56 56 fileMapper.insert(ObjectUtils.cloneIgnoreId(dbFile, o -> {
57   - o.setCreateTime(buildLocalDateTime(2020, 1, 15));
  57 + o.setCreateTime(buildTime(2020, 1, 15));
58 58 }));
59 59 // 准备参数
60 60 FilePageReqVO reqVO = new FilePageReqVO();
61 61 reqVO.setPath("yunai");
62 62 reqVO.setType("jp");
63   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 10), buildLocalDateTime(2021, 1, 20)}));
  63 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 10), buildTime(2021, 1, 20)}));
64 64  
65 65 // 调用
66 66 PageResult<FileDO> pageResult = fileService.getFilePage(reqVO);
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceTest.java
  View file @0d0f64e
... ... @@ -16,7 +16,7 @@ import java.util.ArrayList;
16 16 import java.util.List;
17 17  
18 18 import static cn.hutool.core.util.RandomUtil.randomEle;
19   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  19 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
20 20 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
21 21 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
22 22 import static org.junit.jupiter.api.Assertions.assertEquals;
... ... @@ -96,8 +96,8 @@ public class JobLogServiceTest extends BaseDbUnitTest {
96 96 o.setExecuteIndex(1);
97 97 o.setHandlerName("handlerName 单元测试");
98 98 o.setStatus(JobLogStatusEnum.SUCCESS.getStatus());
99   - o.setBeginTime(buildLocalDateTime(2021, 1, 8));
100   - o.setEndTime(buildLocalDateTime(2021, 1, 8));
  99 + o.setBeginTime(buildTime(2021, 1, 8));
  100 + o.setEndTime(buildTime(2021, 1, 8));
101 101 });
102 102 jobLogMapper.insert(dbJobLog);
103 103 // 测试 jobId 不匹配
... ... @@ -105,9 +105,9 @@ public class JobLogServiceTest extends BaseDbUnitTest {
105 105 // 测试 handlerName 不匹配
106 106 jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
107 107 // 测试 beginTime 不匹配
108   - jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildLocalDateTime(2021, 1, 7))));
  108 + jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
109 109 // 测试 endTime 不匹配
110   - jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildLocalDateTime(2021, 1, 9))));
  110 + jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
111 111 // 测试 status 不匹配
112 112 jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
113 113 // 准备参数
... ... @@ -132,8 +132,8 @@ public class JobLogServiceTest extends BaseDbUnitTest {
132 132 o.setExecuteIndex(1);
133 133 o.setHandlerName("handlerName 单元测试");
134 134 o.setStatus(JobLogStatusEnum.SUCCESS.getStatus());
135   - o.setBeginTime(buildLocalDateTime(2021, 1, 8));
136   - o.setEndTime(buildLocalDateTime(2021, 1, 8));
  135 + o.setBeginTime(buildTime(2021, 1, 8));
  136 + o.setEndTime(buildTime(2021, 1, 8));
137 137 });
138 138 jobLogMapper.insert(dbJobLog);
139 139 // 测试 jobId 不匹配
... ... @@ -141,9 +141,9 @@ public class JobLogServiceTest extends BaseDbUnitTest {
141 141 // 测试 handlerName 不匹配
142 142 jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
143 143 // 测试 beginTime 不匹配
144   - jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildLocalDateTime(2021, 1, 7))));
  144 + jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
145 145 // 测试 endTime 不匹配
146   - jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildLocalDateTime(2021, 1, 9))));
  146 + jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
147 147 // 测试 status 不匹配
148 148 jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
149 149 // 准备参数
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
  View file @0d0f64e
... ... @@ -19,7 +19,7 @@ import javax.annotation.Resource;
19 19 import java.time.LocalDateTime;
20 20 import java.util.List;
21 21  
22   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  22 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
23 23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
24 24 import static org.junit.jupiter.api.Assertions.assertEquals;
25 25 import static org.junit.jupiter.api.Assertions.assertNotNull;
... ... @@ -40,7 +40,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
40 40 int userType = UserTypeEnum.ADMIN.getValue();
41 41 String applicationName = "yudao-test";
42 42 String requestUrl = "foo";
43   - LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
  43 + LocalDateTime beginTime = buildTime(2021, 3, 13);
44 44 int duration = 1000;
45 45 int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
46 46  
... ... @@ -65,7 +65,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
65 65 // requestUrl 不同的
66 66 apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
67 67 // 构造一个早期时间 2021-02-06 00:00:00
68   - apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildLocalDateTime(2021, 2, 6))));
  68 + apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildTime(2021, 2, 6))));
69 69 // duration 不同的
70 70 apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
71 71 // resultCode 不同的
... ... @@ -77,7 +77,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
77 77 reqVO.setUserType(userType);
78 78 reqVO.setApplicationName(applicationName);
79 79 reqVO.setRequestUrl(requestUrl);
80   - reqVO.setBeginTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
  80 + reqVO.setBeginTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
81 81 reqVO.setDuration(duration);
82 82 reqVO.setResultCode(resultCode);
83 83  
... ... @@ -97,7 +97,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
97 97 int userType = UserTypeEnum.ADMIN.getValue();
98 98 String applicationName = "yudao-test";
99 99 String requestUrl = "foo";
100   - LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
  100 + LocalDateTime beginTime = buildTime(2021, 3, 13);
101 101 int duration = 1000;
102 102 int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
103 103  
... ... @@ -122,7 +122,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
122 122 // requestUrl 不同的
123 123 apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
124 124 // 构造一个早期时间 2021-02-06 00:00:00
125   - apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildLocalDateTime(2021, 2, 6))));
  125 + apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildTime(2021, 2, 6))));
126 126 // duration 不同的
127 127 apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
128 128 // resultCode 不同的
... ... @@ -134,7 +134,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
134 134 reqVO.setUserType(userType);
135 135 reqVO.setApplicationName(applicationName);
136 136 reqVO.setRequestUrl(requestUrl);
137   - reqVO.setBeginTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
  137 + reqVO.setBeginTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
138 138 reqVO.setDuration(duration);
139 139 reqVO.setResultCode(resultCode);
140 140  
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
  View file @0d0f64e
... ... @@ -20,7 +20,7 @@ import javax.annotation.Resource;
20 20 import java.time.LocalDateTime;
21 21 import java.util.List;
22 22  
23   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  23 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
24 24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
25 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
26 26 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
... ... @@ -44,7 +44,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
44 44 int userType = UserTypeEnum.ADMIN.getValue();
45 45 String applicationName = "yudao-test";
46 46 String requestUrl = "foo";
47   - LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
  47 + LocalDateTime beginTime = buildTime(2021, 3, 13);
48 48 int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
49 49  
50 50 ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
... ... @@ -67,7 +67,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
67 67 // requestUrl 不同的
68 68 infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
69 69 // 构造一个早期时间 2021-02-06 00:00:00
70   - infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildLocalDateTime(2021, 2, 6))));
  70 + infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
71 71 // progressStatus 不同的
72 72 infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
73 73  
... ... @@ -77,7 +77,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
77 77 reqVO.setUserType(userType);
78 78 reqVO.setApplicationName(applicationName);
79 79 reqVO.setRequestUrl(requestUrl);
80   - reqVO.setExceptionTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
  80 + reqVO.setExceptionTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
81 81 reqVO.setProcessStatus(progressStatus);
82 82  
83 83 // 调用service方法
... ... @@ -96,7 +96,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
96 96 int userType = UserTypeEnum.ADMIN.getValue();
97 97 String applicationName = "yudao-test";
98 98 String requestUrl = "foo";
99   - LocalDateTime beginTime = buildLocalDateTime(2021, 3, 13);
  99 + LocalDateTime beginTime = buildTime(2021, 3, 13);
100 100 int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
101 101  
102 102 ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
... ... @@ -119,7 +119,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
119 119 // requestUrl 不同的
120 120 infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
121 121 // 构造一个早期时间 2021-02-06 00:00:00
122   - infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildLocalDateTime(2021, 2, 6))));
  122 + infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
123 123 // progressStatus 不同的
124 124 infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
125 125  
... ... @@ -129,7 +129,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
129 129 reqVO.setUserType(userType);
130 130 reqVO.setApplicationName(applicationName);
131 131 reqVO.setRequestUrl(requestUrl);
132   - reqVO.setExceptionTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 12),buildLocalDateTime(2021, 3, 14)}));
  132 + reqVO.setExceptionTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
133 133 reqVO.setProcessStatus(progressStatus);
134 134  
135 135 // 调用service方法
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImplTest.java
  View file @0d0f64e
... ... @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.test;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
6 5 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
7 6 import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoCreateReqVO;
8 7 import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExportReqVO;
... ... @@ -17,7 +16,7 @@ import javax.annotation.Resource;
17 16 import java.time.LocalDateTime;
18 17 import java.util.List;
19 18  
20   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  19 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
21 20 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
22 21 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
23 22 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -112,7 +111,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
112 111 o.setType(1);
113 112 o.setCategory(2);
114 113 o.setRemark("哈哈哈");
115   - o.setCreateTime(DateUtils.buildLocalDateTime(2021, 11, 11));
  114 + o.setCreateTime(buildTime(2021, 11, 11));
116 115 });
117 116 testDemoMapper.insert(dbTestDemo);
118 117 // 测试 name 不匹配
... ... @@ -126,7 +125,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
126 125 // 测试 remark 不匹配
127 126 testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark("呵呵呵")));
128 127 // 测试 createTime 不匹配
129   - testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2021, 12, 12))));
  128 + testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(buildTime(2021, 12, 12))));
130 129 // 准备参数
131 130 TestDemoPageReqVO reqVO = new TestDemoPageReqVO();
132 131 reqVO.setName("芋道");
... ... @@ -134,7 +133,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
134 133 reqVO.setType(1);
135 134 reqVO.setCategory(2);
136 135 reqVO.setRemark("哈哈哈");
137   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 10),buildLocalDateTime(2021, 11, 12)}));
  136 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 11, 10),buildTime(2021, 11, 12)}));
138 137  
139 138 // 调用
140 139 PageResult<TestDemoDO> pageResult = testDemoService.getTestDemoPage(reqVO);
... ... @@ -153,7 +152,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
153 152 o.setType(1);
154 153 o.setCategory(2);
155 154 o.setRemark("哈哈哈");
156   - o.setCreateTime(DateUtils.buildLocalDateTime(2021, 11, 11));
  155 + o.setCreateTime(buildTime(2021, 11, 11));
157 156 });
158 157 testDemoMapper.insert(dbTestDemo);
159 158 // 测试 name 不匹配
... ... @@ -167,7 +166,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
167 166 // 测试 remark 不匹配
168 167 testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark("呵呵呵")));
169 168 // 测试 createTime 不匹配
170   - testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2021, 12, 12))));
  169 + testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(buildTime(2021, 12, 12))));
171 170 // 准备参数
172 171 TestDemoExportReqVO reqVO = new TestDemoExportReqVO();
173 172 reqVO.setName("芋道");
... ... @@ -175,7 +174,7 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
175 174 reqVO.setType(1);
176 175 reqVO.setCategory(2);
177 176 reqVO.setRemark("哈哈哈");
178   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 10),buildLocalDateTime(2021, 11, 12)}));
  177 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 11, 10),buildTime(2021, 11, 12)}));
179 178  
180 179 // 调用
181 180 List<TestDemoDO> list = testDemoService.getTestDemoList(reqVO);
... ...
yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java
  View file @0d0f64e
... ... @@ -15,7 +15,7 @@ import javax.annotation.Resource;
15 15  
16 16 import java.time.LocalDateTime;
17 17  
18   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  18 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
19 19 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
20 20 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
21 21 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -107,7 +107,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest {
107 107 ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class, o -> { // 等会查询到
108 108 o.setName("芋道源码");
109 109 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
110   - o.setCreateTime(buildLocalDateTime(2022, 2, 1));
  110 + o.setCreateTime(buildTime(2022, 2, 1));
111 111 });
112 112 brandMapper.insert(dbBrand);
113 113 // 测试 name 不匹配
... ... @@ -115,12 +115,12 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest {
115 115 // 测试 status 不匹配
116 116 brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
117 117 // 测试 createTime 不匹配
118   - brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildLocalDateTime(2022, 3, 1))));
  118 + brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1))));
119 119 // 准备参数
120 120 ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO();
121 121 reqVO.setName("芋道");
122 122 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
123   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 1, 1), buildLocalDateTime(2022, 2, 25)}));
  123 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)}));
124 124  
125 125 // 调用
126 126 PageResult<ProductBrandDO> pageResult = brandService.getBrandPage(reqVO);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/coupon/CouponPageReqVO.java
  View file @0d0f64e
... ... @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
8 8 import lombok.ToString;
9 9 import org.springframework.format.annotation.DateTimeFormat;
10 10  
11   -import java.util.Date;
  11 +import java.time.LocalDateTime;
12 12  
13 13 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14  
... ... @@ -26,7 +26,7 @@ public class CouponPageReqVO extends PageParam {
26 26  
27 27 @ApiModelProperty(value = "创建时间")
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - private Date[] createTime;
  29 + private LocalDateTime[] createTime;
30 30  
31 31 @ApiModelProperty(value = "用户昵称", example = "芋艿", notes = "模糊匹配")
32 32 private String nickname;
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplatePageReqVO.java
  View file @0d0f64e
1 1 package cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4   -import cn.iocoder.yudao.framework.common.validation.InEnum;
5   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
6 4 import io.swagger.annotations.ApiModel;
7 5 import io.swagger.annotations.ApiModelProperty;
8 6 import lombok.Data;
... ... @@ -10,8 +8,7 @@ import lombok.EqualsAndHashCode;
10 8 import lombok.ToString;
11 9 import org.springframework.format.annotation.DateTimeFormat;
12 10  
13   -import javax.validation.constraints.NotNull;
14   -import java.util.Date;
  11 +import java.time.LocalDateTime;
15 12  
16 13 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
17 14  
... ... @@ -32,6 +29,6 @@ public class CouponTemplatePageReqVO extends PageParam {
32 29  
33 30 @ApiModelProperty(value = "创建时间")
34 31 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - private Date[] createTime;
  32 + private LocalDateTime[] createTime;
36 33  
37 34 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImplTest.java
  View file @0d0f64e
... ... @@ -15,11 +15,10 @@ import org.junit.jupiter.api.Test;
15 15 import org.springframework.context.annotation.Import;
16 16  
17 17 import javax.annotation.Resource;
18   -import java.util.Date;
  18 +import java.time.LocalDateTime;
19 19  
20 20 import static cn.hutool.core.util.RandomUtil.randomEle;
21   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
22   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  21 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
23 22 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
24 23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
25 24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -119,7 +118,7 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest {
119 118 o.setName("芋艿");
120 119 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
121 120 o.setDiscountType(PromotionDiscountTypeEnum.PERCENT.getType());
122   - o.setCreateTime(buildLocalDateTime(2022, 2, 2));
  121 + o.setCreateTime(buildTime(2022, 2, 2));
123 122 });
124 123 couponTemplateMapper.insert(dbCouponTemplate);
125 124 // 测试 name 不匹配
... ... @@ -129,13 +128,13 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest {
129 128 // 测试 type 不匹配
130 129 couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setDiscountType(PromotionDiscountTypeEnum.PRICE.getType())));
131 130 // 测试 createTime 不匹配
132   - couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setCreateTime(buildLocalDateTime(2022, 1, 1))));
  131 + couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setCreateTime(buildTime(2022, 1, 1))));
133 132 // 准备参数
134 133 CouponTemplatePageReqVO reqVO = new CouponTemplatePageReqVO();
135 134 reqVO.setName("芋艿");
136 135 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
137 136 reqVO.setDiscountType(PromotionDiscountTypeEnum.PERCENT.getType());
138   - reqVO.setCreateTime((new Date[]{buildTime(2022, 2, 1), buildTime(2022, 2, 3)}));
  137 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1), buildTime(2022, 2, 3)}));
139 138  
140 139 // 调用
141 140 PageResult<CouponTemplateDO> pageResult = couponTemplateService.getCouponTemplatePage(reqVO);
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
  View file @0d0f64e
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.pay.service.notify;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.exceptions.ExceptionUtil;
5 5 import cn.hutool.http.HttpUtil;
  6 +import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
6 7 import cn.iocoder.yudao.module.pay.dal.dataobject.notify.PayNotifyLogDO;
7 8 import cn.iocoder.yudao.module.pay.dal.dataobject.notify.PayNotifyTaskDO;
8 9 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
... ... @@ -164,7 +165,7 @@ public class PayNotifyServiceImpl implements PayNotifyService {
164 165 // 校验，当前任务是否已经被通知过
165 166 // 虽然已经通过分布式加锁，但是可能同时满足通知的条件，然后都去获得锁。此时，第一个执行完后，第二个还是能拿到锁，然后会再执行一次。
166 167 PayNotifyTaskDO dbTask = payNotifyTaskCoreMapper.selectById(task.getId());
167   - if (DateUtils.afterNow(dbTask.getNextNotifyTime())) {
  168 + if (LocalDateTimeUtils.afterNow(dbTask.getNextNotifyTime())) {
168 169 log.info("[executeNotify][dbTask({}) 任务被忽略，原因是未到达下次通知时间，可能是因为并发执行了]", JsonUtils.toJsonString(dbTask));
169 170 return;
170 171 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/merchant/PayAppServiceTest.java
  View file @0d0f64e
... ... @@ -22,7 +22,7 @@ import java.time.LocalDateTime;
22 22 import java.util.Collections;
23 23 import java.util.List;
24 24  
25   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  25 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
26 26 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
27 27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
28 28 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -123,7 +123,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
123 123 o.setPayNotifyUrl("https://www.hc.com");
124 124 o.setRefundNotifyUrl("https://www.xm.com");
125 125 o.setMerchantId(merchantId);
126   - o.setCreateTime(buildLocalDateTime(2021,11,20));
  126 + o.setCreateTime(buildTime(2021,11,20));
127 127 });
128 128  
129 129 // mock 数据
... ... @@ -134,7 +134,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
134 134 o.setShortName("灿灿子");
135 135 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
136 136 o.setRemark("灿哥的杂货铺");
137   - o.setCreateTime(buildLocalDateTime(2021,11,3));
  137 + o.setCreateTime(buildTime(2021,11,3));
138 138 });
139 139  
140 140 Mockito.when(payMerchantMapper.getMerchantListByName(dbMerchant.getName()))
... ... @@ -154,7 +154,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
154 154 // 测试 merchantId 不匹配
155 155 appMapper.insert(cloneIgnoreId(dbApp, o -> o.setMerchantId(mismatchMerchantId)));
156 156 // 测试 createTime 不匹配
157   - appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildLocalDateTime(2021,12,21))));
  157 + appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildTime(2021,12,21))));
158 158 // 准备参数
159 159 PayAppPageReqVO reqVO = new PayAppPageReqVO();
160 160 reqVO.setName("灿灿姐的杂货铺");
... ... @@ -163,7 +163,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
163 163 reqVO.setPayNotifyUrl("https://www.hc.com");
164 164 reqVO.setRefundNotifyUrl("https://www.xm.com");
165 165 reqVO.setMerchantName(dbMerchant.getName());
166   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,19),buildLocalDateTime(2021,11,21)}));
  166 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
167 167  
168 168 // 调用
169 169 PageResult<PayAppDO> pageResult = appService.getAppPage(reqVO);
... ... @@ -186,7 +186,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
186 186 o.setPayNotifyUrl("https://www.hc.com");
187 187 o.setRefundNotifyUrl("https://www.xm.com");
188 188 o.setMerchantId(merchantId);
189   - o.setCreateTime(buildLocalDateTime(2021,11,20));
  189 + o.setCreateTime(buildTime(2021,11,20));
190 190 });
191 191  
192 192 // mock 数据
... ... @@ -197,7 +197,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
197 197 o.setShortName("灿灿子");
198 198 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
199 199 o.setRemark("灿哥的杂货铺");
200   - o.setCreateTime(buildLocalDateTime(2021,11,3));
  200 + o.setCreateTime(buildTime(2021,11,3));
201 201 });
202 202  
203 203 Mockito.when(payMerchantMapper.getMerchantListByName(dbMerchant.getName()))
... ... @@ -217,7 +217,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
217 217 // 测试 merchantId 不匹配
218 218 appMapper.insert(cloneIgnoreId(dbApp, o -> o.setMerchantId(mismatchMerchantId)));
219 219 // 测试 createTime 不匹配
220   - appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildLocalDateTime(2021,12,21))));
  220 + appMapper.insert(cloneIgnoreId(dbApp, o -> o.setCreateTime(buildTime(2021,12,21))));
221 221 // 准备参数
222 222 PayAppExportReqVO reqVO = new PayAppExportReqVO();
223 223 reqVO.setName("灿灿姐的杂货铺");
... ... @@ -226,7 +226,7 @@ public class PayAppServiceTest extends BaseDbUnitTest {
226 226 reqVO.setPayNotifyUrl("https://www.hc.com");
227 227 reqVO.setRefundNotifyUrl("https://www.xm.com");
228 228 reqVO.setMerchantName(dbMerchant.getName());
229   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,19),buildLocalDateTime(2021,11,21)}));
  229 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
230 230  
231 231 // 调用
232 232 List<PayAppDO> list = appService.getAppList(reqVO);
... ...
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/merchant/PayChannelServiceTest.java
  View file @0d0f64e
... ... @@ -23,7 +23,7 @@ import javax.validation.Validator;
23 23 import java.time.LocalDateTime;
24 24 import java.util.List;
25 25  
26   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  26 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
27 27 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
28 28 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
29 29 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -215,7 +215,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
215 215 o.setMerchantId(1L);
216 216 o.setAppId(1L);
217 217 o.setConfig(payClientConfig);
218   - o.setCreateTime(buildLocalDateTime(2021,11,20));
  218 + o.setCreateTime(buildTime(2021,11,20));
219 219 });
220 220 channelMapper.insert(dbChannel);
221 221 // 执行拷贝的时候会出现异常，所以在插入后要重置为null 后续在写入新的
... ... @@ -253,7 +253,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
253 253 // 测试 createTime 不匹配
254 254 channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
255 255 o.setConfig(payClientConfig);
256   - o.setCreateTime(buildLocalDateTime(2021, 10, 20));
  256 + o.setCreateTime(buildTime(2021, 10, 20));
257 257 }));
258 258 // 准备参数
259 259 PayChannelPageReqVO reqVO = new PayChannelPageReqVO();
... ... @@ -264,7 +264,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
264 264 reqVO.setMerchantId(1L);
265 265 reqVO.setAppId(1L);
266 266 reqVO.setConfig(JSON.toJSONString(payClientConfig));
267   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,19),buildLocalDateTime(2021,11,21)}));
  267 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
268 268  
269 269 // 调用
270 270 PageResult<PayChannelDO> pageResult = channelService.getChannelPage(reqVO);
... ... @@ -288,7 +288,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
288 288 o.setMerchantId(1L);
289 289 o.setAppId(1L);
290 290 o.setConfig(payClientConfig);
291   - o.setCreateTime(buildLocalDateTime(2021,11,20));
  291 + o.setCreateTime(buildTime(2021,11,20));
292 292 });
293 293 channelMapper.insert(dbChannel);
294 294 // 执行拷贝的时候会出现异常，所以在插入后要重置为null 后续在写入新的
... ... @@ -326,7 +326,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
326 326 // 测试 createTime 不匹配
327 327 channelMapper.insert(cloneIgnoreId(dbChannel, o -> {
328 328 o.setConfig(payClientConfig);
329   - o.setCreateTime(buildLocalDateTime(2021, 10, 20));
  329 + o.setCreateTime(buildTime(2021, 10, 20));
330 330 }));
331 331 // 准备参数
332 332 PayChannelExportReqVO reqVO = new PayChannelExportReqVO();
... ... @@ -337,7 +337,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
337 337 reqVO.setMerchantId(1L);
338 338 reqVO.setAppId(1L);
339 339 reqVO.setConfig(JSON.toJSONString(payClientConfig));
340   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,19),buildLocalDateTime(2021,11,21)}));
  340 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,19),buildTime(2021,11,21)}));
341 341  
342 342 // 调用
343 343 List<PayChannelDO> list = channelService.getChannelList(reqVO);
... ...
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/merchant/PayMerchantServiceTest.java
  View file @0d0f64e
... ... @@ -17,7 +17,7 @@ import javax.annotation.Resource;
17 17 import java.time.LocalDateTime;
18 18 import java.util.List;
19 19  
20   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
21 21 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
22 22 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
23 23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -116,7 +116,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
116 116 o.setShortName("灿灿子");
117 117 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
118 118 o.setRemark("灿哥的杂货铺");
119   - o.setCreateTime(buildLocalDateTime(2021,11,3));
  119 + o.setCreateTime(buildTime(2021,11,3));
120 120 });
121 121 merchantMapper.insert(dbMerchant);
122 122 // 测试 no 不匹配
... ... @@ -130,7 +130,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
130 130 // 测试 remark 不匹配
131 131 merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setRemark("斌哥的杂货铺")));
132 132 // 测试 createTime 不匹配
133   - merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildLocalDateTime(2022,12,4))));
  133 + merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildTime(2022,12,4))));
134 134 // 准备参数
135 135 PayMerchantPageReqVO reqVO = new PayMerchantPageReqVO();
136 136 reqVO.setNo("M1008611");
... ... @@ -138,7 +138,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
138 138 reqVO.setShortName("灿灿子");
139 139 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
140 140 reqVO.setRemark("灿哥的杂货铺");
141   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,2),buildLocalDateTime(2021,11,4)}));
  141 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,2),buildTime(2021,11,4)}));
142 142  
143 143 // 调用
144 144 PageResult<PayMerchantDO> pageResult = merchantService.getMerchantPage(reqVO);
... ... @@ -157,7 +157,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
157 157 o.setShortName("灿灿子");
158 158 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
159 159 o.setRemark("灿哥的杂货铺");
160   - o.setCreateTime(buildLocalDateTime(2021,11,3));
  160 + o.setCreateTime(buildTime(2021,11,3));
161 161 });
162 162 merchantMapper.insert(dbMerchant);
163 163 // 测试 no 不匹配
... ... @@ -171,7 +171,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
171 171 // 测试 remark 不匹配
172 172 merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setRemark("斌哥的杂货铺")));
173 173 // 测试 createTime 不匹配
174   - merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildLocalDateTime(2022,12,4))));
  174 + merchantMapper.insert(cloneIgnoreId(dbMerchant, o -> o.setCreateTime(buildTime(2022,12,4))));
175 175 // 准备参数
176 176 PayMerchantExportReqVO reqVO = new PayMerchantExportReqVO();
177 177 reqVO.setNo("M1008611");
... ... @@ -179,7 +179,7 @@ public class PayMerchantServiceTest extends BaseDbUnitTest {
179 179 reqVO.setShortName("灿灿子");
180 180 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
181 181 reqVO.setRemark("灿哥的杂货铺");
182   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021,11,2),buildLocalDateTime(2021,11,4)}));
  182 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021,11,2),buildTime(2021,11,4)}));
183 183  
184 184 // 调用
185 185 List<PayMerchantDO> list = merchantService.getMerchantList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceTest.java
  View file @0d0f64e
... ... @@ -24,7 +24,7 @@ import static cn.hutool.core.util.RandomUtil.randomEle;
24 24 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
25 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
26 26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
27   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  27 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
28 28 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
29 29 import static org.junit.jupiter.api.Assertions.*;
30 30 import static org.mockito.ArgumentMatchers.eq;
... ... @@ -48,7 +48,7 @@ public class DictTypeServiceTest extends BaseDbUnitTest {
48 48 o.setName("yunai");
49 49 o.setType("芋艿");
50 50 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
51   - o.setCreateTime(buildLocalDateTime(2021, 1, 15));
  51 + o.setCreateTime(buildTime(2021, 1, 15));
52 52 });
53 53 dictTypeMapper.insert(dbDictType);
54 54 // 测试 name 不匹配
... ... @@ -58,13 +58,13 @@ public class DictTypeServiceTest extends BaseDbUnitTest {
58 58 // 测试 status 不匹配
59 59 dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
60 60 // 测试 createTime 不匹配
61   - dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
  61 + dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setCreateTime(buildTime(2021, 1, 1))));
62 62 // 准备参数
63 63 DictTypePageReqVO reqVO = new DictTypePageReqVO();
64 64 reqVO.setName("nai");
65 65 reqVO.setType("艿");
66 66 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
67   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 10),buildLocalDateTime(2021, 1, 20)}));
  67 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 10),buildTime(2021, 1, 20)}));
68 68  
69 69 // 调用
70 70 PageResult<DictTypeDO> pageResult = dictTypeService.getDictTypePage(reqVO);
... ... @@ -81,7 +81,7 @@ public class DictTypeServiceTest extends BaseDbUnitTest {
81 81 o.setName("yunai");
82 82 o.setType("芋艿");
83 83 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
84   - o.setCreateTime(buildLocalDateTime(2021, 1, 15));
  84 + o.setCreateTime(buildTime(2021, 1, 15));
85 85 });
86 86 dictTypeMapper.insert(dbDictType);
87 87 // 测试 name 不匹配
... ... @@ -91,13 +91,13 @@ public class DictTypeServiceTest extends BaseDbUnitTest {
91 91 // 测试 status 不匹配
92 92 dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
93 93 // 测试 createTime 不匹配
94   - dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setCreateTime(buildLocalDateTime(2021, 1, 1))));
  94 + dictTypeMapper.insert(ObjectUtils.cloneIgnoreId(dbDictType, o -> o.setCreateTime(buildTime(2021, 1, 1))));
95 95 // 准备参数
96 96 DictTypeExportReqVO reqVO = new DictTypeExportReqVO();
97 97 reqVO.setName("nai");
98 98 reqVO.setType("艿");
99 99 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
100   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 1, 10),buildLocalDateTime(2021, 1, 20)}));
  100 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 10),buildTime(2021, 1, 20)}));
101 101  
102 102 // 调用
103 103 List<DictTypeDO> list = dictTypeService.getDictTypeList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
  View file @0d0f64e
... ... @@ -22,7 +22,7 @@ import java.util.List;
22 22 import java.util.function.Consumer;
23 23  
24 24 import static cn.hutool.core.util.RandomUtil.randomEle;
25   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  25 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
26 26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
27 27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
28 28 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
... ... @@ -96,7 +96,7 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
96 96 reqVO.setApplicationName("tu");
97 97 reqVO.setCode(1);
98 98 reqVO.setMessage("ma");
99   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),buildLocalDateTime(2020, 11, 30)}));
  99 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 11, 1),buildTime(2020, 11, 30)}));
100 100  
101 101 // 调用
102 102 PageResult<ErrorCodeDO> pageResult = errorCodeService.getErrorCodePage(reqVO);
... ... @@ -115,7 +115,7 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
115 115 o.setApplicationName("tudou");
116 116 o.setCode(1);
117 117 o.setMessage("yuanma");
118   - o.setCreateTime(buildLocalDateTime(2020, 11, 11));
  118 + o.setCreateTime(buildTime(2020, 11, 11));
119 119 });
120 120 errorCodeMapper.insert(dbErrorCode);
121 121 // 测试 type 不匹配
... ... @@ -127,7 +127,7 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
127 127 // 测试 message 不匹配
128 128 errorCodeMapper.insert(ObjectUtils.cloneIgnoreId(dbErrorCode, o -> o.setMessage("nai")));
129 129 // 测试 createTime 不匹配
130   - errorCodeMapper.insert(ObjectUtils.cloneIgnoreId(dbErrorCode, o -> o.setCreateTime(buildLocalDateTime(2020, 12, 12))));
  130 + errorCodeMapper.insert(ObjectUtils.cloneIgnoreId(dbErrorCode, o -> o.setCreateTime(buildTime(2020, 12, 12))));
131 131 return dbErrorCode;
132 132 }
133 133  
... ... @@ -141,7 +141,7 @@ public class ErrorCodeServiceTest extends BaseDbUnitTest {
141 141 reqVO.setApplicationName("tu");
142 142 reqVO.setCode(1);
143 143 reqVO.setMessage("ma");
144   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),buildLocalDateTime(2020, 11, 30)}));
  144 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 11, 1),buildTime(2020, 11, 30)}));
145 145  
146 146 // 调用
147 147 List<ErrorCodeDO> list = errorCodeService.getErrorCodeList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java
  View file @0d0f64e
... ... @@ -21,7 +21,7 @@ import java.time.LocalDateTime;
21 21 import java.util.List;
22 22  
23 23 import static cn.hutool.core.util.RandomUtil.randomEle;
24   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  24 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
25 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
26 26 import static cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.*;
27 27 import static org.junit.jupiter.api.Assertions.assertEquals;
... ... @@ -46,7 +46,7 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
46 46  
47 47 logDO.setUserIp("192.168.199.16");
48 48 logDO.setUsername("wangkai");
49   - logDO.setCreateTime(buildLocalDateTime(2021, 3, 6));
  49 + logDO.setCreateTime(buildTime(2021, 3, 6));
50 50 logDO.setResult(SUCCESS.getResult());
51 51 });
52 52 loginLogMapper.insert(loginLogDO);
... ... @@ -59,7 +59,7 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
59 59 // 不同username
60 60 loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setUsername("yunai")));
61 61 // 构造一个早期时间 2021-02-06 00:00:00
62   - loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setCreateTime(buildLocalDateTime(2021, 2, 6))));
  62 + loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setCreateTime(buildTime(2021, 2, 6))));
63 63  
64 64  
65 65 // 构造调用参数
... ... @@ -67,8 +67,8 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
67 67 reqVO.setUsername("wangkai");
68 68 reqVO.setUserIp("192.168.199");
69 69 reqVO.setStatus(true);
70   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
71   - buildLocalDateTime(2021, 3, 7)}));
  70 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 3, 5),
  71 + buildTime(2021, 3, 7)}));
72 72  
73 73 // 调用service方法
74 74 PageResult<LoginLogDO> pageResult = loginLogService.getLoginLogPage(reqVO);
... ... @@ -91,7 +91,7 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
91 91  
92 92 logDO.setUserIp("192.168.111.16");
93 93 logDO.setUsername("wangxiaokai");
94   - logDO.setCreateTime(buildLocalDateTime(2021, 3, 6));
  94 + logDO.setCreateTime(buildTime(2021, 3, 6));
95 95 logDO.setResult(SUCCESS.getResult());
96 96 });
97 97 loginLogMapper.insert(loginLogDO);
... ... @@ -104,15 +104,15 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
104 104 // 不同username
105 105 loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setUsername("yunai")));
106 106 // 构造一个早期时间 2021-02-06 00:00:00
107   - loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setCreateTime(buildLocalDateTime(2021, 2, 6))));
  107 + loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setCreateTime(buildTime(2021, 2, 6))));
108 108  
109 109 // 构造调用参数
110 110 LoginLogExportReqVO reqVO = new LoginLogExportReqVO();
111 111 reqVO.setUsername("wangxiaokai");
112 112 reqVO.setUserIp("192.168.111");
113 113 reqVO.setStatus(true);
114   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
115   - buildLocalDateTime(2021, 3, 7)}));
  114 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 3, 5),
  115 + buildTime(2021, 3, 7)}));
116 116  
117 117 // 调用service方法
118 118 List<LoginLogDO> loginLogList = loginLogService.getLoginLogList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
  View file @0d0f64e
... ... @@ -29,7 +29,7 @@ import java.util.List;
29 29  
30 30 import static cn.hutool.core.util.RandomUtil.randomEle;
31 31 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
32   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  32 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
33 33 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
34 34 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
35 35 import static org.junit.jupiter.api.Assertions.assertEquals;
... ... @@ -81,7 +81,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
81 81 o.setUserType(randomEle(UserTypeEnum.values()).getValue());
82 82 o.setModule("order");
83 83 o.setType(OperateTypeEnum.CREATE.getType());
84   - o.setStartTime(buildLocalDateTime(2021, 3, 6));
  84 + o.setStartTime(buildTime(2021, 3, 6));
85 85 o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
86 86 o.setExts(MapUtil.<String, Object>builder("orderId", randomLongId()).build());
87 87 });
... ... @@ -95,7 +95,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
95 95 // type 不同
96 96 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setType(OperateTypeEnum.IMPORT.getType())));
97 97 // createTime 不同
98   - operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildLocalDateTime(2021, 2, 6))));
  98 + operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildTime(2021, 2, 6))));
99 99 // resultCode 不同
100 100 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(BAD_REQUEST.getCode())));
101 101  
... ... @@ -104,8 +104,8 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
104 104 reqVO.setUserNickname("wangkai");
105 105 reqVO.setModule("order");
106 106 reqVO.setType(OperateTypeEnum.CREATE.getType());
107   - reqVO.setStartTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
108   - buildLocalDateTime(2021, 3, 7)}));
  107 + reqVO.setStartTime((new LocalDateTime[]{buildTime(2021, 3, 5),
  108 + buildTime(2021, 3, 7)}));
109 109 reqVO.setSuccess(true);
110 110  
111 111 // 调用service方法
... ... @@ -133,7 +133,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
133 133 o.setUserType(randomEle(UserTypeEnum.values()).getValue());
134 134 o.setModule("order");
135 135 o.setType(OperateTypeEnum.CREATE.getType());
136   - o.setStartTime(buildLocalDateTime(2021, 3, 6));
  136 + o.setStartTime(buildTime(2021, 3, 6));
137 137 o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
138 138 o.setExts(MapUtil.<String, Object>builder("orderId", randomLongId()).build());
139 139 });
... ... @@ -147,7 +147,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
147 147 // type 不同
148 148 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setType(OperateTypeEnum.IMPORT.getType())));
149 149 // createTime 不同
150   - operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildLocalDateTime(2021, 2, 6))));
  150 + operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildTime(2021, 2, 6))));
151 151 // resultCode 不同
152 152 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(BAD_REQUEST.getCode())));
153 153  
... ... @@ -156,7 +156,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
156 156 reqVO.setUserNickname("wangkai");
157 157 reqVO.setModule("order");
158 158 reqVO.setType(OperateTypeEnum.CREATE.getType());
159   - reqVO.setStartTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),buildLocalDateTime(2021, 3, 7)}));
  159 + reqVO.setStartTime((new LocalDateTime[]{buildTime(2021, 3, 5),buildTime(2021, 3, 7)}));
160 160 reqVO.setSuccess(true);
161 161  
162 162 // 调用 service 方法
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java
  View file @0d0f64e
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.service.permission;
3 3 import cn.hutool.core.util.RandomUtil;
4 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
7 6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
8 7 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO;
9 8 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO;
... ... @@ -21,9 +20,8 @@ import org.springframework.context.annotation.Import;
21 20 import javax.annotation.Resource;
22 21 import java.time.LocalDateTime;
23 22 import java.util.*;
24   -import java.util.stream.Collectors;
25 23  
26   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  24 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
27 25 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
28 26 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
29 27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
... ... @@ -129,7 +127,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
129 127 Long roleId = roleDO.getId();
130 128  
131 129 //调用
132   - Set<Long> deptIdSet = Arrays.asList(1L, 2L, 3L, 4L, 5L).stream().collect(Collectors.toSet());
  130 + Set<Long> deptIdSet = new HashSet<>(Arrays.asList(1L, 2L, 3L, 4L, 5L));
133 131 roleService.updateRoleDataScope(roleId, DataScopeEnum.DEPT_CUSTOM.getScope(), deptIdSet);
134 132  
135 133 //断言
... ... @@ -137,7 +135,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
137 135 assertEquals(DataScopeEnum.DEPT_CUSTOM.getScope(), newRoleDO.getDataScope());
138 136  
139 137 Set<Long> newDeptIdSet = newRoleDO.getDataScopeDeptIds();
140   - assertTrue(deptIdSet.size() == newDeptIdSet.size());
  138 + assertEquals(deptIdSet.size(), newDeptIdSet.size());
141 139 deptIdSet.stream().forEach(d -> assertTrue(newDeptIdSet.contains(d)));
142 140  
143 141 verify(roleProducer).sendRoleRefreshMessage();
... ... @@ -166,7 +164,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
166 164 o.setName("土豆");
167 165 o.setCode("tudou");
168 166 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
169   - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 8));
  167 + o.setCreateTime(buildTime(2022, 2, 8));
170 168 });
171 169 roleMapper.insert(dbRole);
172 170 // 测试 name 不匹配
... ... @@ -174,13 +172,13 @@ public class RoleServiceTest extends BaseDbUnitTest {
174 172 // 测试 code 不匹配
175 173 roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCode("hong")));
176 174 // 测试 createTime 不匹配
177   - roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 16))));
  175 + roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCreateTime(buildTime(2022, 2, 16))));
178 176 // 准备参数
179 177 RoleExportReqVO reqVO = new RoleExportReqVO();
180 178 reqVO.setName("土豆");
181 179 reqVO.setCode("tu");
182 180 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
183   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 2, 1),buildLocalDateTime(2022, 2, 12)}));
  181 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
184 182  
185 183 // 调用
186 184 List<RoleDO> list = roleService.getRoleList(reqVO);
... ... @@ -196,7 +194,7 @@ public class RoleServiceTest extends BaseDbUnitTest {
196 194 o.setName("土豆");
197 195 o.setCode("tudou");
198 196 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
199   - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 8));
  197 + o.setCreateTime(buildTime(2022, 2, 8));
200 198 });
201 199 roleMapper.insert(dbRole);
202 200 // 测试 name 不匹配
... ... @@ -204,13 +202,13 @@ public class RoleServiceTest extends BaseDbUnitTest {
204 202 // 测试 code 不匹配
205 203 roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCode("hong")));
206 204 // 测试 createTime 不匹配
207   - roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 16))));
  205 + roleMapper.insert(cloneIgnoreId(dbRole, o -> o.setCreateTime(buildTime(2022, 2, 16))));
208 206 // 准备参数
209 207 RolePageReqVO reqVO = new RolePageReqVO();
210 208 reqVO.setName("土豆");
211 209 reqVO.setCode("tu");
212 210 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
213   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 2, 1),buildLocalDateTime(2022, 2, 12)}));
  211 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
214 212  
215 213 // 调用
216 214 PageResult<RoleDO> pageResult = roleService.getRolePage(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
  View file @0d0f64e
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.service.sensitiveword;
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
6   -import cn.iocoder.yudao.framework.common.util.date.DateUtils;
7 6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
8 7 import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO;
9 8 import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO;
... ... @@ -21,7 +20,7 @@ import java.time.LocalDateTime;
21 20 import java.util.Arrays;
22 21 import java.util.List;
23 22  
24   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  23 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
25 24 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
26 25 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
27 26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
... ... @@ -145,7 +144,7 @@ public class SensitiveWordServiceImplTest extends BaseDbUnitTest {
145 144 o.setName("笨蛋");
146 145 o.setTags(Arrays.asList("论坛", "蔬菜"));
147 146 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
148   - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 8));
  147 + o.setCreateTime(buildTime(2022, 2, 8));
149 148 });
150 149 sensitiveWordMapper.insert(dbSensitiveWord);
151 150 // 测试 name 不匹配
... ... @@ -153,13 +152,13 @@ public class SensitiveWordServiceImplTest extends BaseDbUnitTest {
153 152 // 测试 tags 不匹配
154 153 sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setTags(Arrays.asList("短信", "日用品"))));
155 154 // 测试 createTime 不匹配
156   - sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 16))));
  155 + sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setCreateTime(buildTime(2022, 2, 16))));
157 156 // 准备参数
158 157 SensitiveWordPageReqVO reqVO = new SensitiveWordPageReqVO();
159 158 reqVO.setName("笨");
160 159 reqVO.setTag("论坛");
161 160 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
162   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 2, 1),buildLocalDateTime(2022, 2, 12)}));
  161 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
163 162  
164 163 // 调用
165 164 PageResult<SensitiveWordDO> pageResult = sensitiveWordService.getSensitiveWordPage(reqVO);
... ... @@ -176,7 +175,7 @@ public class SensitiveWordServiceImplTest extends BaseDbUnitTest {
176 175 o.setName("笨蛋");
177 176 o.setTags(Arrays.asList("论坛", "蔬菜"));
178 177 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
179   - o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 8));
  178 + o.setCreateTime(buildTime(2022, 2, 8));
180 179 });
181 180 sensitiveWordMapper.insert(dbSensitiveWord);
182 181 // 测试 name 不匹配
... ... @@ -184,13 +183,13 @@ public class SensitiveWordServiceImplTest extends BaseDbUnitTest {
184 183 // 测试 tags 不匹配
185 184 sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setTags(Arrays.asList("短信", "日用品"))));
186 185 // 测试 createTime 不匹配
187   - sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setCreateTime(DateUtils.buildLocalDateTime(2022, 2, 16))));
  186 + sensitiveWordMapper.insert(cloneIgnoreId(dbSensitiveWord, o -> o.setCreateTime(buildTime(2022, 2, 16))));
188 187 // 准备参数
189 188 SensitiveWordExportReqVO reqVO = new SensitiveWordExportReqVO();
190 189 reqVO.setName("笨");
191 190 reqVO.setTag("论坛");
192 191 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
193   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 2, 1),buildLocalDateTime(2022, 2, 12)}));
  192 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 2, 1),buildTime(2022, 2, 12)}));
194 193  
195 194 // 调用
196 195 List<SensitiveWordDO> list = sensitiveWordService.getSensitiveWordList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
  View file @0d0f64e
... ... @@ -24,7 +24,7 @@ import java.util.function.Consumer;
24 24 import static cn.hutool.core.util.RandomUtil.randomEle;
25 25 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN;
26 26 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
27   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  27 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
28 28 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
29 29 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
30 30 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
... ... @@ -159,7 +159,7 @@ public class SmsChannelServiceTest extends BaseDbUnitTest {
159 159 SmsChannelDO dbSmsChannel = randomPojo(SmsChannelDO.class, o -> { // 等会查询到
160 160 o.setSignature("芋道源码");
161 161 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
162   - o.setCreateTime(buildLocalDateTime(2020, 12, 12));
  162 + o.setCreateTime(buildTime(2020, 12, 12));
163 163 });
164 164 smsChannelMapper.insert(dbSmsChannel);
165 165 // 测试 signature 不匹配
... ... @@ -167,12 +167,12 @@ public class SmsChannelServiceTest extends BaseDbUnitTest {
167 167 // 测试 status 不匹配
168 168 smsChannelMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsChannel, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
169 169 // 测试 createTime 不匹配
170   - smsChannelMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsChannel, o -> o.setCreateTime(buildLocalDateTime(2020, 11, 11))));
  170 + smsChannelMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsChannel, o -> o.setCreateTime(buildTime(2020, 11, 11))));
171 171 // 准备参数
172 172 SmsChannelPageReqVO reqVO = new SmsChannelPageReqVO();
173 173 reqVO.setSignature("芋道");
174 174 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
175   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 12, 1),buildLocalDateTime(2020, 12, 24)}));
  175 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)}));
176 176  
177 177 // 调用
178 178 PageResult<SmsChannelDO> pageResult = smsChannelService.getSmsChannelPage(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java
  View file @0d0f64e
... ... @@ -26,7 +26,7 @@ import java.util.function.Consumer;
26 26  
27 27 import static cn.hutool.core.util.RandomUtil.randomBoolean;
28 28 import static cn.hutool.core.util.RandomUtil.randomEle;
29   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  29 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
30 30 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
31 31 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
32 32 import static org.junit.jupiter.api.Assertions.assertEquals;
... ... @@ -49,9 +49,9 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
49 49 o.setTemplateId(10L);
50 50 o.setMobile("15601691300");
51 51 o.setSendStatus(SmsSendStatusEnum.INIT.getStatus());
52   - o.setSendTime(buildLocalDateTime(2020, 11, 11));
  52 + o.setSendTime(buildTime(2020, 11, 11));
53 53 o.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
54   - o.setReceiveTime(buildLocalDateTime(2021, 11, 11));
  54 + o.setReceiveTime(buildTime(2021, 11, 11));
55 55 });
56 56 smsLogMapper.insert(dbSmsLog);
57 57 // 测试 channelId 不匹配
... ... @@ -63,22 +63,22 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
63 63 // 测试 sendStatus 不匹配
64 64 smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendStatus(SmsSendStatusEnum.IGNORE.getStatus())));
65 65 // 测试 sendTime 不匹配
66   - smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendTime(buildLocalDateTime(2020, 12, 12))));
  66 + smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendTime(buildTime(2020, 12, 12))));
67 67 // 测试 receiveStatus 不匹配
68 68 smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveStatus(SmsReceiveStatusEnum.SUCCESS.getStatus())));
69 69 // 测试 receiveTime 不匹配
70   - smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveTime(buildLocalDateTime(2021, 12, 12))));
  70 + smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveTime(buildTime(2021, 12, 12))));
71 71 // 准备参数
72 72 SmsLogPageReqVO reqVO = new SmsLogPageReqVO();
73 73 reqVO.setChannelId(1L);
74 74 reqVO.setTemplateId(10L);
75 75 reqVO.setMobile("156");
76 76 reqVO.setSendStatus(SmsSendStatusEnum.INIT.getStatus());
77   - reqVO.setSendTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),
78   - buildLocalDateTime(2020, 11, 30)}));
  77 + reqVO.setSendTime((new LocalDateTime[]{buildTime(2020, 11, 1),
  78 + buildTime(2020, 11, 30)}));
79 79 reqVO.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
80   - reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),
81   - buildLocalDateTime(2021, 11, 30)}));
  80 + reqVO.setReceiveTime((new LocalDateTime[]{buildTime(2021, 11, 1),
  81 + buildTime(2021, 11, 30)}));
82 82  
83 83 // 调用
84 84 PageResult<SmsLogDO> pageResult = smsLogService.getSmsLogPage(reqVO);
... ... @@ -96,9 +96,9 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
96 96 o.setTemplateId(10L);
97 97 o.setMobile("15601691300");
98 98 o.setSendStatus(SmsSendStatusEnum.INIT.getStatus());
99   - o.setSendTime(buildLocalDateTime(2020, 11, 11));
  99 + o.setSendTime(buildTime(2020, 11, 11));
100 100 o.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
101   - o.setReceiveTime(buildLocalDateTime(2021, 11, 11));
  101 + o.setReceiveTime(buildTime(2021, 11, 11));
102 102 });
103 103 smsLogMapper.insert(dbSmsLog);
104 104 // 测试 channelId 不匹配
... ... @@ -110,22 +110,22 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
110 110 // 测试 sendStatus 不匹配
111 111 smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendStatus(SmsSendStatusEnum.IGNORE.getStatus())));
112 112 // 测试 sendTime 不匹配
113   - smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendTime(buildLocalDateTime(2020, 12, 12))));
  113 + smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setSendTime(buildTime(2020, 12, 12))));
114 114 // 测试 receiveStatus 不匹配
115 115 smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveStatus(SmsReceiveStatusEnum.SUCCESS.getStatus())));
116 116 // 测试 receiveTime 不匹配
117   - smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveTime(buildLocalDateTime(2021, 12, 12))));
  117 + smsLogMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsLog, o -> o.setReceiveTime(buildTime(2021, 12, 12))));
118 118 // 准备参数
119 119 SmsLogExportReqVO reqVO = new SmsLogExportReqVO();
120 120 reqVO.setChannelId(1L);
121 121 reqVO.setTemplateId(10L);
122 122 reqVO.setMobile("156");
123 123 reqVO.setSendStatus(SmsSendStatusEnum.INIT.getStatus());
124   - reqVO.setSendTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),
125   - buildLocalDateTime(2020, 11, 30)}));
  124 + reqVO.setSendTime((new LocalDateTime[]{buildTime(2020, 11, 1),
  125 + buildTime(2020, 11, 30)}));
126 126 reqVO.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
127   - reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),
128   - buildLocalDateTime(2021, 11, 30)}));
  127 + reqVO.setReceiveTime((new LocalDateTime[]{buildTime(2021, 11, 1),
  128 + buildTime(2021, 11, 30)}));
129 129  
130 130 // 调用
131 131 List<SmsLogDO> list = smsLogService.getSmsLogList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
  View file @0d0f64e
... ... @@ -34,7 +34,7 @@ import static cn.hutool.core.bean.BeanUtil.getFieldValue;
34 34 import static cn.hutool.core.util.RandomUtil.randomEle;
35 35 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
36 36 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
37   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  37 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
38 38 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
39 39 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
40 40 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
... ... @@ -205,7 +205,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
205 205 o.setContent("芋道源码");
206 206 o.setApiTemplateId("yunai");
207 207 o.setChannelId(1L);
208   - o.setCreateTime(buildLocalDateTime(2021, 11, 11));
  208 + o.setCreateTime(buildTime(2021, 11, 11));
209 209 });
210 210 smsTemplateMapper.insert(dbSmsTemplate);
211 211 // 测试 type 不匹配
... ... @@ -221,7 +221,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
221 221 // 测试 channelId 不匹配
222 222 smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setChannelId(2L)));
223 223 // 测试 createTime 不匹配
224   - smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setCreateTime(buildLocalDateTime(2021, 12, 12))));
  224 + smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setCreateTime(buildTime(2021, 12, 12))));
225 225 // 准备参数
226 226 SmsTemplatePageReqVO reqVO = new SmsTemplatePageReqVO();
227 227 reqVO.setType(SmsTemplateTypeEnum.PROMOTION.getType());
... ... @@ -230,7 +230,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
230 230 reqVO.setContent("芋道");
231 231 reqVO.setApiTemplateId("yu");
232 232 reqVO.setChannelId(1L);
233   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),buildLocalDateTime(2021, 12, 1)}));
  233 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 11, 1),buildTime(2021, 12, 1)}));
234 234  
235 235 // 调用
236 236 PageResult<SmsTemplateDO> pageResult = smsTemplateService.getSmsTemplatePage(reqVO);
... ... @@ -250,7 +250,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
250 250 o.setContent("芋道源码");
251 251 o.setApiTemplateId("yunai");
252 252 o.setChannelId(1L);
253   - o.setCreateTime(buildLocalDateTime(2021, 11, 11));
  253 + o.setCreateTime(buildTime(2021, 11, 11));
254 254 });
255 255 smsTemplateMapper.insert(dbSmsTemplate);
256 256 // 测试 type 不匹配
... ... @@ -266,7 +266,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
266 266 // 测试 channelId 不匹配
267 267 smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setChannelId(2L)));
268 268 // 测试 createTime 不匹配
269   - smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setCreateTime(buildLocalDateTime(2021, 12, 12))));
  269 + smsTemplateMapper.insert(ObjectUtils.cloneIgnoreId(dbSmsTemplate, o -> o.setCreateTime(buildTime(2021, 12, 12))));
270 270 // 准备参数
271 271 SmsTemplateExportReqVO reqVO = new SmsTemplateExportReqVO();
272 272 reqVO.setType(SmsTemplateTypeEnum.PROMOTION.getType());
... ... @@ -275,7 +275,7 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
275 275 reqVO.setContent("芋道");
276 276 reqVO.setApiTemplateId("yu");
277 277 reqVO.setChannelId(1L);
278   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),buildLocalDateTime(2021, 12, 1)}));
  278 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 11, 1),buildTime(2021, 12, 1)}));
279 279  
280 280 // 调用
281 281 List<SmsTemplateDO> list = smsTemplateService.getSmsTemplateList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java
  View file @0d0f64e
... ... @@ -17,7 +17,7 @@ import javax.annotation.Resource;
17 17  
18 18 import java.time.LocalDateTime;
19 19  
20   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
21 21 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
22 22 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
23 23 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -142,7 +142,7 @@ public class TenantPackageServiceImplTest extends BaseDbUnitTest {
142 142 o.setName("芋道源码");
143 143 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
144 144 o.setRemark("源码解析");
145   - o.setCreateTime(buildLocalDateTime(2022, 10, 10));
  145 + o.setCreateTime(buildTime(2022, 10, 10));
146 146 });
147 147 tenantPackageMapper.insert(dbTenantPackage);
148 148 // 测试 name 不匹配
... ... @@ -152,13 +152,13 @@ public class TenantPackageServiceImplTest extends BaseDbUnitTest {
152 152 // 测试 remark 不匹配
153 153 tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setRemark("解析")));
154 154 // 测试 createTime 不匹配
155   - tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setCreateTime(buildLocalDateTime(2022, 11, 11))));
  155 + tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setCreateTime(buildTime(2022, 11, 11))));
156 156 // 准备参数
157 157 TenantPackagePageReqVO reqVO = new TenantPackagePageReqVO();
158 158 reqVO.setName("芋道");
159 159 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
160 160 reqVO.setRemark("源码");
161   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2022, 10, 9),buildLocalDateTime(2022, 10, 11)}));
  161 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 10, 9),buildTime(2022, 10, 11)}));
162 162  
163 163 // 调用
164 164 PageResult<TenantPackageDO> pageResult = tenantPackageService.getTenantPackagePage(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
  View file @0d0f64e
... ... @@ -34,7 +34,7 @@ import java.util.Collections;
34 34 import java.util.List;
35 35  
36 36 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
37   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  37 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
38 38 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
39 39 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
40 40 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
... ... @@ -110,7 +110,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
110 110 public void testValidTenant_expired() {
111 111 // mock 数据
112 112 TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.ENABLE.getStatus())
113   - .setExpireTime(buildLocalDateTime(2020, 2, 2)));
  113 + .setExpireTime(buildTime(2020, 2, 2)));
114 114 tenantMapper.insert(tenant);
115 115  
116 116 // 调用，并断言业务异常
... ... @@ -291,7 +291,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
291 291 o.setContactName("芋艿");
292 292 o.setContactMobile("15601691300");
293 293 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
294   - o.setCreateTime(buildLocalDateTime(2020, 12, 12));
  294 + o.setCreateTime(buildTime(2020, 12, 12));
295 295 });
296 296 tenantMapper.insert(dbTenant);
297 297 // 测试 name 不匹配
... ... @@ -303,14 +303,14 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
303 303 // 测试 status 不匹配
304 304 tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
305 305 // 测试 createTime 不匹配
306   - tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildLocalDateTime(2021, 12, 12))));
  306 + tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildTime(2021, 12, 12))));
307 307 // 准备参数
308 308 TenantPageReqVO reqVO = new TenantPageReqVO();
309 309 reqVO.setName("芋道");
310 310 reqVO.setContactName("艿");
311 311 reqVO.setContactMobile("1560");
312 312 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
313   - reqVO.setCreateTime(new LocalDateTime[]{buildLocalDateTime(2020, 12, 1),buildLocalDateTime(2020, 12, 24)});
  313 + reqVO.setCreateTime(new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)});
314 314  
315 315 // 调用
316 316 PageResult<TenantDO> pageResult = tenantService.getTenantPage(reqVO);
... ... @@ -328,7 +328,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
328 328 o.setContactName("芋艿");
329 329 o.setContactMobile("15601691300");
330 330 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
331   - o.setCreateTime(buildLocalDateTime(2020, 12, 12));
  331 + o.setCreateTime(buildTime(2020, 12, 12));
332 332 });
333 333 tenantMapper.insert(dbTenant);
334 334 // 测试 name 不匹配
... ... @@ -340,14 +340,14 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
340 340 // 测试 status 不匹配
341 341 tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
342 342 // 测试 createTime 不匹配
343   - tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildLocalDateTime(2021, 12, 12))));
  343 + tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildTime(2021, 12, 12))));
344 344 // 准备参数
345 345 TenantExportReqVO reqVO = new TenantExportReqVO();
346 346 reqVO.setName("芋道");
347 347 reqVO.setContactName("艿");
348 348 reqVO.setContactMobile("1560");
349 349 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
350   - reqVO.setCreateTime(new LocalDateTime[]{buildLocalDateTime(2020, 12, 1),buildLocalDateTime(2020, 12, 24)});
  350 + reqVO.setCreateTime(new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)});
351 351  
352 352 // 调用
353 353 List<TenantDO> list = tenantService.getTenantList(reqVO);
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
  View file @0d0f64e
... ... @@ -40,7 +40,7 @@ import java.util.function.Consumer;
40 40 import static cn.hutool.core.util.RandomUtil.randomBytes;
41 41 import static cn.hutool.core.util.RandomUtil.randomEle;
42 42 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
43   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  43 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
44 44 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
45 45 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
46 46 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
... ... @@ -295,7 +295,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
295 295 reqVO.setUsername("tu");
296 296 reqVO.setMobile("1560");
297 297 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
298   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 12, 1),buildLocalDateTime(2020, 12, 24)}));
  298 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)}));
299 299 reqVO.setDeptId(1L); // 其中，1L 是 2L 的父部门
300 300 // mock 方法
301 301 List<DeptDO> deptList = newArrayList(randomPojo(DeptDO.class, o -> o.setId(2L)));
... ... @@ -318,7 +318,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
318 318 reqVO.setUsername("tu");
319 319 reqVO.setMobile("1560");
320 320 reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
321   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2020, 12, 1),buildLocalDateTime(2020, 12, 24)}));
  321 + reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)}));
322 322 reqVO.setDeptId(1L); // 其中，1L 是 2L 的父部门
323 323 // mock 方法
324 324 List<DeptDO> deptList = newArrayList(randomPojo(DeptDO.class, o -> o.setId(2L)));
... ... @@ -340,7 +340,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
340 340 o.setUsername("tudou");
341 341 o.setMobile("15601691300");
342 342 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
343   - o.setCreateTime(buildLocalDateTime(2020, 12, 12));
  343 + o.setCreateTime(buildTime(2020, 12, 12));
344 344 o.setDeptId(2L);
345 345 });
346 346 userMapper.insert(dbUser);
... ... @@ -351,7 +351,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
351 351 // 测试 status 不匹配
352 352 userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
353 353 // 测试 createTime 不匹配
354   - userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setCreateTime(buildLocalDateTime(2020, 11, 11))));
  354 + userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setCreateTime(buildTime(2020, 11, 11))));
355 355 // 测试 dept 不匹配
356 356 userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setDeptId(0L)));
357 357 return dbUser;
... ...