BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b2e6e36fc5724e0ef2e3804f879a19f6ef5db1d1

Authored by YunaiV
1 parent 40ba456f

1. 修复 LoginLogServiceImplTest 

2. 修复 OperateLogServiceImplTest
3. 修复 SmsLogServiceTest
Inline Side-by-side
Showing 4 changed files with 28 additions and 21 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java
  View file @b2e6e36
... ... @@ -20,7 +20,7 @@ public interface SmsLogMapper extends BaseMapperX<SmsLogDO> {
20 20 .likeIfPresent(SmsLogDO::getMobile, reqVO.getMobile())
21 21 .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getSendStatus())
22 22 .betweenIfPresent(SmsLogDO::getSendTime, reqVO.getSendTime())
23   - .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getReceiveStatus())
  23 + .eqIfPresent(SmsLogDO::getReceiveStatus, reqVO.getReceiveStatus())
24 24 .betweenIfPresent(SmsLogDO::getReceiveTime, reqVO.getReceiveTime())
25 25 .orderByDesc(SmsLogDO::getId));
26 26 }
... ... @@ -32,7 +32,7 @@ public interface SmsLogMapper extends BaseMapperX<SmsLogDO> {
32 32 .likeIfPresent(SmsLogDO::getMobile, reqVO.getMobile())
33 33 .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getSendStatus())
34 34 .betweenIfPresent(SmsLogDO::getSendTime, reqVO.getSendTime())
35   - .eqIfPresent(SmsLogDO::getSendStatus, reqVO.getReceiveStatus())
  35 + .eqIfPresent(SmsLogDO::getReceiveStatus, reqVO.getReceiveStatus())
36 36 .betweenIfPresent(SmsLogDO::getReceiveTime, reqVO.getReceiveTime())
37 37 .orderByDesc(SmsLogDO::getId));
38 38 }
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java
  View file @b2e6e36
1 1 package cn.iocoder.yudao.module.system.service.logger;
2 2  
3 3 import cn.hutool.core.util.RandomUtil;
4   -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO;
5 4 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
6 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 6 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
  7 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
  8 +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
  9 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
  10 +import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO;
8 11 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO;
9 12 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO;
  13 +import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO;
10 14 import cn.iocoder.yudao.module.system.dal.mysql.logger.LoginLogMapper;
11   -import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
12   -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
13 15 import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum;
14   -import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
15   -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO;
16   -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
17 16 import org.junit.jupiter.api.Test;
18 17 import org.springframework.context.annotation.Import;
19 18  
... ... @@ -22,8 +21,9 @@ import java.time.LocalDateTime;
22 21 import java.util.List;
23 22  
24 23 import static cn.hutool.core.util.RandomUtil.randomEle;
25   -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
26 24 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime;
  25 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  26 +import static cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.*;
27 27 import static org.junit.jupiter.api.Assertions.assertEquals;
28 28  
29 29 @Import(LoginLogServiceImpl.class)
... ... @@ -47,13 +47,13 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
47 47 logDO.setUserIp("192.168.199.16");
48 48 logDO.setUsername("wangkai");
49 49 logDO.setCreateTime(buildLocalDateTime(2021, 3, 6));
50   - logDO.setResult(cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.SUCCESS.getResult());
  50 + logDO.setResult(SUCCESS.getResult());
51 51 });
52 52 loginLogMapper.insert(loginLogDO);
53 53  
54 54 // 下面几个都是不匹配的数据
55 55 // 登录失败的
56   - loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setResult(cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.CAPTCHA_CODE_ERROR.getResult())));
  56 + loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setResult(CAPTCHA_CODE_ERROR.getResult())));
57 57 // 不同ip段的
58 58 loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setUserIp("192.168.128.18")));
59 59 // 不同username
... ... @@ -67,7 +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),buildLocalDateTime(2021, 3, 5)}));
  70 + reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
  71 + buildLocalDateTime(2021, 3, 7)}));
