20190115接口

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

@@ -25,6 +25,8 @@ public interface LandMarkMapper {
 
     List<LandMark> queryLandMarkByPage(Map<String, Object> parameter);
 
+    List<LandMark> queryCityLandMarkByPage(Map<String, Object> parameter);
+
     int delete(LandMark record);
 
     LandMark queryLandMark(LandMark record);

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

@@ -418,6 +418,193 @@
         </if>
 
     </update>
+    <select id="queryAllLandMark" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMark">
+        select
+        <include refid="Base_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="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_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="queryLandMarkByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMark">
         select
         <include refid="Base_Column_List"/>
@@ -597,10 +784,10 @@
                 (#{record.lngKey} * PI()) / 180 - (longitude * PI()) / 180
                 )
                 ) * 6371.004 )  <= #{record.distance}
-                    AND longitude > #{record.lngKey} - 2
-                    AND longitude < #{record.lngKey} + 2
-                    AND latitude > #{record.latKey} - 2
-                    AND latitude < #{record.latKey} + 2
+                    AND longitude > #{record.lngKey} - 3
+                    AND longitude < #{record.lngKey} + 3
+                    AND latitude > #{record.latKey} - 3
+                    AND latitude < #{record.latKey} + 3
                     ]]>
             </if>
 
@@ -622,141 +809,143 @@
         </if>
         id desc
     </select>
-    <select id="queryAllLandMark" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMark">
+    <select id="queryCityLandMarkByPage" parameterType="java.util.Map" resultMap="AllLandMarkResultMap">
         select
         <include refid="Base_Column_List"/>
+        , #{record.areaTypeId} as area_type_id
         from land_mark
         <where>
             and del_flag = 'N'
-            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
-                and id in (${idStr})
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
             </if>
-            <if test="id != null and !&quot;&quot;.equals(id)">
-                and id = #{id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
             </if>
-            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and del_flag = #{delFlag}
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and update_time = #{updateTime}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and update_user = #{updateUser}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and create_time = #{createTime}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and create_user = #{createUser}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-            <if test="mapName != null and !&quot;&quot;.equals(mapName)">
-                and map_name = #{mapName}
+            <if test="record.mapName != null and !&quot;&quot;.equals(record.mapName)">
+                and map_name = #{record.mapName}
             </if>
-            <if test="ownedCityId != null and !&quot;&quot;.equals(ownedCityId)">
-                and owned_city_id = #{ownedCityId}
+            <if test="record.ownedCityId != null and !&quot;&quot;.equals(record.ownedCityId)">
+                and owned_city_id = #{record.ownedCityId}
             </if>
-            <if test="mapSprite != null and !&quot;&quot;.equals(mapSprite)">
-                and map_sprite = #{mapSprite}
+            <if test="record.mapSprite != null and !&quot;&quot;.equals(record.mapSprite)">
+                and map_sprite = #{record.mapSprite}
             </if>
-            <if test="logeSprite != null and !&quot;&quot;.equals(logeSprite)">
-                and loge_sprite = #{logeSprite}
+            <if test="record.logeSprite != null and !&quot;&quot;.equals(record.logeSprite)">
+                and loge_sprite = #{record.logeSprite}
             </if>
-            <if test="openDescribe != null and !&quot;&quot;.equals(openDescribe)">
-                and open_describe = #{openDescribe}
+            <if test="record.openDescribe != null and !&quot;&quot;.equals(record.openDescribe)">
+                and open_describe = #{record.openDescribe}
             </if>
-            <if test="markDescribe != null and !&quot;&quot;.equals(markDescribe)">
-                and mark_describe = #{markDescribe}
+            <if test="record.markDescribe != null and !&quot;&quot;.equals(record.markDescribe)">
+                and mark_describe = #{record.markDescribe}
             </if>
-            <if test="anchorImageGroupName != null and !&quot;&quot;.equals(anchorImageGroupName)">
-                and anchor_image_group_name = #{anchorImageGroupName}
+            <if test="record.anchorImageGroupName != null and !&quot;&quot;.equals(record.anchorImageGroupName)">
+                and anchor_image_group_name = #{record.anchorImageGroupName}
             </if>
