From 5444bf2c0b108812c0e968f44a4246d9542c48d1 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Fri, 22 Nov 2024 15:22:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ASW-185=20application=20release=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. application release 补充编辑接口 2. sys_menu 添加 application_release 菜单和按钮 --- .../ApplicationReleaseController.java | 13 ++++++++++++ .../service/IApplicationReleaseService.java | 2 ++ .../impl/ApplicationReleaseServiceImpl.java | 20 +++++++++++++++++++ .../resources/db/migration/R__AZ_sys_menu.sql | 5 +++++ .../db/migration/R__AZ_sys_role_menu.sql | 15 ++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/src/main/java/net/geedge/asw/module/app/controller/ApplicationReleaseController.java b/src/main/java/net/geedge/asw/module/app/controller/ApplicationReleaseController.java index 4184e95..1b2487c 100644 --- a/src/main/java/net/geedge/asw/module/app/controller/ApplicationReleaseController.java +++ b/src/main/java/net/geedge/asw/module/app/controller/ApplicationReleaseController.java @@ -54,6 +54,19 @@ public class ApplicationReleaseController { return R.ok().putData("record", record); } + @PutMapping("/{workspaceId}/release") + public R update(@PathVariable("workspaceId") String workspaceId, @RequestBody Map requestBody) { + String id = T.MapUtil.getStr(requestBody, "id", ""); + String name = T.MapUtil.getStr(requestBody, "name", ""); + String description = T.MapUtil.getStr(requestBody, "description", ""); + if (T.StrUtil.hasEmpty(id, name)) { + throw new ASWException(RCode.PARAM_CANNOT_EMPTY); + } + + ApplicationReleaseEntity record = releaseService.updateRelease(id, name, description); + return R.ok().putData("record", record); + } + @DeleteMapping("/{workspaceId}/release/{id}") public R delete(@PathVariable("workspaceId") String workspaceId, @PathVariable("id") String id) { releaseService.removeRelease(id); diff --git a/src/main/java/net/geedge/asw/module/app/service/IApplicationReleaseService.java b/src/main/java/net/geedge/asw/module/app/service/IApplicationReleaseService.java index 26f0dc4..3f4c65d 100644 --- a/src/main/java/net/geedge/asw/module/app/service/IApplicationReleaseService.java +++ b/src/main/java/net/geedge/asw/module/app/service/IApplicationReleaseService.java @@ -14,6 +14,8 @@ public interface IApplicationReleaseService extends IService wrapper = new LambdaUpdateWrapper() + .eq(ApplicationReleaseEntity::getId, id) + .set(ApplicationReleaseEntity::getName, name) + .set(ApplicationReleaseEntity::getDescription, description) + .set(ApplicationReleaseEntity::getUpdateUserId, StpUtil.getLoginIdAsString()) + .set(ApplicationReleaseEntity::getUpdateTimestamp, System.currentTimeMillis()); + + // update + this.update(wrapper); + + // return record info + return this.queryInfo(id); + } + @Override @Transactional(rollbackFor = Exception.class) public void removeRelease(String id) { diff --git a/src/main/resources/db/migration/R__AZ_sys_menu.sql b/src/main/resources/db/migration/R__AZ_sys_menu.sql index f8c9cfe..5e4fbf2 100644 --- a/src/main/resources/db/migration/R__AZ_sys_menu.sql +++ b/src/main/resources/db/migration/R__AZ_sys_menu.sql @@ -24,6 +24,11 @@ INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, ` INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2014', 'mr_resolve_conflict', 'buttons.mr.resolve.conflict', '2000', 'button', '', '', '', 14, 1722478572000, 1); INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2015', 'mr_merge', 'buttons.mr.merge', '2000', 'button', '', '', '', 15, 1722478572000, 1); INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2016', 'mr_close_merge_request', 'buttons.mr.close.merge.request', '2000', 'button', '', '', '', 16, 1722478572000, 1); +INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2017', 'application_releases', 'overall.application.releases', '2000', 'menu', '', '/application_releases', 'asw-icon icon-Application-Releases', 100, 1722478572000, 1); +INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2018', 'release_view', 'buttons.view', '2017', 'button', '', '', '', 1, 1722478572000, 1); +INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2019', 'release_add', 'buttons.add', '2017', 'button', '', '', '', 2, 1722478572000, 1); +INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2020', 'release_edit', 'buttons.edit', '2017', 'button', '', '', '', 3, 1722478572000, 1); +INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('2021', 'release_delete', 'buttons.delete', '2017', 'button', '', '', '', 4, 1722478572000, 1); INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('3000', 'pcaps', 'overall.pcaps', '0', 'menu', '', '/pcaps', 'asw-icon icon-Pcaps', 2, 1722478572000, 1); INSERT INTO `sys_menu` (`id`, `name`, `i18n`, `pid`, `type`, `perms`, `route`, `icon`, `order`, `create_timestamp`, `state`) VALUES ('3001', 'pcap_view', 'buttons.view', '3000', 'button', '', '', '', 1, 1722478572000, 1); diff --git a/src/main/resources/db/migration/R__AZ_sys_role_menu.sql b/src/main/resources/db/migration/R__AZ_sys_role_menu.sql index ccb42e9..44dc3c7 100644 --- a/src/main/resources/db/migration/R__AZ_sys_role_menu.sql +++ b/src/main/resources/db/migration/R__AZ_sys_role_menu.sql @@ -27,6 +27,11 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2013'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2014'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2015'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2016'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2017'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2018'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2019'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2020'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '2021'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '3000'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('owner', '3001'); @@ -97,6 +102,11 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2013'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2014'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2015'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2016'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2017'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2018'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2019'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2020'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '2021'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '3000'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('maintainer', '3001'); @@ -160,6 +170,11 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2013'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2014'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2015'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2016'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2017'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2018'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2019'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2020'); +INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '2021'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '3000'); INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES ('developer', '3001');