From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 125 +++++++++++++++--------------------------
1 files changed, 47 insertions(+), 78 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 b55de5d..97ec918 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
@@ -1,5 +1,12 @@
package com.panzhihua.service_community.dao;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,12 +18,6 @@
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;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,96 +27,64 @@
**/
@Mapper
public interface ComActDAO extends BaseMapper<ComActDO> {
- // @Select("<script> " +
-// " <where>" +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// " </where>" +
-// "</script>")
+ // @Select("<script> " +
+ // " <where>" +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // " </where>" +
+ // "</script>")
- @Select("<script> " +
- "SELECT\n" +
- "c.community_id,\n" +
- "c.`name`,\n" +
- "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" +
- "FROM\n" +
- "com_act c \n" +
- " <where>" +
- "<if test='areaCode != null and areaCode.trim() != ""'>" +
- "c.area_code = #{areaCode} \n" +
- " </if> " +
- " </where>" +
- "ORDER BY\n" +
- "distance ASC" +
- "<if test='lng != null and lng.trim() != ""'>" +
- " limit 100 " +
- " </if> " +
- "</script>")
+ @Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
+ + "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
+ + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != ""'>"
+ + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
+ + "<if test='lng != null and lng.trim() != ""'>" + " limit 100 " + " </if> " + "</script>")
List<ComActVO> listCommunity(ComActVO comActVO);
@Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
String selectAreaName(String areaCode);
- @Select("<script> " +
- "SELECT\n" +
- "a.* \n" +
- "FROM\n" +
- "com_act a \n" +
- " <where>" +
- "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != ""'>" +
- "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" +
- " </if> " +
- "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != ""'>" +
- "AND a.area_code = #{pageComActDTO.areaCode} \n" +
- " </if> " +
- "<if test='pageComActDTO.createAtBegin != null '>" +
- "AND a.create_at BETWEEN " +
- "#{pageComActDTO.createAtBegin} \n" +
- "AND #{pageComActDTO.createAtEnd}" +
- " </if> " +
- " </where>" +
- " order by a.create_at desc"+
- "</script>")
+ @Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
+ + "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != ""'>"
+ + "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
+ + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != ""'>"
+ + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
+ + "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
+ + "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
+ + " order by a.create_at desc" + "</script>")
IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
+
@Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
- void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);
+ 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")
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" +
- "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n" +
- "left join com_mng_struct_area_city as cmsac on cmsac.city_adcode = ca.city_code\n" +
- "left join com_mng_struct_area_district as cmsad on cmsad.district_adcode = ca.area_code\n" +
- "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 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"
+ + "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"
+ + "left join com_mng_struct_area_city as cmsac on cmsac.city_adcode = ca.city_code\n"
+ + "left join com_mng_struct_area_district as cmsad on cmsad.district_adcode = ca.area_code\n"
+ + "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);
+ 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 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")
+ @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