|
|
@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import org.springblade.client.container.mapper.BasicContainerDescMapper;
|
|
|
-import org.springblade.client.container.service.BasicContainerDescService;
|
|
|
import org.springblade.client.dto.BasicPortDescDTO;
|
|
|
-import org.springblade.client.entity.*;
|
|
|
+import org.springblade.client.entity.BasicPortDesc;
|
|
|
+import org.springblade.client.entity.BasicPortType;
|
|
|
+import org.springblade.client.entity.BasicPortTypeDesc;
|
|
|
import org.springblade.client.port.mapper.BasicPortDescMapper;
|
|
|
import org.springblade.client.port.mapper.BasicPortTypeDescMapper;
|
|
|
import org.springblade.client.port.mapper.BasicPortTypeMapper;
|
|
|
@@ -23,11 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import javax.validation.constraints.NotBlank;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@@ -101,7 +99,7 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
|
|
|
List<BasicPortTypeDesc> basicPortTypeDescs = basicPortTypeDescMapper.selectList(lambdaQueryWrapper);
|
|
|
//如果存在绑定关系,检查是否需要换绑
|
|
|
if (!CollectionUtils.isEmpty(basicPortTypeDescs)) {
|
|
|
- List<BasicPortTypeDesc> collect = basicPortTypeDescs.stream().filter(e -> e.getPortsTypeId() == typeId).collect(Collectors.toList());
|
|
|
+ List<BasicPortTypeDesc> collect = basicPortTypeDescs.stream().filter(e -> e.getPortsTypeId().equals(typeId)).collect(Collectors.toList());
|
|
|
//如果为空,解绑操作
|
|
|
if (CollectionUtils.isEmpty(collect)) {
|
|
|
basicPortTypeDescs.forEach(e -> {
|
