From 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Dec 2023 20:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java | 5 +++++
src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java | 8 +++++++-
src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml | 14 +++++++++++++-
src/main/java/org/springblade/modules/category/controller/CategoryController.java | 11 ++++++++---
src/main/java/org/springblade/modules/category/service/ICategoryService.java | 4 ++++
5 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/category/controller/CategoryController.java b/src/main/java/org/springblade/modules/category/controller/CategoryController.java
index f176909..f02dbc5 100644
--- a/src/main/java/org/springblade/modules/category/controller/CategoryController.java
+++ b/src/main/java/org/springblade/modules/category/controller/CategoryController.java
@@ -22,8 +22,6 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -34,7 +32,6 @@
import org.springblade.modules.category.vo.CategoryVO;
import org.springblade.modules.category.wrapper.CategoryWrapper;
import org.springblade.modules.category.service.ICategoryService;
-import org.springblade.core.boot.ctrl.BladeController;
/**
* 天地图poi 分类表 控制器
@@ -122,5 +119,13 @@
return R.status(categoryService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 天地图poi 分类获取
+ */
+ @GetMapping("/getCategory")
+ public R getCategory(CategoryVO category) {
+ return R.data(categoryService.getCategory(category));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java
index c4f2372..8d93647 100644
--- a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java
+++ b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.category.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,4 +41,8 @@
List<CategoryVO> selectCategoryPage(IPage page, CategoryVO category);
+ /**
+ * 天地图poi 分类获取
+ */
+ List<CategoryVO> getCategory(@Param("category") CategoryVO category);
}
diff --git a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
index 6ab965f..c736dd8 100644
--- a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
+++ b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
@@ -15,10 +15,22 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
+ <!--自定义分页查询-->
<select id="selectCategoryPage" resultMap="categoryResultMap">
select * from jczz_category where is_deleted = 0
</select>
+ <!--天地图poi 分类获取-->
+ <select id="getCategory" resultType="org.springblade.modules.category.vo.CategoryVO">
+ select * from jczz_category
+ where is_deleted = 0
+ <if test="category.level!=null">
+ and level = #{category.level}
+ </if>
+ <if test="category.parentNo!=null and category.parentNo!=''">
+ and parent_no = #{category.parentNo}
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/category/service/ICategoryService.java b/src/main/java/org/springblade/modules/category/service/ICategoryService.java
index e35e530..3107662 100644
--- a/src/main/java/org/springblade/modules/category/service/ICategoryService.java
+++ b/src/main/java/org/springblade/modules/category/service/ICategoryService.java
@@ -40,4 +40,8 @@
IPage<CategoryVO> selectCategoryPage(IPage<CategoryVO> page, CategoryVO category);
+ /**
+ * 天地图poi 分类获取
+ */
+ Object getCategory(CategoryVO category);
}
diff --git a/src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java b/src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java
index 4798c61..8e05157 100644
--- a/src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java
+++ b/src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java
@@ -39,5 +39,11 @@
return page.setRecords(baseMapper.selectCategoryPage(page, category));
}
-
+ /**
+ * 天地图poi 分类获取
+ */
+ @Override
+ public Object getCategory(CategoryVO category) {
+ return baseMapper.getCategory(category);
+ }
}
--
Gitblit v1.9.3