From 383d6a88331c4cb9d2bde1cfb48b041e942b683c Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 24 Jun 2025 09:51:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=A1=A5=E4=B8=81?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UpgradeController.java | 15 +++++++++++++-- .../impl/UpgradePatchServiceImpl.java | 16 +++++++++++++--- .../service/UpgradePatchService.java | 4 +++- 3 files changed, 29 insertions(+), 6 deletions(-) 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; }