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

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -150,15 +150,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             mqttUserInfo.setDeviceId(deviceRegister.getDeviceId());
             mqttUserService.save(mqttUserInfo);
         } else {
-            if (deviceType == 5) {
-                //支付宝设备注册
-                alipayDeviceService.deviceAssign(new DeviceAssignDTO()
-                        .setTerminalId(String.valueOf(deviceRegister.getDeviceId()))
-                        .setDeviceIdentifyType("DYNAMIC")
-                        .setDeviceSn(deviceRegister.getDeviceSn())
-                        .setDeviceName(String.valueOf(deviceRegister.getDeviceId()))
-                );
-            }
             updateById(deviceRegister);
             deviceSysinfoMapper.updateById(deviceSysinfo);
             mqttUserService.update(new LambdaUpdateWrapper<MqttUser>()
@@ -379,16 +370,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                         R r = deviceRegisterService.save(save);
                         if (r.getCode() == R.Enum.FAIL.getCode()) {
                             log.error("{},{}", uploadSaveBySn.getSn(), r.getMsg());
-                        } else {
-                            //初始化支付宝设备
-                            if (deviceTypeValue == 5) {
-                                alipayDeviceService.deviceAssign(new DeviceAssignDTO()
-                                        .setTerminalId(String.valueOf(deviceId))
-                                        .setDeviceIdentifyType("DYNAMIC")
-                                        .setDeviceSn(uploadSaveBySn.getSn())
-                                        .setDeviceName(String.valueOf(deviceId))
-                                );
-                            }
                         }
                     });
                 }