diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java index 10c654dd970d4be047d09b2adc7bce5e895bb85a..119aaaf84e9284f29ac223c7807bb52856ddf82a 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java @@ -11,9 +11,11 @@ package com.easysoftware.application.applicationpackage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageNameSearchCondition; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; import jakarta.annotation.Resource; @@ -79,6 +81,9 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService @Override public ResponseEntity searchAppPkg(final ApplicationPackageSearchCondition condition) { condition.setTimeOrder(""); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("the pkgid is null"); + } Map res = appPkgGateway.queryDetailByName(condition); return ResultUtil.success(HttpStatus.OK, res); } diff --git a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java index 125e59c6f28a7f1313dda215ed1d6444ff08dda6..0c4ae8bd319383ae3f6cea809792f3f9be5ba1c9 100644 --- a/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/epkgpackage/EPKGPackageServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easysoftware.application.epkgpackage.dto.EPKGPackageNameSearchCondition; import com.easysoftware.application.epkgpackage.dto.EPKGPackageSearchCondition; import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.epkgpackage.EPKGPackageUnique; @@ -59,21 +60,11 @@ public class EPKGPackageServiceImpl extends */ @Override public ResponseEntity searchEPKGPkg(final EPKGPackageSearchCondition condition) { - String os = StringUtils.trimToEmpty(condition.getOs()); - String subPath = StringUtils.trimToEmpty(condition.getSubPath()); - String name = StringUtils.trimToEmpty(condition.getName()); - String version = StringUtils.trimToEmpty(condition.getVersion()); - String arch = StringUtils.trimToEmpty(condition.getArch()); - - StringBuilder cSb = new StringBuilder(); - cSb.append(os); - cSb.append(subPath); - cSb.append(name); - cSb.append(version); - cSb.append(arch); - String pkgId = cSb.toString(); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("the pkgid is null"); + } - List epkgList = ePKGPackageGateway.queryDetailByPkgId(pkgId); + List epkgList = ePKGPackageGateway.queryDetailByPkgId(condition.getPkgId()); if (!epkgList.isEmpty()) { Map res = Map.ofEntries( diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java index 9bb91184dd91be8465a90c4d2885f05c05424f28..af0fb76d8d04ff30063e212f9eebfbf026b4fb5a 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java @@ -16,6 +16,7 @@ import com.easysoftware.application.rpmpackage.dto.RPMPackageNameSearchCondition import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.application.rpmpackage.vo.RPMPackageDomainVo; +import com.easysoftware.common.exception.ParamErrorException; import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.rpmpackage.RPMPackageUnique; @@ -98,9 +99,11 @@ public class RPMPackageServiceImpl extends ServiceImpl searchRPMPkg(final RPMPackageSearchCondition condition) { - String pkgId = assemblePkgId(condition); + if (StringUtils.isBlank(condition.getPkgId())) { + throw new ParamErrorException("pkgid is null"); + } - List rpmList = rPMPkgGateway.queryDetailByPkgId(pkgId); + List rpmList = rPMPkgGateway.queryDetailByPkgId(condition.getPkgId()); if (!rpmList.isEmpty()) { Map res = Map.ofEntries( Map.entry("total", rpmList.size()), @@ -112,29 +115,6 @@ public class RPMPackageServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("pkg_id", pkgId); List epkgList = ePKGPkgMapper.selectList(wrapper); + if (epkgList.size() == 0) { + throw new NoneResException("the epkg package does not exist"); + } return EPKGPackageConverter.toDetail(epkgList); } diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java index 6c269374460522cc2c423ddc0ea945910ec0112f..6765e9dd250474dfc0e34fadbf473e2260f529f0 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java @@ -303,6 +303,11 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { wrapper.eq("pkg_id", pkgId); } List rpmList = rPMPkgMapper.selectList(wrapper); + + if (rpmList.size() == 0) { + throw new NoneResException("the rpm package does not exist"); + } + return RPMPackageConverter.toDetail(rpmList); } }