diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java index 10b8374..fb361d5 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java @@ -41,8 +41,9 @@ public class UpgradeController extends BaseController { @GetMapping("listPatch") @ApiOperation("查询补丁列表") public ResponseReult> listAll(@RequestParam(value = "app", required = true) String app, - @RequestParam(value = "version", required = false) String version) { - List result = patchService.list(app, version); + @RequestParam(value = "oldVer", required = false) String oldVer, + @RequestParam(value = "newVer", required = false) String newVer) { + List result = patchService.list(app, oldVer, newVer); return ResponseReult.success(result); } @@ -101,4 +102,14 @@ public class UpgradeController extends BaseController { service.delete(id); return ResponseReult.success("OK"); } + + @PostMapping("deletePatch") + @ApiOperation("删除") + public ResponseReult deletePatch(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception { + if (id == null) { + throw new ApiException("id不能为空!"); + } + patchService.delete(id); + return ResponseReult.success("OK"); + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradePatchServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradePatchServiceImpl.java index abe518b..e6e57b3 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradePatchServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradePatchServiceImpl.java @@ -82,12 +82,15 @@ public class UpgradePatchServiceImpl implements UpgradePatchService { } @Override - public List list(String app, String oldver) { + public List list(String app, String oldVer, String newVer) { MntnUpgradesPatchExample example = new MntnUpgradesPatchExample(); MntnUpgradesPatchExample.Criteria criteria = example.createCriteria(); criteria.andAppEqualTo(app); - if (StringUtils.isNotBlank(oldver)) { - criteria.andOldVerEqualTo(oldver); + if (StringUtils.isNotBlank(oldVer)) { + criteria.andOldVerEqualTo(oldVer); + } + if (StringUtils.isNotBlank(newVer)) { + criteria.andNewVerEqualTo(newVer); } List list = patchMapper.selectByExample(example); for (MntnUpgradesPatch item : list) { @@ -95,4 +98,11 @@ public class UpgradePatchServiceImpl implements UpgradePatchService { } return list; } + + @Override + public void delete(Integer id) throws Exception { + MntnUpgradesPatch record = patchMapper.selectByPrimaryKey(id); + patchMapper.deleteByPrimaryKey(id); + new File(patchpath + record.getPath()).delete(); + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradePatchService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradePatchService.java index 6dcbb7a..da5beaf 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradePatchService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradePatchService.java @@ -9,6 +9,8 @@ public interface UpgradePatchService { void processPatch(MntnUpgrades upg) throws Exception; - List list(String app, String oldver); + List list(String app, String oldVer, String newVer); + + void delete(Integer id) throws Exception; }