From c73dc4db7b9f40f60d690b28142c22088e4fb90c Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 23 Jul 2025 09:57:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=96=B0=E5=A2=9E=E5=AD=90=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
m2pool-modules/m2pool-manage/pom.xml | 5 ++++
.../controller/ManageDocumentsController.java | 2 +-
.../dto/ManageCatalogueDocumentDto.java | 3 ++
.../m2pool/manage/dto/ManageCatalogueDto.java | 3 ++
.../m2pool/manage/dto/ManageDocumentDto.java | 4 +++
.../m2pool/manage/entity/ManageDocuments.java | 4 +++
.../manage/mapper/ManageDocumentsMapper.java | 2 +-
.../service/ManageDocumentsService.java | 2 +-
.../impl/ManageDocumentsServiceImpl.java | 28 +++++++++++++++++--
.../m2pool/manage/vo/ManageCatalogueVo.java | 8 +++++-
.../m2pool/manage/vo/ManageDocumentVo.java | 3 ++
.../mapper/manage/ManageDocumentsMapper.xml | 12 +++++---
12 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/m2pool-modules/m2pool-manage/pom.xml b/m2pool-modules/m2pool-manage/pom.xml
index 8e0d8bd..afbf223 100644
--- a/m2pool-modules/m2pool-manage/pom.xml
+++ b/m2pool-modules/m2pool-manage/pom.xml
@@ -118,6 +118,11 @@
5.6.2
+
+ org.springframework.boot
+ spring-boot-starter-data-mongodb
+
+
org.mybatis
mybatis
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageDocumentsController.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageDocumentsController.java
index 31c7bb7..3161a27 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageDocumentsController.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageDocumentsController.java
@@ -84,7 +84,7 @@ public class ManageDocumentsController {
@PostMapping("/findCatalogueDocumentList")
@ApiOperation(value = "业务系统:获取文档类型对应的文章列表")
- public R> findCatalogueDocumentList(@RequestBody ManageCatalogueVo manageCatalogueVo){
+ public TableDataInfo findCatalogueDocumentList(@RequestBody ManageCatalogueVo manageCatalogueVo){
return manageDocumentsService.findCatalogueDocumentList(manageCatalogueVo);
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java
index 6989fa1..265e13c 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDocumentDto.java
@@ -39,4 +39,7 @@ public class ManageCatalogueDocumentDto {
@ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程")
private Integer type;
+
+ @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档")
+ private Integer childType;
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDto.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDto.java
index ec56be3..0456a87 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDto.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageCatalogueDto.java
@@ -26,4 +26,7 @@ public class ManageCatalogueDto {
@ApiModelProperty(value = "文档类型",example = "1")
private Integer type;
+
+ @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档")
+ private Integer childType;
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java
index 4633e46..c37d21f 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageDocumentDto.java
@@ -42,4 +42,8 @@ public class ManageDocumentDto {
@ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程")
private Integer type;
+
+ @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档")
+ private Integer childType;
+
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java
index 27333ef..e1fde1d 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/entity/ManageDocuments.java
@@ -41,9 +41,13 @@ public class ManageDocuments {
private Integer type;
+ private Integer childType;
+
private LocalDateTime createTime;
private LocalDateTime updateTime;
private Boolean del;
+
+
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageDocumentsMapper.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageDocumentsMapper.java
index 6fb349e..0255cf7 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageDocumentsMapper.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageDocumentsMapper.java
@@ -30,7 +30,7 @@ public interface ManageDocumentsMapper extends BaseMapper {
* 查询所有文档类型对应的文章列表
* @return
*/
- List findCatalogueDocumentList(@Param("type") Integer type,@Param("lang") String lang);
+ List findCatalogueDocumentList(@Param("type") Integer type,@Param("lang") String lang,@Param("childType") Integer childType);
/**
* 查询目录列表
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageDocumentsService.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageDocumentsService.java
index 1a0d97d..8f0a144 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageDocumentsService.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageDocumentsService.java
@@ -72,7 +72,7 @@ public interface ManageDocumentsService extends IService {
* @param manageCatalogueVo
* @return
*/
- R> findCatalogueDocumentList(ManageCatalogueVo manageCatalogueVo);
+ TableDataInfo findCatalogueDocumentList(ManageCatalogueVo manageCatalogueVo);
/**
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageDocumentsServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageDocumentsServiceImpl.java
index 60ef814..3a5e40a 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageDocumentsServiceImpl.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageDocumentsServiceImpl.java
@@ -94,6 +94,7 @@ public class ManageDocumentsServiceImpl extends ServiceImpl> findCatalogueDocumentList(ManageCatalogueVo manageCatalogueVo) {
+ public TableDataInfo findCatalogueDocumentList(ManageCatalogueVo manageCatalogueVo) {
+ if (manageCatalogueVo.getChildType() == null){
+ manageCatalogueVo.setChildType(0);
+ }
+ PageHelper.startPage(manageCatalogueVo.getPageNum(), manageCatalogueVo.getPageSize());
+ List catalogueDocumentList = manageDocumentsMapper.findCatalogueDocumentList(manageCatalogueVo.getType(),manageCatalogueVo.getLang(),manageCatalogueVo.getChildType());
+ return getDataManageCatalogueDocument(catalogueDocumentList);
+ }
- List catalogueDocumentList = manageDocumentsMapper.findCatalogueDocumentList(manageCatalogueVo.getType(),manageCatalogueVo.getLang());
- return R.success(catalogueDocumentList);
+ private TableDataInfo getDataManageCatalogueDocument(List list)
+ {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setRows(list);
+ rspData.setMsg("查询成功");
+ PageInfo pageInfo = new PageInfo(list);
+ rspData.setTotal(pageInfo.getTotal());
+ rspData.setTotalPage(pageInfo.getPages());
+ PageHelper.clearPage();
+ return rspData;
}
@Override
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java
index 0b2a290..31fcee1 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageCatalogueVo.java
@@ -17,10 +17,16 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "ManageCatalogueVo",description = "文档目录请求对象")
-public class ManageCatalogueVo{
+public class ManageCatalogueVo extends PageVo{
@ApiModelProperty(value = "文档类型",example = "0其他 1服务条款 2api文档 3挖矿教程")
private Integer type;
@ApiModelProperty(value = "语言",example = "zh")
private String lang;
+
+
+ @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档")
+ private Integer childType;
+
+
}
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java
index c67958f..64ece38 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/ManageDocumentVo.java
@@ -37,4 +37,7 @@ public class ManageDocumentVo {
@ApiModelProperty(value = "语言",example = "zh中文 en英文")
private String lang;
+
+ @ApiModelProperty(value = "文档子类型",example = "0没有 1服务条款、2费率、3API文档")
+ private Integer childType;
}
diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml
index 66dc09b..6d026a2 100644
--- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml
+++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageDocumentsMapper.xml
@@ -16,7 +16,8 @@ SELECT
update_user as updateUser,
update_time as updateTime,
create_time as createTime,
- type
+ type,
+ child_type as childType
FROM
manage_documents
@@ -62,7 +63,8 @@ FROM
update_user as updateUser,
update_time as updateTime,
create_time as createTime,
- type
+ type,
+ child_type as childType
FROM
manage_documents
@@ -100,10 +102,12 @@ FROM
update_user as updateUser,
update_time as updateTime,
create_time as createTime,
- type
+ type,
+ child_type as childType
from
manage_documents
- where del = false and type = #{type}
+ where
+ del = false and type = #{type} and child_type = #{childType}
order by id desc