Merge branch 'hhk' of https://git.ngsk.tech/linweidong/besure_server

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java

@@ -73,7 +73,7 @@ public class DeviceSaveReqVO {
     private String password;
 
     @Schema(description = "是否连接1-连接 2-断开连接", example = "1")
-    @NotNull
+//    @NotNull
     private Integer isConnect;
 
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java

@@ -237,7 +237,7 @@ public class DeviceServiceImpl implements DeviceService {
         DeviceDO deviceDO = validateConnectRequest(createReqVO);
 
         if (Objects.equals(createReqVO.getIsConnect(), DeviceConnectionStatusEnum.CONNECTED.getStatus())){
-            boolean connected = OpcUtils.connect(deviceDO.getUrl(),createReqVO.getUsername(),createReqVO.getPassword(),10);
+            boolean connected = OpcUtils.connect(deviceDO.getUrl(),deviceDO.getUsername(),deviceDO.getPassword(),10);
             if (connected){
                 deviceDO.setStatus(String.valueOf(DeviceConnectionStatusEnum.CONNECTED.getStatus()));
                 deviceMapper.updateById(deviceDO);