From 40a22778ebc3b212105a80d40a3b5833bf4e8c70 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 8 Aug 2025 14:54:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20license=E6=96=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/license/LicenseController.java | 8 ++++++++ .../admin/license/vo/LicenseDetailVO.java | 3 +++ .../license/service/license/LicenseService.java | 3 +++ .../service/license/LicenseServiceImpl.java | 16 +++++++++++++--- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java index 8d29fba..c12537e 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java @@ -219,4 +219,12 @@ public class LicenseController { List list = ExcelUtils.read(file, LicenseImportExcelVO.class); return success(licenseService.importList(list, updateSupport)); } + + @PutMapping("/update-detail") + @Operation(summary = "更新License明细") + @PreAuthorize("@ss.hasPermission('license:license:update')") + public CommonResult updateDetailById(@Valid @RequestBody LicenseDetailVO updateReqVO) { + licenseService.updateDetailById(updateReqVO); + return success(true); + } } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java index b71895a..eaa7abd 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java @@ -15,6 +15,9 @@ import java.util.Map; @Data public class LicenseDetailVO { + @Schema(description = "ID") + private Long id; + @Schema(description = "网元开关") private List neList; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseService.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseService.java index 93ef3f5..d37fe39 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseService.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseService.java @@ -3,6 +3,7 @@ package org.agt.module.license.service.license; import jakarta.validation.Valid; import org.agt.framework.common.pojo.PageResult; import org.agt.module.license.controller.admin.license.vo.ImportRespVO; +import org.agt.module.license.controller.admin.license.vo.LicenseDetailVO; import org.agt.module.license.controller.admin.license.vo.LicenseImportExcelVO; import org.agt.module.license.controller.admin.license.vo.LicensePageReqVO; import org.agt.module.license.controller.admin.license.vo.LicenseRespVO; @@ -91,4 +92,6 @@ public interface LicenseService { List getLicenseHistory(Long id); ImportRespVO importList(List list, Boolean updateSupport); + + void updateDetailById(LicenseDetailVO licenseDetail); } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java index 196320d..30faaf9 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java @@ -556,9 +556,9 @@ public class LicenseServiceImpl implements LicenseService { public PageResult getLicensePage(LicensePageReqVO pageReqVO) { PageResult pageResult = licenseMapper.selectPage(pageReqVO); PageResult voPageResult = BeanUtils.toBean(pageResult, LicenseRespVO.class); - for (LicenseRespVO licenseRespVO : voPageResult.getList()) { - fillLicenseRespVO(licenseRespVO); - } +// for (LicenseRespVO licenseRespVO : voPageResult.getList()) { +// fillLicenseRespVO(licenseRespVO); +// } return voPageResult; } @@ -730,4 +730,14 @@ public class LicenseServiceImpl implements LicenseService { fillDetail(details, license); } + + public void updateDetailById(LicenseDetailVO licenseDetail) { + LicenseDetailDO licenseDetailDO = licenseDetailMapper.selectById(licenseDetail.getId()); + if (StrUtil.isBlank(licenseDetailDO.getFileUrl())) { + licenseDetailDO.setFileUrl(licenseDetail.getFileUrl()); + } else { + licenseDetailDO.setFileUrlLegacy(licenseDetail.getFileUrl()); + } + licenseDetailMapper.updateById(licenseDetailDO); + } } \ No newline at end of file