Commit ecda40d300db4c6559fe817a6a6b46a19e7713b1

Authored by YunaiV
1 parent efb20922

fix:单测报错

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaTaskRecordController.java
1 package cn.iocoder.yudao.module.iot.controller.admin.ota; 1 package cn.iocoder.yudao.module.iot.controller.admin.ota;
2 2
3 -4import cn.hutool.core.collection.CollUtil; 3 +import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageMethodEnum.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.core.enums; @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.core.enums;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 import cn.iocoder.yudao.framework.common.core.ArrayValuable; 4 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
  5 +import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
5 import lombok.AllArgsConstructor; 6 import lombok.AllArgsConstructor;
6 import lombok.Getter; 7 import lombok.Getter;
7 8
@@ -57,7 +58,7 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> { @@ -57,7 +58,7 @@ public enum IotDeviceMessageMethodEnum implements ArrayValuable<String> {
57 /** 58 /**
58 * 不进行 reply 回复的方法集合 59 * 不进行 reply 回复的方法集合
59 */ 60 */
60 - public static final Set<String> REPLY_DISABLED = Set.of( 61 + public static final Set<String> REPLY_DISABLED = SetUtils.asSet(
61 STATE_UPDATE.getMethod(), 62 STATE_UPDATE.getMethod(),
62 OTA_PROGRESS.getMethod() // 参考阿里云,OTA 升级进度上报,不进行回复 63 OTA_PROGRESS.getMethod() // 参考阿里云,OTA 升级进度上报,不进行回复
63 ); 64 );
yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
@@ -610,7 +610,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest { @@ -610,7 +610,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
610 orderExtensionMapper.insert(orderExtension); 610 orderExtensionMapper.insert(orderExtension);
611 // 重要:需要将 order 的 extensionId 更新下 611 // 重要:需要将 order 的 extensionId 更新下
612 order.setExtensionId(orderExtension.getId()); 612 order.setExtensionId(orderExtension.getId());
613 - orderMapper.updateById(order); 613 + orderMapper.updateById(new PayOrderDO().setId(order.getId()).setExtensionId(orderExtension.getId()));
614 // 准备参数 614 // 准备参数
615 PayChannelDO channel = randomPojo(PayChannelDO.class, o -> o.setId(10L)); 615 PayChannelDO channel = randomPojo(PayChannelDO.class, o -> o.setId(10L));
616 PayOrderRespDTO notify = randomPojo(PayOrderRespDTO.class, 616 PayOrderRespDTO notify = randomPojo(PayOrderRespDTO.class,
@@ -622,7 +622,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest { @@ -622,7 +622,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
622 // 断言 PayOrderExtensionDO :数据未更新,因为它是 SUCCESS 622 // 断言 PayOrderExtensionDO :数据未更新,因为它是 SUCCESS
623 assertPojoEquals(orderExtension, orderExtensionMapper.selectOne(null)); 623 assertPojoEquals(orderExtension, orderExtensionMapper.selectOne(null));
624 // 断言 PayOrderDO :数据未更新,因为它是 SUCCESS 624 // 断言 PayOrderDO :数据未更新,因为它是 SUCCESS
625 - assertPojoEquals(order, orderMapper.selectOne(null)); 625 + assertPojoEquals(order, orderMapper.selectOne(null), "updateTime", "updater");
626 // 断言,调用 626 // 断言,调用
627 verify(notifyService, never()).createPayNotifyTask(anyInt(), anyLong()); 627 verify(notifyService, never()).createPayNotifyTask(anyInt(), anyLong());
628 } 628 }