|
@@ -13,6 +13,7 @@ import com.ruoyi.business.service.IBjNotifyModelConfigService;
|
|
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
+import org.apache.commons.compress.utils.Lists;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
@@ -117,7 +118,7 @@ public class BjNotifyModelConfigServiceImpl implements IBjNotifyModelConfigServi
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public BjNotifyModelConfigVo queryByModelName(BjNotifyModelConfigBo bo) {
|
|
|
|
|
|
|
+ public List<BjNotifyModelConfig> queryByModelName(BjNotifyModelConfigBo bo) {
|
|
|
if (StringUtils.isBlank(bo.getModelName()) && StringUtils.isBlank(bo.getModelChildrenName())) {
|
|
if (StringUtils.isBlank(bo.getModelName()) && StringUtils.isBlank(bo.getModelChildrenName())) {
|
|
|
throw new ServiceException("模型名称和模型子名称不能为空");
|
|
throw new ServiceException("模型名称和模型子名称不能为空");
|
|
|
}
|
|
}
|
|
@@ -126,9 +127,9 @@ public class BjNotifyModelConfigServiceImpl implements IBjNotifyModelConfigServi
|
|
|
.eq(BjNotifyModelConfig::getModelChildrenName, bo.getModelChildrenName())
|
|
.eq(BjNotifyModelConfig::getModelChildrenName, bo.getModelChildrenName())
|
|
|
.orderByAsc(BjNotifyModelConfig::getCreateTime));
|
|
.orderByAsc(BjNotifyModelConfig::getCreateTime));
|
|
|
if (CollectionUtils.isNotEmpty(notifyModelConfigList)) {
|
|
if (CollectionUtils.isNotEmpty(notifyModelConfigList)) {
|
|
|
- return BeanUtil.copyProperties(notifyModelConfigList.get(0), BjNotifyModelConfigVo.class);
|
|
|
|
|
|
|
+ return notifyModelConfigList;
|
|
|
}
|
|
}
|
|
|
- return new BjNotifyModelConfigVo();
|
|
|
|
|
|
|
+ return Lists.newArrayList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|