-            <if test="defaultMode != null and !&quot;&quot;.equals(defaultMode)">
-                and default_mode = #{defaultMode}
+            <if test="record.defaultMode != null and !&quot;&quot;.equals(record.defaultMode)">
+                and default_mode = #{record.defaultMode}
             </if>
-            <if test="vuforiaImageGroupId != null and !&quot;&quot;.equals(vuforiaImageGroupId)">
-                and vuforia_image_group_id = #{vuforiaImageGroupId}
+            <if test="record.vuforiaImageGroupId != null and !&quot;&quot;.equals(record.vuforiaImageGroupId)">
+                and vuforia_image_group_id = #{record.vuforiaImageGroupId}
             </if>
-            <if test="vuforiaDataName != null and !&quot;&quot;.equals(vuforiaDataName)">
-                and vuforia_data_name = #{vuforiaDataName}
+            <if test="record.vuforiaDataName != null and !&quot;&quot;.equals(record.vuforiaDataName)">
+                and vuforia_data_name = #{record.vuforiaDataName}
             </if>
-            <if test="mapInfo != null and !&quot;&quot;.equals(mapInfo)">
-                and map_info = #{mapInfo}
+            <if test="record.mapInfo != null and !&quot;&quot;.equals(record.mapInfo)">
+                and map_info = #{record.mapInfo}
             </if>
-            <if test="mapWidth != null and !&quot;&quot;.equals(mapWidth)">
-                and map_width = #{mapWidth}
+            <if test="record.mapWidth != null and !&quot;&quot;.equals(record.mapWidth)">
+                and map_width = #{record.mapWidth}
             </if>
-            <if test="mapHeight != null and !&quot;&quot;.equals(mapHeight)">
-                and map_height = #{mapHeight}
+            <if test="record.mapHeight != null and !&quot;&quot;.equals(record.mapHeight)">
+                and map_height = #{record.mapHeight}
             </if>
-            <if test="mapRate != null and !&quot;&quot;.equals(mapRate)">
-                and map_rate = #{mapRate}
+            <if test="record.mapRate != null and !&quot;&quot;.equals(record.mapRate)">
+                and map_rate = #{record.mapRate}
             </if>
-            <if test="showInPanel != null and !&quot;&quot;.equals(showInPanel)">
-                and show_in_panel = #{showInPanel}
+            <if test="record.showInPanel != null and !&quot;&quot;.equals(record.showInPanel)">
+                and show_in_panel = #{record.showInPanel}
             </if>
-            <if test="longitude != null and !&quot;&quot;.equals(longitude)">
-                and longitude = #{longitude}
+            <if test="record.longitude != null and !&quot;&quot;.equals(record.longitude)">
+                and longitude = #{record.longitude}
             </if>
-            <if test="latitude != null and !&quot;&quot;.equals(latitude)">
-                and latitude = #{latitude}
+            <if test="record.latitude != null and !&quot;&quot;.equals(record.latitude)">
+                and latitude = #{record.latitude}
             </if>
-            <if test="remark1 != null and !&quot;&quot;.equals(remark1)">
-                and remark1 = #{remark1}
+            <if test="record.remark1 != null and !&quot;&quot;.equals(record.remark1)">
+                and remark1 = #{record.remark1}
             </if>
-            <if test="remark2 != null and !&quot;&quot;.equals(remark2)">
-                and remark2 = #{remark2}
+            <if test="record.remark2 != null and !&quot;&quot;.equals(record.remark2)">
+                and remark2 = #{record.remark2}
             </if>
-            <if test="remark3 != null and !&quot;&quot;.equals(remark3)">
-                and remark3 = #{remark3}
+            <if test="record.remark3 != null and !&quot;&quot;.equals(record.remark3)">
+                and remark3 = #{record.remark3}
             </if>
-            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
-                and type_id = #{type_id}
+            <if test="record.typeId != null and !&quot;&quot;.equals(record.typeId)">
+                and type_id = #{record.typeId}
             </if>
-            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
-                and keyword = #{keyword}
+            <if test="record.keyword != null and !&quot;&quot;.equals(record.keyword)">
+                and keyword = #{record.keyword}
             </if>
