From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 97ec918..d0a2fc9 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
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,7 +63,7 @@
void updateAccountPassword(@Param("password") String password, @Param("account") String account,
@Param("communityId") Long communityId);
- @Select("select community_id,`name` from com_act where state = 0")
+ @Select("select community_id,`name`,lng,lat from com_act where state = 0")
List<EventGridCommunityAdminVO> getCommunityLists();
@Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
@@ -72,19 +73,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")
+ @Select("select `name`,street_id from com_street where area_code = '510423'")
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},'%')")
+ @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.name like '%%' and cs.area_code = '510423'")
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")
+ @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 " +
+ "where cs.area_code = '510423' " +
+ "HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
+
+ @Select("select community_id,name,lng,lat from com_act where state = 0 and area_code = '510423' ")
+ List<EventGridCommunityAdminVO> getWestCommunityLists();
+
+ @Select("select account,plaintext_password as password from com_act where community_id = #{communityId}")
+ ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);
}
--
Gitblit v1.7.1