20190403获取地标优化

src/main/java/com/izouma/awesomeadmin/dao/AreaShowPointMapper.xml

@@ -586,7 +586,7 @@
     <resultMap id="AreaShowPointResultMap" type="com.izouma.awesomeadmin.model.AreaShowPoint" extends="BaseResultMap">
 
         <association property="landMark" javaType="com.izouma.awesomeadmin.model.LandMark"
-                     select="com.izouma.awesomeadmin.dao.LandMarkMapper.queryLandMark"
+                     select="com.izouma.awesomeadmin.dao.LandMarkMapper.queryLandMarkNoMap"
                      column="{id = landmark_id}">
         </association>
         <association property="cityInfo" javaType="com.izouma.awesomeadmin.model.CityInfo"

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.java

@@ -23,14 +23,20 @@ public interface LandMarkMapper {
 
     List<LandMark> queryAllLandMark(LandMark record);
 
+    List<LandMark> queryAllLandMarkNoMap(LandMark record);
+
     List<LandMark> queryLandMarkByPage(Map<String, Object> parameter);
 
+    List<LandMark> queryLandMarkNoMapByPage(Map<String, Object> parameter);
+
     List<LandMark> queryCityLandMarkByPage(Map<String, Object> parameter);
 
     int delete(LandMark record);
 
     LandMark queryLandMark(LandMark record);
 
+    LandMark queryLandMarkNoMap(LandMark record);
+
     List<LandMark> query(LandMark record);
 
     LandMark queryLandMarkMapInfo(LandMark record);

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.xml

@@ -108,6 +108,72 @@
 
         </trim>
     </sql>
+    <sql id="no_map_Column_List">
+        <trim suffixOverrides=",">
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            map_name,
+
+            owned_city_id,
+
+            map_sprite,
+
+            loge_sprite,
+
+            open_describe,
+
+            mark_describe,
+
+            anchor_image_group_name,
+
+            default_mode,
+
+            vuforia_image_group_id,
+
+            vuforia_data_name,
+
+
+            map_width,
+
+            map_height,
+
+            map_rate,
+
+            show_in_panel,
+
+            longitude,
+
+            latitude,
+
+            remark1,
+
+            remark2,
+
+            remark3,
+
+            front_level_id,
+            type_id,
+            keyword,
+            power,
+            ad_image,
+            map_angle,
+            add_step,
+            mark_level,
+            mark_price,
+            bus_route,
+
+        </trim>
+    </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
         <include refid="Base_Column_List"/>
@@ -598,7 +664,199 @@
                     OR default_mode LIKE concat('%',#{searchKey},'%')
                     OR vuforia_image_group_id LIKE concat('%',#{searchKey},'%')
                     OR vuforia_data_name LIKE concat('%',#{searchKey},'%')
-                    OR map_info LIKE concat('%',#{searchKey},'%')
+                    OR map_width LIKE concat('%',#{searchKey},'%')
+                    OR map_height LIKE concat('%',#{searchKey},'%')
+                    OR map_rate LIKE concat('%',#{searchKey},'%')
+                    OR show_in_panel LIKE concat('%',#{searchKey},'%')
+                    OR longitude LIKE concat('%',#{searchKey},'%')
+                    OR latitude LIKE concat('%',#{searchKey},'%')
+                    OR remark1 LIKE concat('%',#{searchKey},'%')
+                    OR remark2 LIKE concat('%',#{searchKey},'%')
+                    OR remark3 LIKE concat('%',#{searchKey},'%')
+                    OR front_level_id LIKE concat('%',#{searchKey},'%')
+                    OR keyword LIKE concat('%',#{keyword},'%')
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryAllLandMarkNoMap" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.LandMark">
+        select
+        <include refid="no_map_Column_List"/>
+        from land_mark
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="mapName != null and !&quot;&quot;.equals(mapName)">
+                and map_name = #{mapName}
+            </if>
+            <if test="ownedCityId != null and !&quot;&quot;.equals(ownedCityId)">
+                and owned_city_id = #{ownedCityId}
+            </if>
+            <if test="mapSprite != null and !&quot;&quot;.equals(mapSprite)">
+                and map_sprite = #{mapSprite}
+            </if>
+            <if test="logeSprite != null and !&quot;&quot;.equals(logeSprite)">
+                and loge_sprite = #{logeSprite}
+            </if>
+            <if test="openDescribe != null and !&quot;&quot;.equals(openDescribe)">
+                and open_describe = #{openDescribe}
+            </if>
+            <if test="markDescribe != null and !&quot;&quot;.equals(markDescribe)">
+                and mark_describe = #{markDescribe}
+            </if>
+            <if test="anchorImageGroupName != null and !&quot;&quot;.equals(anchorImageGroupName)">
+                and anchor_image_group_name = #{anchorImageGroupName}
+            </if>
+            <if test="defaultMode != null and !&quot;&quot;.equals(defaultMode)">
+                and default_mode = #{defaultMode}
+            </if>
+            <if test="vuforiaImageGroupId != null and !&quot;&quot;.equals(vuforiaImageGroupId)">
+                and vuforia_image_group_id = #{vuforiaImageGroupId}
+            </if>
+            <if test="vuforiaDataName != null and !&quot;&quot;.equals(vuforiaDataName)">
+                and vuforia_data_name = #{vuforiaDataName}
+            </if>
+            <if test="mapInfo != null and !&quot;&quot;.equals(mapInfo)">
+                and map_info = #{mapInfo}
+            </if>
+            <if test="mapWidth != null and !&quot;&quot;.equals(mapWidth)">
+                and map_width = #{mapWidth}
+            </if>
+            <if test="mapHeight != null and !&quot;&quot;.equals(mapHeight)">
+                and map_height = #{mapHeight}
+            </if>
+            <if test="mapRate != null and !&quot;&quot;.equals(mapRate)">
+                and map_rate = #{mapRate}
+            </if>
+            <if test="showInPanel != null and !&quot;&quot;.equals(showInPanel)">
+                and show_in_panel = #{showInPanel}
+            </if>
+            <if test="longitude != null and !&quot;&quot;.equals(longitude)">
+                and longitude = #{longitude}
+            </if>
+            <if test="latitude != null and !&quot;&quot;.equals(latitude)">
+                and latitude = #{latitude}
+            </if>
+            <if test="remark1 != null and !&quot;&quot;.equals(remark1)">
+                and remark1 = #{remark1}
+            </if>
+            <if test="remark2 != null and !&quot;&quot;.equals(remark2)">
+                and remark2 = #{remark2}
+            </if>
+            <if test="remark3 != null and !&quot;&quot;.equals(remark3)">
+                and remark3 = #{remark3}
+            </if>
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
+            <if test="addStep != null and !&quot;&quot;.equals(addStep)">
+                and add_step = #{addStep}
+            </if>
+            <if test="addStepStr != null and !&quot;&quot;.equals(addStepStr)">
+                and add_step in (${addStepStr})
+            </if>
+            <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
+
+                and (front_level_id = #{frontLevelId}
+                <if test="'0'.toString()==frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR map_name LIKE concat('%',#{searchKey},'%')
+                    OR owned_city_id LIKE concat('%',#{searchKey},'%')
+                    OR map_sprite LIKE concat('%',#{searchKey},'%')
+                    OR loge_sprite LIKE concat('%',#{searchKey},'%')
+                    OR open_describe LIKE concat('%',#{searchKey},'%')
+                    OR mark_describe LIKE concat('%',#{searchKey},'%')
+                    OR anchor_image_group_name LIKE concat('%',#{searchKey},'%')
+                    OR default_mode LIKE concat('%',#{searchKey},'%')
+                    OR vuforia_image_group_id LIKE concat('%',#{searchKey},'%')
+                    OR vuforia_data_name LIKE concat('%',#{searchKey},'%')
                     OR map_width LIKE concat('%',#{searchKey},'%')
                     OR map_height LIKE concat('%',#{searchKey},'%')
                     OR map_rate LIKE concat('%',#{searchKey},'%')
@@ -878,7 +1136,220 @@
         </if>
         id desc
     </select>
-    <select id="queryCityLandMarkByPage" parameterType="java.util.Map" resultMap="AllLandMarkResultMap">
+    <select id="queryLandMarkNoMapByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.LandMark">
+        select
+        <include refid="no_map_Column_List"/>
+        from land_mark
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
+            </if>
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
+            </if>
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
+            </if>
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
+            </if>
+            <if test="record.mapName != null and !&quot;&quot;.equals(record.mapName)">
+                and map_name = #{record.mapName}
+            </if>
+            <if test="record.ownedCityId != null and !&quot;&quot;.equals(record.ownedCityId)">
+                and owned_city_id = #{record.ownedCityId}
+            </if>
+            <if test="record.mapSprite != null and !&quot;&quot;.equals(record.mapSprite)">
+                and map_sprite = #{record.mapSprite}
+            </if>
+            <if test="record.logeSprite != null and !&quot;&quot;.equals(record.logeSprite)">
+                and loge_sprite = #{record.logeSprite}
+            </if>
+            <if test="record.openDescribe != null and !&quot;&quot;.equals(record.openDescribe)">
+                and open_describe = #{record.openDescribe}
+            </if>
+            <if test="record.markDescribe != null and !&quot;&quot;.equals(record.markDescribe)">
+                and mark_describe = #{record.markDescribe}
+            </if>
+            <if test="record.anchorImageGroupName != null and !&quot;&quot;.equals(record.anchorImageGroupName)">
+                and anchor_image_group_name = #{record.anchorImageGroupName}
+            </if>
+            <if test="record.defaultMode != null and !&quot;&quot;.equals(record.defaultMode)">
+                and default_mode = #{record.defaultMode}
+            </if>
+            <if test="record.vuforiaImageGroupId != null and !&quot;&quot;.equals(record.vuforiaImageGroupId)">
+                and vuforia_image_group_id = #{record.vuforiaImageGroupId}
+            </if>
+            <if test="record.vuforiaDataName != null and !&quot;&quot;.equals(record.vuforiaDataName)">
+                and vuforia_data_name = #{record.vuforiaDataName}
+            </if>
+            <if test="record.mapInfo != null and !&quot;&quot;.equals(record.mapInfo)">
+                and map_info = #{record.mapInfo}
+            </if>
+            <if test="record.mapWidth != null and !&quot;&quot;.equals(record.mapWidth)">
+                and map_width = #{record.mapWidth}
+            </if>
+            <if test="record.mapHeight != null and !&quot;&quot;.equals(record.mapHeight)">
+                and map_height = #{record.mapHeight}
+            </if>
+            <if test="record.mapRate != null and !&quot;&quot;.equals(record.mapRate)">
+                and map_rate = #{record.mapRate}
+            </if>
+            <if test="record.showInPanel != null and !&quot;&quot;.equals(record.showInPanel)">
+                and show_in_panel = #{record.showInPanel}
+            </if>
+            <if test="record.longitude != null and !&quot;&quot;.equals(record.longitude)">
+                and longitude = #{record.longitude}
+            </if>
+            <if test="record.latitude != null and !&quot;&quot;.equals(record.latitude)">
+                and latitude = #{record.latitude}
+            </if>
+            <if test="record.remark1 != null and !&quot;&quot;.equals(record.remark1)">
+                and remark1 = #{record.remark1}
+            </if>
+            <if test="record.remark2 != null and !&quot;&quot;.equals(record.remark2)">
+                and remark2 = #{record.remark2}
+            </if>
+            <if test="record.remark3 != null and !&quot;&quot;.equals(record.remark3)">
+                and remark3 = #{record.remark3}
+            </if>
+            <if test="record.typeId != null and !&quot;&quot;.equals(record.typeId)">
+                and type_id = #{record.typeId}
+            </if>
+            <if test="record.keyword != null and !&quot;&quot;.equals(record.keyword)">
+                and keyword = #{record.keyword}
+            </if>
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
+            </if>
+            <if test="record.areaMapInfo != null and !&quot;&quot;.equals(record.areaMapInfo)">
+                and area_map_info = #{record.areaMapInfo}
+            </if>
+            <if test="record.addStep != null and !&quot;&quot;.equals(record.addStep)">
+                and add_step = #{record.addStep}
+            </if>
+
+            <if test="record.addStepStr != null and !&quot;&quot;.equals(record.addStepStr)">
+                and add_step in (${record.addStepStr})
+            </if>
+
+            <if test="record.frontLevelId != null and !&quot;&quot;.equals(record.frontLevelId)">
+
+                and (front_level_id = #{record.frontLevelId}
+                <if test="'0'.toString()==record.frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR map_name LIKE concat('%',#{record.searchKey},'%')
+                    OR owned_city_id LIKE concat('%',#{record.searchKey},'%')
+                    OR map_sprite LIKE concat('%',#{record.searchKey},'%')
+                    OR loge_sprite LIKE concat('%',#{record.searchKey},'%')
+                    OR open_describe LIKE concat('%',#{record.searchKey},'%')
+                    OR mark_describe LIKE concat('%',#{record.searchKey},'%')
+                    OR anchor_image_group_name LIKE concat('%',#{record.searchKey},'%')
+                    OR default_mode LIKE concat('%',#{record.searchKey},'%')
+                    OR vuforia_image_group_id LIKE concat('%',#{record.searchKey},'%')
+                    OR vuforia_data_name LIKE concat('%',#{record.searchKey},'%')
+                    OR map_info LIKE concat('%',#{record.searchKey},'%')
+                    OR map_width LIKE concat('%',#{record.searchKey},'%')
+                    OR map_height LIKE concat('%',#{record.searchKey},'%')
+                    OR map_rate LIKE concat('%',#{record.searchKey},'%')
+                    OR show_in_panel LIKE concat('%',#{record.searchKey},'%')
+                    OR longitude LIKE concat('%',#{record.searchKey},'%')
+                    OR latitude LIKE concat('%',#{record.searchKey},'%')
+                    OR remark1 LIKE concat('%',#{record.searchKey},'%')
+                    OR remark2 LIKE concat('%',#{record.searchKey},'%')
+                    OR remark3 LIKE concat('%',#{record.searchKey},'%')
+                    OR front_level_id LIKE concat('%',#{record.searchKey},'%')
+                    OR keyword LIKE concat('%',#{record.keyword},'%')
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+
+            <if test="record.distance != null and !&quot;&quot;.equals(record.distance)">
+
+                <![CDATA[
+                   AND ( ACOS(
+                SIN((#{record.latKey} * PI()) / 180) * SIN((latitude * PI()) / 180) +
+                COS((#{record.latKey} * PI()) / 180) * COS((latitude * PI()) / 180) * COS(
+                (#{record.lngKey} * PI()) / 180 - (longitude * PI()) / 180
+                )
+                ) * 6371.004 )  <= #{record.distance}
+                    AND longitude > #{record.lngKey} - 3
+                    AND longitude < #{record.lngKey} + 3
+                    AND latitude > #{record.latKey} - 3
+                    AND latitude < #{record.latKey} + 3
+                    ]]>
+            </if>
+
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryCityLandMarkByPage" parameterType="java.util.Map" resultMap="AllLandMarkResultMap">
         select
         <include refid="Base_Column_List"/>
         , #{record.areaTypeId} as area_type_id
@@ -1006,7 +1477,6 @@
                     OR default_mode LIKE concat('%',#{record.searchKey},'%')
                     OR vuforia_image_group_id LIKE concat('%',#{record.searchKey},'%')
                     OR vuforia_data_name LIKE concat('%',#{record.searchKey},'%')
-                    OR map_info LIKE concat('%',#{record.searchKey},'%')
                     OR map_width LIKE concat('%',#{record.searchKey},'%')
                     OR map_height LIKE concat('%',#{record.searchKey},'%')
                     OR map_rate LIKE concat('%',#{record.searchKey},'%')
@@ -1219,7 +1689,6 @@
                     OR default_mode LIKE concat('%',#{searchKey},'%')
                     OR vuforia_image_group_id LIKE concat('%',#{searchKey},'%')
                     OR vuforia_data_name LIKE concat('%',#{searchKey},'%')
-                    OR map_info LIKE concat('%',#{searchKey},'%')
                     OR map_width LIKE concat('%',#{searchKey},'%')
                     OR map_height LIKE concat('%',#{searchKey},'%')
                     OR map_rate LIKE concat('%',#{searchKey},'%')
@@ -1398,6 +1867,119 @@
         LIMIT 1
     </select>
 
+    <select id="queryLandMarkNoMap" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMark">
+        select
+        <include refid="no_map_Column_List"/>
+        from land_mark
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+            <if test="mapName != null and !&quot;&quot;.equals(mapName)">
+                and map_name = #{mapName}
+            </if>
+            <if test="ownedCityId != null and !&quot;&quot;.equals(ownedCityId)">
+                and owned_city_id = #{ownedCityId}
+            </if>
+            <if test="mapSprite != null and !&quot;&quot;.equals(mapSprite)">
+                and map_sprite = #{mapSprite}
+            </if>
+            <if test="logeSprite != null and !&quot;&quot;.equals(logeSprite)">
+                and loge_sprite = #{logeSprite}
+            </if>
+            <if test="openDescribe != null and !&quot;&quot;.equals(openDescribe)">
+                and open_describe = #{openDescribe}
+            </if>
+            <if test="markDescribe != null and !&quot;&quot;.equals(markDescribe)">
+                and mark_describe = #{markDescribe}
+            </if>
+            <if test="anchorImageGroupName != null and !&quot;&quot;.equals(anchorImageGroupName)">
+                and anchor_image_group_name = #{anchorImageGroupName}
+            </if>
+            <if test="defaultMode != null and !&quot;&quot;.equals(defaultMode)">
+                and default_mode = #{defaultMode}
+            </if>
+            <if test="vuforiaImageGroupId != null and !&quot;&quot;.equals(vuforiaImageGroupId)">
+                and vuforia_image_group_id = #{vuforiaImageGroupId}
+            </if>
+            <if test="vuforiaDataName != null and !&quot;&quot;.equals(vuforiaDataName)">
+                and vuforia_data_name = #{vuforiaDataName}
+            </if>
+            <if test="mapInfo != null and !&quot;&quot;.equals(mapInfo)">
+                and map_info = #{mapInfo}
+            </if>
+            <if test="mapWidth != null and !&quot;&quot;.equals(mapWidth)">
+                and map_width = #{mapWidth}
+            </if>
+            <if test="mapHeight != null and !&quot;&quot;.equals(mapHeight)">
+                and map_height = #{mapHeight}
+            </if>
+            <if test="mapRate != null and !&quot;&quot;.equals(mapRate)">
+                and map_rate = #{mapRate}
+            </if>
+            <if test="showInPanel != null and !&quot;&quot;.equals(showInPanel)">
+                and show_in_panel = #{showInPanel}
+            </if>
+            <if test="longitude != null and !&quot;&quot;.equals(longitude)">
+                and longitude = #{longitude}
+            </if>
+            <if test="latitude != null and !&quot;&quot;.equals(latitude)">
+                and latitude = #{latitude}
+            </if>
+            <if test="remark1 != null and !&quot;&quot;.equals(remark1)">
+                and remark1 = #{remark1}
+            </if>
+            <if test="remark2 != null and !&quot;&quot;.equals(remark2)">
+                and remark2 = #{remark2}
+            </if>
+            <if test="remark3 != null and !&quot;&quot;.equals(remark3)">
+                and remark3 = #{remark3}
+            </if>
+            <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
+                and front_level_id = #{frontLevelId}
+            </if>
+
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
+
+            <if test="addStep != null and !&quot;&quot;.equals(addStep)">
+                and add_step = #{addStep}
+            </if>
+
+            <if test="addStepStr != null and !&quot;&quot;.equals(addStepStr)">
+                and add_step in (${addStepStr})
+            </if>
+
+        </where>
+        LIMIT 1
+    </select>
+
     <select id="queryLandMarkMapInfo" parameterType="java.util.Map" resultMap="MapInfoResultMap">
         select
         <include refid="Base_Column_List"/>, 'Y' as land_mark_flag

src/main/java/com/izouma/awesomeadmin/service/LandMarkService.java

@@ -12,8 +12,12 @@ public interface LandMarkService{
 
     List<LandMark> getLandMarkList(LandMark record);
 
+    List<LandMark> getLandMarkNoMapList(LandMark record);
+
     List<LandMark> getLandMarkByPage(Page page, LandMark record);
 
+    List<LandMark> getLandMarkNoMapByPage(Page page, LandMark record);
+
     List<LandMark> getCityLandMarkByPage(Page page, LandMark record);
 
     LandMark getLandMarkById(String id);

src/main/java/com/izouma/awesomeadmin/service/impl/LandMarkServiceImpl.java

@@ -36,6 +36,20 @@ public class LandMarkServiceImpl implements LandMarkService {
         return null;
     }
 
+    @Override
+    public List<LandMark> getLandMarkNoMapList(LandMark record) {
+
+        logger.info("getLandMarkNoMapList");
+        try {
+
+            return landMarkMapper.queryAllLandMarkNoMap(record);
+        } catch (Exception e) {
+            logger.error("getLandMarkNoMapList", e);
+        }
+
+        return null;
+    }
+
     @Override
     public List<LandMark> getLandMarkChildList(LandMark record) {
 
@@ -68,6 +82,24 @@ public class LandMarkServiceImpl implements LandMarkService {
         return null;
     }
 
+    @Override
+    public List<LandMark> getLandMarkNoMapByPage(Page page, LandMark record) {
+
+        logger.info("getLandMarkNoMapByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return landMarkMapper.queryLandMarkNoMapByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getLandMarkNoMapByPage", e);
+        }
+
+        return null;
+    }
+
     @Override
     public List<LandMark> getCityLandMarkByPage(Page page, LandMark record) {
 

src/main/java/com/izouma/awesomeadmin/web/LandMarkController.java

@@ -43,6 +43,16 @@ public class LandMarkController {
         return new Result(true, pp);
     }
 
+    /**
+     * <p>获取全部记录。</p>
+     */
+    @RequestMapping(value = "/noMapAll", method = RequestMethod.GET)
+    @ResponseBody
+    public Result noMapAll(LandMark record) {
+        List<LandMark> pp = landMarkService.getLandMarkNoMapList(record);
+        return new Result(true, pp);
+    }
+
     /**
      * <p>根据Id。</p>
      */
@@ -87,6 +97,21 @@ public class LandMarkController {
         return new Result(true, result);
     }
 
+    /**
+     * <p>分页查询。</p>
+     */
+    @RequestMapping(value = "/noMapPage", method = RequestMethod.GET)
+    @ResponseBody
+    public Result noMapPage(Page page, LandMark record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<LandMark> pp = landMarkService.getLandMarkNoMapByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
 
     /**
      * <p>分页查询。本城市没有则显示其他城市的</p>

src/main/vue/src/pages/AimGroupInfo.vue

@@ -126,7 +126,7 @@ export default {
 
 
         this.$http.get({
-            url: '/landMark/all'
+            url: '/landMark/noMapAll'
         }).then(res => {
             if (res.success) {
 

src/main/vue/src/pages/AimPlaceContent.vue

@@ -120,7 +120,7 @@ export default {
 
 
         this.$http.get({
-            url: '/landMark/all'
+            url: '/landMark/noMapAll'
         }).then(res => {
             if (res.success) {
 

src/main/vue/src/pages/AimPlaceInfo.vue

@@ -234,7 +234,7 @@ export default {
 
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/vue/src/pages/AimPlacePosition.vue

@@ -101,7 +101,7 @@ export default {
 
 
         this.$http.get({
-            url: '/landMark/all'
+            url: '/landMark/noMapAll'
         }).then(res => {
             if (res.success) {
 

src/main/vue/src/pages/AreaInfo.vue

@@ -191,7 +191,7 @@ export default {
 
 
         this.$http.get({
-            url: '/landMark/all'
+            url: '/landMark/noMapAll'
         }).then(res => {
             if (res.success) {
 

src/main/vue/src/pages/AreaShowPoint.vue

@@ -164,7 +164,7 @@ export default {
 
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/vue/src/pages/LandMark.vue

@@ -288,7 +288,7 @@ export default {
 
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/vue/src/pages/LandMarkCreate.vue

@@ -210,7 +210,7 @@ export default {
     }
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/vue/src/pages/LandMarks.vue

@@ -470,7 +470,7 @@ export default {
       }
 
       this.$http.get({
-        url: '/landMark/page',
+        url: '/landMark/noMapPage',
         data: data
       }).then(res => {
         if (res.success) {

src/main/vue/src/pages/ThingInfo.vue

@@ -201,7 +201,7 @@ export default {
 
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/vue/src/pages/VuforiaImageInfo.vue

@@ -151,7 +151,7 @@ export default {
 
 
     this.$http.get({
-      url: '/landMark/all'
+      url: '/landMark/noMapAll'
     }).then(res => {
       if (res.success) {
 

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.b07bc4f91549f9bffdf5bf82d883f088.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.8b06931c4230478da003.js></script><script type=text/javascript src=/static/js/vendor.093529e5a9f11598157c.js></script><script type=text/javascript src=/static/js/admin.3d70caba16589b5012f5.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.b07bc4f91549f9bffdf5bf82d883f088.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.05b04d6547c1402fcdd7.js></script><script type=text/javascript src=/static/js/vendor.093529e5a9f11598157c.js></script><script type=text/javascript src=/static/js/admin.d562851c191b07b56084.js></script></body></html>

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.fd00a5a4e42911280fc149a39bbdf891.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.8b06931c4230478da003.js></script><script type=text/javascript src=/static/js/vendor.093529e5a9f11598157c.js></script><script type=text/javascript src=/static/js/loginAdmin.7a6bd39864afe53b00c3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.fd00a5a4e42911280fc149a39bbdf891.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.05b04d6547c1402fcdd7.js></script><script type=text/javascript src=/static/js/vendor.093529e5a9f11598157c.js></script><script type=text/javascript src=/static/js/loginAdmin.7a6bd39864afe53b00c3.js></script></body></html>

src/main/webapp/static/js/83.abd1fa4ff0a03e70f5b3.js → src/main/webapp/static/js/82.3e388f8d336291ed0eff.js

@@ -1 +1 @@
-webpackJsonp([83],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
+webpackJsonp([82],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});