71 72  
72 73 // 调用service方法
73 74 PageResult<LoginLogDO> pageResult = loginLogService.getLoginLogPage(reqVO);
... ... @@ -91,13 +92,13 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
91 92 logDO.setUserIp("192.168.111.16");
92 93 logDO.setUsername("wangxiaokai");
93 94 logDO.setCreateTime(buildLocalDateTime(2021, 3, 6));
94   - logDO.setResult(cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.SUCCESS.getResult());
  95 + logDO.setResult(SUCCESS.getResult());
95 96 });
96 97 loginLogMapper.insert(loginLogDO);
97 98  
98 99 // 下面几个都是不匹配的数据
99 100 // 登录失败的
100   - loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setResult(cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.CAPTCHA_CODE_ERROR.getResult())));
  101 + loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setResult(CAPTCHA_CODE_ERROR.getResult())));
101 102 // 不同ip段的
102 103 loginLogMapper.insert(ObjectUtils.cloneIgnoreId(loginLogDO, logDO -> logDO.setUserIp("192.168.128.18")));
103 104 // 不同username
... ... @@ -110,7 +111,8 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
110 111 reqVO.setUsername("wangxiaokai");
111 112 reqVO.setUserIp("192.168.111");
112 113 reqVO.setStatus(true);
113   - reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),buildLocalDateTime(2021, 3, 5)}));
  114 + reqVO.setCreateTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
  115 + buildLocalDateTime(2021, 3, 7)}));
114 116  
115 117 // 调用service方法
116 118 List<LoginLogDO> loginLogList = loginLogService.getLoginLogList(reqVO);
... ... @@ -126,7 +128,7 @@ public class LoginLogServiceImplTest extends BaseDbUnitTest {
126 128 // 指定随机的范围,避免超出范围入库失败
127 129 vo.setUserType(randomEle(UserTypeEnum.values()).getValue());
128 130 vo.setLogType(randomEle(LoginLogTypeEnum.values()).getType());
129   - vo.setResult(randomEle(LoginResultEnum.values()).getResult());
  131 + vo.setResult(randomEle(values()).getResult());
130 132 vo.setTraceId(TracerUtils.getTraceId());
131 133 });
132 134  
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
  View file @b2e6e36
... ... @@ -104,7 +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),buildLocalDateTime(2021, 3, 7)}));
  107 + reqVO.setStartTime((new LocalDateTime[]{buildLocalDateTime(2021, 3, 5),
  108 + buildLocalDateTime(2021, 3, 7)}));
108 109 reqVO.setSuccess(true);
109 110  
110 111 // 调用service方法
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java
  View file @b2e6e36
... ... @@ -74,9 +74,11 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
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),buildLocalDateTime(2020, 11, 30)}));
  77 + reqVO.setSendTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),
  78 + buildLocalDateTime(2020, 11, 30)}));
78 79 reqVO.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
79   - reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),buildLocalDateTime(2021, 11, 30)}));
  80 + reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),
  81 + buildLocalDateTime(2021, 11, 30)}));
80 82  
81 83 // 调用
82 84 PageResult<SmsLogDO> pageResult = smsLogService.getSmsLogPage(reqVO);
... ... @@ -119,9 +121,11 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
119 121 reqVO.setTemplateId(10L);
120 122 reqVO.setMobile("156");
121 123 reqVO.setSendStatus(SmsSendStatusEnum.INIT.getStatus());
122   - reqVO.setSendTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),buildLocalDateTime(2020, 11, 30)}));
  124 + reqVO.setSendTime((new LocalDateTime[]{buildLocalDateTime(2020, 11, 1),
  125 + buildLocalDateTime(2020, 11, 30)}));
123 126 reqVO.setReceiveStatus(SmsReceiveStatusEnum.INIT.getStatus());
124   - reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),buildLocalDateTime(2021, 11, 30)}));
  127 + reqVO.setReceiveTime((new LocalDateTime[]{buildLocalDateTime(2021, 11, 1),
  128 + buildLocalDateTime(2021, 11, 30)}));
125 129  
126 130 // 调用
127 131 List<SmsLogDO> list = smsLogService.getSmsLogList(reqVO);
... ...