配套资源 通过经纬度及半径查询范围内的点位

src/main/java/com/lqkj/supporting/controller/ResourcesInfoController.java

@@ -1,6 +1,8 @@
 package com.lqkj.supporting.controller;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -109,4 +111,16 @@ public class ResourcesInfoController extends BaseController
     {
         return resultByRows(resourcesInfoService.deleteResourcesInfoByInfoIds(infoIds));
     }
+
+    /**
+     * 根据geom查询资源点位对象
+     * @param location 点位对象
+     * @param distance 距离
+     * @return 点位集合
+     */
+    @GetMapping("/listByGeom")
+    public List<ResourcesInfo> selectResourcesInfoListByGeom(@Param("location") String location, @Param("distance") int distance ){
+        return resourcesInfoService.selectResourcesInfoListByGeom(location,distance);
+    }
+
 }

src/main/java/com/lqkj/supporting/controller/ResourcesTypeController.java

@@ -1,6 +1,8 @@
 package com.lqkj.supporting.controller;
 
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -114,4 +116,19 @@ public class ResourcesTypeController extends BaseController
     {
         return resultByRows(resourcesTypeService.deleteResourcesTypeByTypeIds(typeIds));
     }
+
+
+
+
+    /**
+     *  资源类型列表 分组返回每个类型对应的点位数量
+     *
+     * @return 资源类型集合
+     */
+    @GetMapping("/listGroupByTypeLabel")
+    public Map<String, List<ResourcesType>> selectResourcesTypeListGroupByTypeLabel(){
+        return resourcesTypeService.selectResourcesTypeMapByTypeLabel();
+    }
+
+
 }

src/main/java/com/lqkj/supporting/entity/ResourcesInfo.java

@@ -38,6 +38,8 @@ public class ResourcesInfo extends BaseEntity
 
     private String typeName;
 
+    private int distance;
+
     public void setInfoId(Integer infoId)
     {
         this.infoId = infoId;
@@ -92,6 +94,14 @@ public class ResourcesInfo extends BaseEntity
         this.typeName = typeName;
     }
 
+    public int getDistance() {
+        return distance;
+    }
+
+    public void setDistance(int distance) {
+        this.distance = distance;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/lqkj/supporting/entity/ResourcesType.java

@@ -38,6 +38,9 @@ public class ResourcesType extends BaseEntity
     @Excel(name = "备注")
     private String memo;
 
+
+    private int count;
+
     public void setTypeId(Integer typeId)
     {
         this.typeId = typeId;
@@ -93,6 +96,14 @@ public class ResourcesType extends BaseEntity
         return memo;
     }
 
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/lqkj/supporting/mapper/ResourcesInfoMapper.java

@@ -3,6 +3,8 @@ package com.lqkj.supporting.mapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import com.lqkj.supporting.entity.ResourcesInfo;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.data.repository.query.Param;
 
 /**
  * 资源点位对象Mapper接口
@@ -60,4 +62,15 @@ public interface ResourcesInfoMapper
      * @return 结果
      */
     public int deleteResourcesInfoByInfoIds(Integer[] infoIds);
+
+    /**
+     * 根据geom查询资源点位对象
+     * @param location 点位对象
+     * @param distance 距离
+     * @return 点位集合
+     */
+//    @Select("select info_id,type_id,info_name,location,memo,CAST(st_distancesphere(ST_SetSRID(st_geomfromgeojson(location),4326), st_geomfromgeojson(#{location})) AS NUMERIC(10,2)) distance from resources_info  \n" +
+//            "        where st_distancesphere(ST_SetSRID(st_geomfromgeojson(location),4326), st_geomfromgeojson(#{location})) <= :distance \n" +
+//            "        order by st_distancesphere(ST_SetSRID(st_geomfromgeojson(location),4326), st_geomfromgeojson(#{location})) limit 5")
+    public List<ResourcesInfo> selectResourcesInfoListByGeom(Object location,int distance);
 }

src/main/java/com/lqkj/supporting/mapper/ResourcesTypeMapper.java

@@ -3,6 +3,7 @@ package com.lqkj.supporting.mapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import com.lqkj.supporting.entity.ResourcesType;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 资源类型Mapper接口
@@ -60,4 +61,21 @@ public interface ResourcesTypeMapper
      * @return 结果
      */
     public int deleteResourcesTypeByTypeIds(Integer[] typeIds);
+
+
+
+
+    /**
+     * 资源类型列表 分组返回每个类型对应的点位数量
+     *
+     * @return 资源类型集合
+     */
+    @Select("SELECT ei.type_label, ei.type_id,ei.type_name,ei.icon,COUNT(ri.type_id) \n" +
+            "            FROM resources_type ei \n" +
+            "            LEFT JOIN resources_info ri ON ei.type_id = ri.type_id \n" +
+            "            GROUP BY ei.type_label ,ei.type_id,ei.type_name")
+    public List<ResourcesType> selectResourcesTypeListGroupByTypeLabel();
+
+
+
 }

src/main/java/com/lqkj/supporting/service/ResourcesInfoService.java

