From b738548b942265ec7fc487bdd2017d7d91da26f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 14:50:30 +0800
Subject: [PATCH] 场所标签优化
---
src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java | 8 ++++
src/main/java/org/springblade/common/node/TreeStringNode.java | 4 +-
src/main/java/org/springblade/modules/category/dto/CategoryDTO.java | 4 +
src/main/java/org/springblade/modules/category/service/impl/CategoryServiceImpl.java | 12 ++++++
src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml | 24 ++++++++++++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 15 +++----
src/main/java/org/springblade/modules/category/service/ICategoryService.java | 13 +++++-
7 files changed, 67 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/common/node/TreeStringNode.java b/src/main/java/org/springblade/common/node/TreeStringNode.java
index ca4e0c1..9636f8f 100644
--- a/src/main/java/org/springblade/common/node/TreeStringNode.java
+++ b/src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
-import org.springblade.modules.category.dto.CategoryLabelDTO;
+import org.springblade.modules.category.dto.CategoryDTO;
import java.io.Serializable;
import java.util.ArrayList;
@@ -78,7 +78,7 @@
/**
* 标签节点
*/
- private List<CategoryLabelDTO> categoryLabelList;
+ private List<CategoryDTO> categoryList;
/**
* 是否有子孙节点
diff --git a/src/main/java/org/springblade/modules/category/dto/CategoryDTO.java b/src/main/java/org/springblade/modules/category/dto/CategoryDTO.java
index 9ec7fcc..043ecb3 100644
--- a/src/main/java/org/springblade/modules/category/dto/CategoryDTO.java
+++ b/src/main/java/org/springblade/modules/category/dto/CategoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.category.dto;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.category.entity.CategoryEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -30,5 +31,6 @@
@EqualsAndHashCode(callSuper = true)
public class CategoryDTO extends CategoryEntity {
private static final long serialVersionUID = 1L;
-
+ @ApiModelProperty("场所id")
+ private String placeId;
}
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 8d93647..73aa6e3 100644
--- a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java
+++ b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.java
@@ -17,6 +17,7 @@
package org.springblade.modules.category.mapper;
import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -45,4 +46,11 @@
* 天地图poi 分类获取
*/
List<CategoryVO> getCategory(@Param("category") CategoryVO category);
+
+ /**
+ * 查询场所标签
+ * @param categoryDTO
+ * @return
+ */
+ List<CategoryDTO> selectCategoryList(@Param("category") CategoryDTO categoryDTO);
}
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 c736dd8..ada52fb 100644
--- a/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
+++ b/src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml
@@ -32,5 +32,29 @@
</if>
</select>
+ <select id="selectCategoryList" resultType="org.springblade.modules.category.dto.CategoryDTO">
+ select
+ jc.id,
+ jc.category_no,
+ jc.category_name,
+ jc.parent_no,
+ jc.remark
+ from
+ jczz_place_poi_label jppl LEFT JOIN jczz_category jc on jc.category_no=jppl.poi_code
+ <where>
+ <if test="category.id != null ">and jc.id = #{category.id}</if>
+ <if test="category.placeId != null and category.placeId != '' ">and jppl.place_id = #{category.placeId}</if>
+ <if test="category.categoryNo != null and category.categoryNo != ''">and jc.category_no =
+ #{category.categoryNo}
+ </if>
+ <if test="category.categoryName != null and category.categoryName != ''">and jc.ategory_name =
+ #{category.categoryName}
+ </if>
+ <if test="category.remark != null and category.remark != ''">and jc.remark = #{category.remark}</if>
+ and jppl.type = 3
+ and jc.category_no is not null
+ </where>
+ </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 3107662..eff1ca6 100644
--- a/src/main/java/org/springblade/modules/category/service/ICategoryService.java
+++ b/src/main/java/org/springblade/modules/category/service/ICategoryService.java
@@ -16,11 +16,13 @@
*/
package org.springblade.modules.category.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
-import org.springblade.core.mp.base.BaseService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* 天地图poi 分类表 服务类
@@ -44,4 +46,11 @@
* 天地图poi 分类获取
*/
Object getCategory(CategoryVO category);
+
+ /**
+ * 查询场所的标签
+ * @param categoryDTO
+ * @return
+ */
+ List<CategoryDTO> selectCategoryLabelList(CategoryDTO categoryDTO);
}
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 8e05157..55fa0c8 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
@@ -17,6 +17,7 @@
package org.springblade.modules.category.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
import org.springblade.modules.category.mapper.CategoryMapper;
@@ -24,6 +25,8 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* 天地图poi 分类表 服务实现类
@@ -46,4 +49,13 @@
public Object getCategory(CategoryVO category) {
return baseMapper.getCategory(category);
}
+ /**
+ * 查询场所标签
+ * @param categoryDTO
+ * @return
+ */
+ @Override
+ public List<CategoryDTO> selectCategoryLabelList(CategoryDTO categoryDTO) {
+ return this.baseMapper.selectCategoryList(categoryDTO);
+ }
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index ce4f4da..bdfb540 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -20,15 +20,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.modules.category.dto.CategoryLabelDTO;
-import org.springblade.modules.category.service.ICategoryLabelService;
+import org.springblade.modules.category.dto.CategoryDTO;
+import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.district.entity.DistrictEntity;
@@ -95,7 +94,7 @@
private IDistrictService districtService;
@Autowired
- private ICategoryLabelService iCategoryLabelService;
+ private ICategoryService iCategoryService;
@Autowired
private ICommunityService communityService;
@@ -181,10 +180,10 @@
List<TreeStringNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
for (TreeStringNode treeNode : placeNodeList) {
treeNode.setAddressType(2);
- CategoryLabelDTO categoryLabelDTO = new CategoryLabelDTO();
- categoryLabelDTO.setPlaceId(treeNode.getId());
- List<CategoryLabelDTO> categoryLabelDTOS = iCategoryLabelService.selectCategoryLabelList(categoryLabelDTO);
- treeNode.setCategoryLabelList(categoryLabelDTOS);
+ CategoryDTO categoryDTO = new CategoryDTO();
+ categoryDTO.setPlaceId(treeNode.getId());
+ List<CategoryDTO> categoryDTOS = iCategoryService.selectCategoryLabelList(categoryDTO);
+ treeNode.setCategoryList(categoryDTOS);
// if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
// (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
// treeNode.getAddressLevel().equals(1))) {
--
Gitblit v1.9.3