Merge remote-tracking branch 'origin/master' into test

device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -22,6 +22,8 @@ import com.xy.service.*;
 import com.xy.service.factory.cmd.CmdService;
 import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
+import com.xy.utils.Enum.AlgorithmTypeEnum;
+import com.xy.utils.enums.DeviceTypeEnum;
 import lombok.AllArgsConstructor;
 
 import java.time.LocalDateTime;
@@ -89,6 +91,9 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
                 .setDeviceType(deviceRegister.getDeviceType())
                 .setMercDeviceCode(deviceRegister.getAssetNo())
                 .setCreateTime(deviceRegister.getCreateTime());
+        if (deviceRegister.getDeviceType() == DeviceTypeEnum.TYPE5.getCode().intValue()) {
+            deviceInfo.setAlgorithmId(AlgorithmTypeEnum.ALIPAY.getId());
+        }
         DeviceSysinfo deviceSysinfo = new DeviceSysinfo()
                 .setDeviceId(deviceRegister.getDeviceId())
                 .setDeviceSn(deviceRegister.getDeviceSn())
@@ -135,6 +140,7 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         return R.ok();
     }
 
+
     @Override
     public R active(MercMiniDeviceDto.Active active) {
         DeviceInfo deviceInfo = deviceInfoService.getById(active.getDeviceId());