-            <if test="power != null and !&quot;&quot;.equals(power)">
-                and power = #{power}
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
             </if>
-            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
-                and area_map_info = #{areaMapInfo}
+            <if test="record.areaMapInfo != null and !&quot;&quot;.equals(record.areaMapInfo)">
+                and area_map_info = #{record.areaMapInfo}
             </if>
-            <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
+            <if test="record.frontLevelId != null and !&quot;&quot;.equals(record.frontLevelId)">
 
-                and (front_level_id = #{frontLevelId}
-                <if test="'0'.toString()==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="searchKey != null and !&quot;&quot;.equals(searchKey)">
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.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_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},'%')
+                    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="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+
+            <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('_,')">
@@ -791,14 +980,31 @@
             </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} - 2
+                    AND longitude < #{record.lngKey} + 2
+                    AND latitude > #{record.latKey} - 2
+                    AND latitude < #{record.latKey} + 2
+                    ]]>
+            </if>
+
+
         </where>
         order by
 
-        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
 
 
             <trim suffixOverrides=",">
-                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
                     <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                         ${itemDetail}
                     </foreach>
@@ -806,7 +1012,6 @@
             </trim>
             ,
         </if>
-
         id desc
     </select>
     <select id="queryAllLandMarkChild" parameterType="java.util.Map"
@@ -1102,7 +1307,7 @@
 
     <select id="queryLandMarkMapInfo" parameterType="java.util.Map" resultMap="MapInfoResultMap">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>, 'Y' as land_mark_flag
         from land_mark
         <where>
             and del_flag = 'N'
@@ -1250,6 +1455,21 @@
                     column="{landmarkId = id}">
         </collection>
 
