|
|
@@ -8,6 +8,7 @@ import com.yunfeiyun.agmp.common.constant.ErrorCode;
|
|
|
import com.yunfeiyun.agmp.common.utils.DateUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.SecurityUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
|
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
|
|
|
import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
|
|
|
@@ -19,6 +20,7 @@ import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo;
|
|
|
import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnInfoResVo;
|
|
|
import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo;
|
|
|
import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceconnMapper;
|
|
|
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
|
|
|
import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconnService;
|
|
|
import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -39,6 +41,9 @@ public class IotDeviceconnServiceImpl implements IIotDeviceconnService
|
|
|
@Autowired
|
|
|
private ITosDevicetypeService tosDevicetypeService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IIotDeviceService iotDeviceService;
|
|
|
+
|
|
|
@Override
|
|
|
public int addDeviceconn(IotDeviceconnAddReqVo reqVo, boolean isCreateConnect) {
|
|
|
String devconnType = reqVo.getDevconnType();
|
|
|
@@ -229,7 +234,13 @@ public class IotDeviceconnServiceImpl implements IIotDeviceconnService
|
|
|
if(iotDeviceconnList == null || iotDeviceconnList.isEmpty()){
|
|
|
throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"连接配置不存在");
|
|
|
}
|
|
|
- // Todo 检测设备是否引用此连接配置,如果有则不允许删除
|
|
|
+ // 检测设备是否引用此连接配置,如果有则不允许删除
|
|
|
+ IotDevice selectIotDevice = new IotDevice();
|
|
|
+ selectIotDevice.setDevtypeBid(devtypeBid);
|
|
|
+ List<IotDevice> iotDeviceList = iotDeviceService.selectIotDeviceList(selectIotDevice);
|
|
|
+ if(iotDeviceList != null && !iotDeviceList.isEmpty()){
|
|
|
+ throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"该设备类型下存在设备,无法删除");
|
|
|
+ }
|
|
|
List<String> devconnBids = new ArrayList<>();
|
|
|
for(IotDeviceconn iotDeviceconn : iotDeviceconnList){
|
|
|
devconnBids.add(iotDeviceconn.getDevconnBid());
|