diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/CommentController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/CommentController.java index d040cec..20d342e 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/CommentController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/CommentController.java @@ -90,6 +90,13 @@ public class CommentController { return success(list); } + @GetMapping("/latest") + @Operation(summary = "获得最新的评论列表") + public CommonResult> getLatestCommentList() { + List list = commentService.getLatestCommentList(); + return success(list); + } + @GetMapping("/export-excel") @Operation(summary = "导出评论 Excel") @PreAuthorize("@ss.hasPermission('license:comment:export')") diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/vo/CommentTreeRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/vo/CommentTreeRespVO.java index 833100a..43e4e67 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/vo/CommentTreeRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/comment/vo/CommentTreeRespVO.java @@ -21,6 +21,9 @@ public class CommentTreeRespVO { @ExcelProperty("项目ID") private Long projectId; + @Schema(description = "项目名称", example = "18334") + private String projectName; + @Schema(description = "用户ID", example = "30248") @ExcelProperty("用户ID") private Long userId; 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 c12537e..c06e66b 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 @@ -127,6 +127,14 @@ public class LicenseController { return success(pageResult); } + @GetMapping("/list-expiry") + @Operation(summary = "获得License到期列表") + @PreAuthorize("@ss.hasPermission('license:license:query')") + public CommonResult> getLicenseByExpiryDate() { + List licenseHistory = licenseService.getLicenseByExpiryDate(); + return success(licenseHistory); + } + @GetMapping("/export-excel") @Operation(summary = "导出License Excel") @PreAuthorize("@ss.hasPermission('license:license:export')") diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/comment/CommentMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/comment/CommentMapper.java index 7f5d977..778c267 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/comment/CommentMapper.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/comment/CommentMapper.java @@ -37,4 +37,6 @@ public interface CommentMapper extends BaseMapperX { } List getCommentList(@Param("projectId") Long projectId); + + List getLatestCommentList(); } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java index 2d36c8e..9271d92 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java @@ -7,6 +7,9 @@ import org.agt.module.license.controller.admin.license.vo.LicensePageReqVO; import org.agt.module.license.dal.dataobject.license.LicenseDO; import org.apache.ibatis.annotations.Mapper; +import java.time.LocalDateTime; +import java.util.List; + /** * License Mapper * @@ -31,6 +34,13 @@ public interface LicenseMapper extends BaseMapperX { .orderByDesc(LicenseDO::getApplicationTime)); } + default List selectListByExpiryDate() { + return selectList(new LambdaQueryWrapperX() + .gt(LicenseDO::getExpiryDate, LocalDateTime.now()) + .last("limit 10") + .orderByDesc(LicenseDO::getApplicationTime)); + } + default LicenseDO selectBySn(String sn) { return selectOne(LicenseDO::getSerialNo, sn); } diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentService.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentService.java index fc5f5ad..f5eb961 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentService.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentService.java @@ -54,4 +54,6 @@ public interface CommentService { List getCommentList(CommentListReqVO listReqVO); List getCommentTree(Long projectId, Boolean sort); + + List getLatestCommentList(); } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentServiceImpl.java index e78b6de..c040bd8 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/comment/CommentServiceImpl.java @@ -165,6 +165,12 @@ public class CommentServiceImpl implements CommentService { }).toList(); } + @Override + public List getLatestCommentList() { + return commentMapper.getLatestCommentList(); + } + + public static List getChildren(CommentTreeRespVO root, List all, int i) { return all.stream().filter(c -> Objects.equals(c.getParentId(), root.getId())) .peek(c -> { 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 d37fe39..3a56896 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 @@ -80,6 +80,8 @@ public interface LicenseService { */ PageResult getLicensePage(LicensePageReqVO pageReqVO); + List getLicenseByExpiryDate(); + /** * 校验License的sn是否唯一 * 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 30faaf9..2f28147 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 @@ -562,6 +562,13 @@ public class LicenseServiceImpl implements LicenseService { return voPageResult; } + @Override + public List getLicenseByExpiryDate() { + List licenseDOS = licenseMapper.selectListByExpiryDate(); + return BeanUtils.toBean(licenseDOS, LicenseRespVO.class); + } + + @Override public Boolean validateLicenseSnUnique(String sn, Long id) { if (StrUtil.isBlank(sn)) { diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml index 7271419..55ad1a4 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml @@ -24,5 +24,36 @@ c.update_time DESC + \ No newline at end of file