+        <collection property="thingInfoList" ofType="com.izouma.awesomeadmin.model.ThingInfo"
+                    select="com.izouma.awesomeadmin.dao.ThingInfoMapper.queryAllThingInfoAllInfo"
+                    column="{landmarkId = id, landMarkFlag = land_mark_flag }">
+        </collection>
+
+
+    </resultMap>
+
+    <resultMap id="AllLandMarkResultMap" type="com.izouma.awesomeadmin.model.LandMark" extends="BaseResultMap">
+
+        <collection property="areaInfoList" ofType="com.izouma.awesomeadmin.model.AreaInfo"
+                    select="com.izouma.awesomeadmin.dao.AreaInfoMapper.queryAllAreaInfo"
+                    column="{landmarkId = id , areaType = area_type_id}">
+        </collection>
+
     </resultMap>
 
     <resultMap id="LandMarkChildResultMap" type="com.izouma.awesomeadmin.model.LandMark" extends="BaseResultMap">

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

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.LandmarkType;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.LandmarkTypeMapper")
-public interface LandmarkTypeMapper{
+public interface LandmarkTypeMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -22,6 +23,8 @@ public interface LandmarkTypeMapper{
 
     List<LandmarkType> queryAllLandmarkType(LandmarkType record);
 
+    List<LandmarkType> queryAllLandmarkTypeAllArea(LandmarkType record);
+
     List<LandmarkType> queryLandmarkTypeByPage(Map<String, Object> parameter);
 
     int delete(LandmarkType record);

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

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.izouma.awesomeadmin.dao.LandmarkTypeMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.LandmarkType" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="type_flag" property="typeFlag" jdbcType="VARCHAR" />
-                                <result column="type_name" property="typeName" jdbcType="VARCHAR" />
-                                <result column="area_name" property="areaName" jdbcType="VARCHAR" />
-                                <result column="thing_name" property="thingName" jdbcType="VARCHAR" />
-                                <result column="icon" property="icon" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-                                <result column="power" property="power" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.LandmarkTypeMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.LandmarkType">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="type_flag" property="typeFlag" jdbcType="VARCHAR"/>
+        <result column="type_name" property="typeName" jdbcType="VARCHAR"/>
+        <result column="area_name" property="areaName" jdbcType="VARCHAR"/>
+        <result column="thing_name" property="thingName" jdbcType="VARCHAR"/>
+        <result column="icon" property="icon" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="power" property="power" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -44,146 +44,147 @@
 
             power,
 
-            </trim>
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from landmark_type
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from landmark_type
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType" useGeneratedKeys="true"
+            keyProperty="id">
         insert into landmark_type
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="typeFlag!= null" >
+            <if test="typeFlag!= null">
                 type_flag,
             </if>
-                <if test="typeName!= null" >
+            <if test="typeName!= null">
                 type_name,
             </if>
-                <if test="areaName!= null" >
+            <if test="areaName!= null">
                 area_name,
             </if>
-                <if test="thingName!= null" >
+            <if test="thingName!= null">
                 thing_name,
             </if>
-                <if test="icon!= null" >
+            <if test="icon!= null">
                 icon,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-                <if test="power!= null" >
+            <if test="power!= null">
                 power,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="typeFlag != null" >
+            <if test="typeFlag != null">
                 #{typeFlag,jdbcType=VARCHAR},
             </if>
-                    <if test="typeName != null" >
+            <if test="typeName != null">
                 #{typeName,jdbcType=VARCHAR},
             </if>
-                    <if test="areaName != null" >
+            <if test="areaName != null">
                 #{areaName,jdbcType=VARCHAR},
             </if>
-                    <if test="thingName != null" >
+            <if test="thingName != null">
                 #{thingName,jdbcType=VARCHAR},
             </if>
-                    <if test="icon != null" >
+            <if test="icon != null">
                 #{icon,jdbcType=VARCHAR},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                    <if test="power != null" >
+            <if test="power != null">
                 #{power,jdbcType=VARCHAR},
             </if>
-                </trim>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType">
         update landmark_type
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=VARCHAR},
+            <if test="typeFlag != null">
+                type_flag= #{typeFlag,jdbcType=VARCHAR},
             </if>
-                     <if test="typeName != null" >
-               type_name= #{typeName,jdbcType=VARCHAR},
+            <if test="typeName != null">
+                type_name= #{typeName,jdbcType=VARCHAR},
             </if>
-                     <if test="areaName != null" >
-               area_name= #{areaName,jdbcType=VARCHAR},
+            <if test="areaName != null">
+                area_name= #{areaName,jdbcType=VARCHAR},
             </if>
-                     <if test="thingName != null" >
-               thing_name= #{thingName,jdbcType=VARCHAR},
+            <if test="thingName != null">
+                thing_name= #{thingName,jdbcType=VARCHAR},
             </if>
-                     <if test="icon != null" >
-               icon= #{icon,jdbcType=VARCHAR},
+            <if test="icon != null">
+                icon= #{icon,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                     <if test="power != null" >
-               power= #{power,jdbcType=VARCHAR},
+            <if test="power != null">
+                power= #{power,jdbcType=VARCHAR},
             </if>
-                 </set>
+        </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
             id = #{id,jdbcType=INTEGER}
@@ -194,62 +195,65 @@
         </if>
 
     </update>
-    <select id="queryLandmarkTypeByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
-        select <include refid="Base_Column_List"/> from landmark_type
+    <select id="queryLandmarkTypeByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select
+        <include refid="Base_Column_List"/>
+        from landmark_type
         <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 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 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 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 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 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 test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
+            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and type_flag = #{record.typeFlag}
             </if>
-                     <if test="record.typeName != null and !&quot;&quot;.equals(record.typeName)">
-                and  type_name = #{record.typeName}
+            <if test="record.typeName != null and !&quot;&quot;.equals(record.typeName)">
+                and type_name = #{record.typeName}
             </if>
-                     <if test="record.areaName != null and !&quot;&quot;.equals(record.areaName)">
-                and  area_name = #{record.areaName}
+            <if test="record.areaName != null and !&quot;&quot;.equals(record.areaName)">
+                and area_name = #{record.areaName}
             </if>
-                     <if test="record.thingName != null and !&quot;&quot;.equals(record.thingName)">
-                and  thing_name = #{record.thingName}
+            <if test="record.thingName != null and !&quot;&quot;.equals(record.thingName)">
+                and thing_name = #{record.thingName}
             </if>
-                     <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
-                and  icon = #{record.icon}
+            <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
+                and icon = #{record.icon}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.power != null and !&quot;&quot;.equals(record.power)">
-                and  power = #{record.power}
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR type_name LIKE concat('%',#{record.searchKey},'%')
+                    OR area_name LIKE concat('%',#{record.searchKey},'%')
+                    OR thing_name LIKE concat('%',#{record.searchKey},'%')
+                    OR icon LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  area_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  thing_name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  icon LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                                                                                              </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -303,96 +307,210 @@
         </if>
         id desc
     </select>
-    <select id="queryAllLandmarkType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
-        select <include refid="Base_Column_List"/> from landmark_type
+    <select id="queryAllLandmarkType" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select
+        <include refid="Base_Column_List"/>
+        from landmark_type
         <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 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 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 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 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 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 test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
             </if>
-                    <if test="typeName != null and !&quot;&quot;.equals(typeName)">
-                and  type_name = #{typeName}
+            <if test="typeName != null and !&quot;&quot;.equals(typeName)">
+                and type_name = #{typeName}
             </if>
-                    <if test="areaName != null and !&quot;&quot;.equals(areaName)">
-                and  area_name = #{areaName}
+            <if test="areaName != null and !&quot;&quot;.equals(areaName)">
+                and area_name = #{areaName}
             </if>
-                    <if test="thingName != null and !&quot;&quot;.equals(thingName)">
-                and  thing_name = #{thingName}
+            <if test="thingName != null and !&quot;&quot;.equals(thingName)">
+                and thing_name = #{thingName}
             </if>
-                    <if test="icon != null and !&quot;&quot;.equals(icon)">
-                and  icon = #{icon}
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="power != null and !&quot;&quot;.equals(power)">
-                and  power = #{power}
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  area_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  thing_name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  icon LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR type_name LIKE concat('%',#{searchKey},'%')
+                    OR area_name LIKE concat('%',#{searchKey},'%')
+                    OR thing_name LIKE concat('%',#{searchKey},'%')
+                    OR icon LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                </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="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>
 
-                    <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>
 
+
+            </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>
-            </otherwise>
-        </choose>
+            </trim>
+            ,
+        </if>
 
+        id desc
+    </select>
+    <select id="queryAllLandmarkTypeAllArea" parameterType="java.util.Map"
+            resultMap="AllAreaResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from landmark_type
+        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+            <if test="typeName != null and !&quot;&quot;.equals(typeName)">
+                and type_name = #{typeName}
+            </if>
+            <if test="areaName != null and !&quot;&quot;.equals(areaName)">
+                and area_name = #{areaName}
+            </if>
+            <if test="thingName != null and !&quot;&quot;.equals(thingName)">
+                and thing_name = #{thingName}
+            </if>
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR type_name LIKE concat('%',#{searchKey},'%')
+                    OR area_name LIKE concat('%',#{searchKey},'%')
+                    OR thing_name LIKE concat('%',#{searchKey},'%')
+                    OR icon LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                </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>
 
-    </foreach>
+                                <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>
 
-</if>
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
         </where>
         order by
 
@@ -411,50 +529,53 @@
 
         id desc
     </select>
-    <select id="queryLandmarkType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
-        select <include refid="Base_Column_List"/> from landmark_type
+    <select id="queryLandmarkType" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select
+        <include refid="Base_Column_List"/>
+        from landmark_type
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
                 and type_flag = #{typeFlag}
             </if>
-                     <if test="typeName != null and !&quot;&quot;.equals(typeName)">
+            <if test="typeName != null and !&quot;&quot;.equals(typeName)">
                 and type_name = #{typeName}
             </if>
-                     <if test="areaName != null and !&quot;&quot;.equals(areaName)">
+            <if test="areaName != null and !&quot;&quot;.equals(areaName)">
                 and area_name = #{areaName}
             </if>
-                     <if test="thingName != null and !&quot;&quot;.equals(thingName)">
+            <if test="thingName != null and !&quot;&quot;.equals(thingName)">
                 and thing_name = #{thingName}
             </if>
-                     <if test="icon != null and !&quot;&quot;.equals(icon)">
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
                 and icon = #{icon}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-                     <if test="power != null and !&quot;&quot;.equals(power)">
+            <if test="power != null and !&quot;&quot;.equals(power)">
                 and power = #{power}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -470,11 +591,23 @@
         </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
-        select <include refid="Base_Column_List"/> from landmark_type
+        select
+        <include refid="Base_Column_List"/>
+        from landmark_type
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
+        </where>
         order by id desc
     </select>
+
+    <resultMap id="AllAreaResultMap" type="com.izouma.awesomeadmin.model.LandmarkType" extends="BaseResultMap">
+
+        <collection property="areaInfoList" ofType="com.izouma.awesomeadmin.model.AreaInfo"
+                    select="com.izouma.awesomeadmin.dao.AreaInfoMapper.queryAllAreaInfo"
+                    column="{areaType = id}">
+        </collection>
+
+    </resultMap>
+
 </mapper>
 

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

@@ -358,6 +358,9 @@
         from thing_info
         <where>
             and del_flag = 'N'
+            <if test="record.landMarkFlag != null and !&quot;&quot;.equals(record.landMarkFlag)">
+                and (area_id is null or area_id = '')
+            </if>
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
                 and id in (${record.idStr})
             </if>
@@ -518,6 +521,9 @@
         from thing_info
         <where>
             and del_flag = 'N'
+            <if test="landMarkFlag != null and !&quot;&quot;.equals(landMarkFlag)">
+                and (area_id is null or area_id = '')
+            </if>
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>
@@ -677,6 +683,9 @@
         from thing_info
         <where>
             and del_flag = 'N'
+            <if test="landMarkFlag != null and !&quot;&quot;.equals(landMarkFlag)">
+                and (area_id is null or area_id = '')
+            </if>
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>

src/main/java/com/izouma/awesomeadmin/model/LandMark.java

@@ -49,6 +49,10 @@ public class LandMark {
 
     private List<AreaInfo> areaInfoList;
 
+    private List<ThingInfo> thingInfoList;
+
+    private String areaTypeId;
+
 
     //距离、经纬度查询。
     private String distance;
@@ -439,5 +443,21 @@ public class LandMark {
     public void setAdImage(String adImage) {
         this.adImage = adImage;
     }
+
+    public List<ThingInfo> getThingInfoList() {
+        return thingInfoList;
+    }
+
+    public void setThingInfoList(List<ThingInfo> thingInfoList) {
+        this.thingInfoList = thingInfoList;
+    }
+
+    public String getAreaTypeId() {
+        return areaTypeId;
+    }
+
+    public void setAreaTypeId(String areaTypeId) {
+        this.areaTypeId = areaTypeId;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/LandmarkType.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class LandmarkType{
+public class LandmarkType {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -22,143 +23,164 @@ public class LandmarkType{
     private String remark;
     private String power;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private List<AreaInfo> areaInfoList;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getTypeFlag(){
+
+    public String getTypeFlag() {
         return this.typeFlag;
     }
 
-    public void setTypeFlag(String typeFlag){
+    public void setTypeFlag(String typeFlag) {
         this.typeFlag = typeFlag;
     }
-    public String getTypeName(){
+
+    public String getTypeName() {
         return this.typeName;
     }
 
-    public void setTypeName(String typeName){
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-    public String getAreaName(){
+
+    public String getAreaName() {
         return this.areaName;
     }
 
-    public void setAreaName(String areaName){
+    public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
-    public String getThingName(){
+
+    public String getThingName() {
         return this.thingName;
     }
 
-    public void setThingName(String thingName){
+    public void setThingName(String thingName) {
         this.thingName = thingName;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public List<AreaInfo> getAreaInfoList() {
+        return areaInfoList;
+    }
 
+    public void setAreaInfoList(List<AreaInfo> areaInfoList) {
+        this.areaInfoList = areaInfoList;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/ThingInfo.java

@@ -56,6 +56,11 @@ public class ThingInfo {
 
     private AimGroupInfo aimGroupInfo;
 
+    /**
+     * 地标专属标识
+     */
+    private String landMarkFlag;
+
     public Integer getId() {
         return this.id;
     }
@@ -303,5 +308,13 @@ public class ThingInfo {
     public void setOrientation(String orientation) {
         this.orientation = orientation;
     }
+
+    public String getLandMarkFlag() {
+        return landMarkFlag;
+    }
+
+    public void setLandMarkFlag(String landMarkFlag) {
+        this.landMarkFlag = landMarkFlag;
+    }
 }
 

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

@@ -14,6 +14,8 @@ public interface LandMarkService{
 
     List<LandMark> getLandMarkByPage(Page page, LandMark record);
 
+    List<LandMark> getCityLandMarkByPage(Page page, LandMark record);
+
     LandMark getLandMarkById(String id);
 
     LandMark getLandMark(LandMark record);

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

@@ -12,6 +12,8 @@ public interface LandmarkTypeService{
 
     List<LandmarkType> getLandmarkTypeList(LandmarkType record);
 
+    List<LandmarkType> getLandmarkTypeAllAreaList(LandmarkType record);
+
     List<LandmarkType> getLandmarkTypeByPage(Page page, LandmarkType record);
 
     LandmarkType getLandmarkTypeById(String id);

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

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.LandMarkService;
 import com.izouma.awesomeadmin.dao.LandMarkMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class LandMarkServiceImpl implements LandMarkService{
+public class LandMarkServiceImpl implements LandMarkService {
 
     private static Logger logger = Logger.getLogger(LandMarkServiceImpl.class);
 
@@ -27,9 +28,9 @@ public class LandMarkServiceImpl implements LandMarkService{
         logger.info("getLandMarkList");
         try {
 
-        return landMarkMapper.queryAllLandMark(record);
+            return landMarkMapper.queryAllLandMark(record);
         } catch (Exception e) {
-        logger.error("getLandMarkList", e);
+            logger.error("getLandMarkList", e);
         }
 
         return null;
@@ -41,9 +42,9 @@ public class LandMarkServiceImpl implements LandMarkService{
         logger.info("getLandMarkChildList");
         try {
 
-        return landMarkMapper.queryAllLandMarkChild(record);
+            return landMarkMapper.queryAllLandMarkChild(record);
         } catch (Exception e) {
-        logger.error("getLandMarkChildList", e);
+            logger.error("getLandMarkChildList", e);
         }
 
         return null;
@@ -55,13 +56,31 @@ public class LandMarkServiceImpl implements LandMarkService{
         logger.info("getLandMarkByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return landMarkMapper.queryLandMarkByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getLandMarkByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<LandMark> getCityLandMarkByPage(Page page, LandMark record) {
+
+        logger.info("getCityLandMarkByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return landMarkMapper.queryLandMarkByPage(parameter);
+            return landMarkMapper.queryCityLandMarkByPage(parameter);
         } catch (Exception e) {
-        logger.error("getLandMarkByPage", e);
+            logger.error("getCityLandMarkByPage", e);
         }
 
         return null;
@@ -75,7 +94,7 @@ public class LandMarkServiceImpl implements LandMarkService{
 
             return landMarkMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getLandMarkById", e);
+            logger.error("getLandMarkById", e);
         }
 
         return null;
@@ -89,7 +108,7 @@ public class LandMarkServiceImpl implements LandMarkService{
 
             return landMarkMapper.queryLandMark(record);
         } catch (Exception e) {
-        logger.error("getLandMark", e);
+            logger.error("getLandMark", e);
         }
 
         return null;
@@ -103,7 +122,7 @@ public class LandMarkServiceImpl implements LandMarkService{
 
             return landMarkMapper.queryLandMarkMapInfo(record);
         } catch (Exception e) {
-        logger.error("getLandMarkMapInfo", e);
+            logger.error("getLandMarkMapInfo", e);
         }
 
         return null;
@@ -118,7 +137,7 @@ public class LandMarkServiceImpl implements LandMarkService{
             int updates = landMarkMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createLandMark", e);
@@ -133,13 +152,13 @@ public class LandMarkServiceImpl implements LandMarkService{
         logger.info("deleteLandMark");
         try {
 
-             int updates = landMarkMapper.delete(record);
+            int updates = landMarkMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteLandMark", e);
+            logger.error("deleteLandMark", e);
         }
 
         return false;
@@ -154,10 +173,10 @@ public class LandMarkServiceImpl implements LandMarkService{
             int updates = landMarkMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateLandMark", e);
+            logger.error("updateLandMark", e);
         }
 
         return false;

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

@@ -35,6 +35,19 @@ public class LandmarkTypeServiceImpl implements LandmarkTypeService{
         return null;
     }
     @Override
+    public List<LandmarkType> getLandmarkTypeAllAreaList(LandmarkType record) {
+
+        logger.info("getLandmarkTypeAllAreaList");
+        try {
+
+        return landmarkTypeMapper.queryAllLandmarkTypeAllArea(record);
+        } catch (Exception e) {
+        logger.error("getLandmarkTypeAllAreaList", e);
+        }
+
+        return null;
+    }
+    @Override
     public List<LandmarkType> getLandmarkTypeByPage(Page page, LandmarkType record) {
 
         logger.info("getLandmarkTypeByPage");

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

@@ -90,11 +90,11 @@ public class LandMarkController {
     public Result pageByCity(Page page, LandMark record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<LandMark> pp = landMarkService.getLandMarkByPage(page, record);
+        List<LandMark> pp = landMarkService.getCityLandMarkByPage(page, record);
 
         if (pp.isEmpty()) {
             record.setOwnedCityId(null);
-            pp = landMarkService.getLandMarkByPage(page, record);
+            pp = landMarkService.getCityLandMarkByPage(page, record);
         }
 
         result.put(AppConstant.PAGE, page);

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

@@ -38,6 +38,13 @@ public class LandmarkTypeController {
         return new Result(true, pp);
     }
 
+    @RequestMapping(value = "/allArea", method = RequestMethod.GET)
+    @ResponseBody
+    public Result allArea(LandmarkType record) {
+        List<LandmarkType> pp = landmarkTypeService.getLandmarkTypeAllAreaList(record);
+        return new Result(true, pp);
+    }
+
     /**
     * <p>根据Id。</p>
     */

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

@@ -109,7 +109,7 @@
 
             <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="290">
+            <el-table-column label="操作" align="center" fixed="right" width="220">
                 <template slot-scope="scope">
                     <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
             </el-button>
@@ -119,6 +119,8 @@
             </el-button> -->
                     <el-button @click="$router.push({path:'/areaInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>区域
                     </el-button>
+                    <el-button @click="$router.push({path:'/thingInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>事物
+                    </el-button>
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="drawMapInfo(scope.row)" type="primary" size="mini" plain>地图</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>

src/main/vue/src/pages/ThingInfos.vue

@@ -394,6 +394,7 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
+            landMarkFlag: '',
         }
     },
     computed: {
@@ -423,12 +424,29 @@ export default {
             }
 
             if (this.$route.query.column) {
+                var landMarkIdFlag = false;
+                var areaIdFlag = false;
+
                 var columnList = this.$route.query.column.split(';')
                 columnList.forEach(item => {
                     var tempColumn = item;
                     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                    if (tempColumn.split(',')[1] == 'areaId') {
+                        areaIdFlag = true;
+                    }
+                    if (tempColumn.split(',')[1] == 'landmarkId') {
+                        landMarkIdFlag = true;
+                    }
+
                 })
 
+                if (landMarkIdFlag) {
+                    if (!areaIdFlag) {
+                        this.landMarkFlag = 'Y'
+                        data.landMarkFlag = this.landMarkFlag;
+                    }
+                }
+
             }
 
             this.$http.get({

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.ea59e1e38fa1ee8a37d63bf226a0c282.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d16d2ddf5b6a0e09cec9.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/admin.27a48c5aaf22cf1d84ab.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.e8177142c02d084d23794d38aa76fc35.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.60b737a95d6d4c6df579.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/admin.1318477a1e66a97a3727.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.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d16d2ddf5b6a0e09cec9.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/loginAdmin.c9cb308e894a7cd72b31.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.60b737a95d6d4c6df579.js></script><script type=text/javascript src=/static/js/vendor.631c08d5fc0f22d7ee46.js></script><script type=text/javascript src=/static/js/loginAdmin.c9cb308e894a7cd72b31.js></script></body></html>

src/main/webapp/static/js/81.92e247d936678e569149.js → src/main/webapp/static/js/79.8d530b9dcb550adb7c7a.js

@@ -1 +1 @@
-webpackJsonp([81],{"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([79],{"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}});