@@ -130,4 +130,23 @@ public class ResourcesInfoService {
     public int deleteResourcesInfoByInfoId(Integer infoId) {
         return resourcesInfoMapper.deleteResourcesInfoByInfoId(infoId);
     }
+
+    /**
+     * 根据geom查询资源点位对象
+     * @param location 点位对象
+     * @param distance 距离
+     * @return 点位集合
+     */
+    public List<ResourcesInfo> selectResourcesInfoListByGeom(String location,int distance){
+        Point point = GeoUtils.createPoint(location);
+        JSONObject jsonObject = GeoUtils.readFromGeometry(point);
+        List<ResourcesInfo> resourcesInfos = resourcesInfoMapper.selectResourcesInfoListByGeom(jsonObject, distance);
+        if (!CollectionUtils.isEmpty(resourcesInfos)) {
+            resourcesInfos.forEach(this::paseGeom);
+        }
+
+        return resourcesInfos;
+    }
+
+
 }

src/main/java/com/lqkj/supporting/service/ResourcesTypeService.java

@@ -1,11 +1,18 @@
 package com.lqkj.supporting.service;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.lqkj.supporting.mapper.ResourcesTypeMapper;
 import com.lqkj.supporting.entity.ResourcesType;
 import com.lqkj.common.utils.uuid.IdUtils;
+import org.springframework.util.CollectionUtils;
+
 /**
  * 资源类型Service业务层处理
  *
@@ -88,4 +95,22 @@ public class ResourcesTypeService
     {
         return resourcesTypeMapper.deleteResourcesTypeByTypeId(typeId);
     }
+
+    /**
+     * 资源类型列表 分组返回每个类型对应的点位数量
+     *
+     * @return 资源类型集合
+     */
+    public Map<String, List<ResourcesType>> selectResourcesTypeMapByTypeLabel() {
+        List<ResourcesType> resourcesTypes = resourcesTypeMapper.selectResourcesTypeListGroupByTypeLabel();
+        if (!CollectionUtils.isEmpty(resourcesTypes)) {
+            return resourcesTypes.stream()
+                    .collect(Collectors.groupingBy(ResourcesType::getTypeLabel));
+        }
+        return Collections.emptyMap();
+    }
+
+
+
+
 }

src/main/resources/db/migration/V1_17__20250507.sql

@@ -57,8 +57,8 @@ VALUES ('配套资源分类', 'supporting_resources_classify', 't', '超级管
 
 INSERT INTO "public"."sys_dict_data" ("dict_sort", "dict_label", "dict_value", "dict_type", "css_class", "list_class", "is_default", "status", "create_by", "create_time", "update_by", "update_time", "remark", "icon", "park_id")
        VALUES (1, '企业服务', '企业服务', 'supporting_resources_classify', NULL, 'default', 'f', 't', '超级管理员', now(), NULL, NULL, NULL, NULL, NULL),
-              (2, '便民服务', '企业服务', 'supporting_resources_classify', NULL, 'default', 'f', 't', '超级管理员', now(), NULL, NULL, NULL, NULL, NULL),
-              (3, '交通服务', '企业服务', 'supporting_resources_classify', NULL, 'default', 'f', 't', '超级管理员', now(), NULL, NULL, NULL, NULL, NULL);
+              (2, '便民服务', '便民服务', 'supporting_resources_classify', NULL, 'default', 'f', 't', '超级管理员', now(), NULL, NULL, NULL, NULL, NULL),
+              (3, '交通服务', '交通服务', 'supporting_resources_classify', NULL, 'default', 'f', 't', '超级管理员', now(), NULL, NULL, NULL, NULL, NULL);
 
 
 

src/main/resources/mapper/supporting/ResourcesInfoMapper.xml

@@ -11,6 +11,7 @@
 		<result property="memo"    column="memo"    />
 		<result property="location"    column="location"   jdbcType="OTHER"
 				typeHandler="com.lqkj.framework.sql.JsonbTypeHandler"/>
+		<result property="distance" column="distance" />
 	</resultMap>
 
 	<sql id="selectResourcesInfoVo">
@@ -69,4 +70,41 @@
 			#{infoId}
 		</foreach>
 	</delete>
+
+
+<!--	<select id="selectResourcesInfoListByGeom" resultType="ResourcesInfo">-->
+
+<!--		select info_id,-->
+<!--		       type_id,-->
+<!--		       info_name,-->
+<!--		       location,-->
+<!--		       memo,-->
+<!--		       CAST(st_distancesphere(ST_SetSRID(st_geomfromgeojson(location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler),4326),-->
+<!--		st_geomfromgeojson(#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler})) AS NUMERIC(10,2)) distance-->
+<!--		from resources_info-->
+<!--		where st_distancesphere(ST_SetSRID(st_geomfromgeojson(location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler),4326), st_geomfromgeojson(#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler})) <= #{distance}-->
+<!--		order by st_distancesphere(ST_SetSRID(st_geomfromgeojson(location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler),4326), st_geomfromgeojson(#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler})) limit 5-->
+<!--	</select>-->
+	<select id="selectResourcesInfoListByGeom" resultMap="ResourcesInfoResult">
+		 <![CDATA[
+		select
+			info_id,
+			type_id,
+			info_name,
+			location,
+			memo,
+			CAST(st_distancesphere(
+					ST_SetSRID(st_geomfromgeojson(location), 4326),
+					st_geomfromgeojson(#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler})
+				 ) AS NUMERIC(10,2)) distance
+		from resources_info
+		where st_distancesphere(
+					  ST_SetSRID(st_geomfromgeojson(location), 4326),
+					  st_geomfromgeojson(#{location,jdbcType=OTHER,typeHandler=com.lqkj.framework.sql.JsonbTypeHandler})
+			  ) <= #{distance}
+		order by distance
+			limit 5
+		]]>
+	</select>
+
 </mapper>