From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index f860711..b55de5d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComPopulationActVO;
+import com.panzhihua.common.model.vos.community.switchs.CommunitySwitchAllAppletsVO;
+import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
@@ -91,4 +94,28 @@
"left join com_street as cs on cs.street_id = ca.street_id\n" +
"where ca.community_id = #{communityId}")
ComPopulationActVO getPopulationActById(@Param("communityId")Long communityId);
+
+ @Select("select `name`,street_id from com_street")
+ List<StreetAllAppletsVO> getStreetList();
+
+ @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
+ List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId")Long streetId);
+
+ @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id\n" +
+ " where ca.state = 0 and ca.name like concat('%',#{name},'%')")
+ List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name")String name);
+
+ @Select("SELECT" +
+ " c.community_id, " +
+ " c.`name`, " +
+ " c.street_id, " +
+ " cs.`name` as streetName, " +
+ " round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance " +
+ "FROM " +
+ " com_act c " +
+ " left join com_street as cs on cs.street_id = c.street_id " +
+ " HAVING distance >= 0 and distance <= #{communityDTO.distance} " +
+ "ORDER BY " +
+ " distance ASC")
+ List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
}
--
Gitblit v1.7.1