业务接口

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

@@ -29,5 +29,7 @@ public interface AimPlacePositionMapper{
     AimPlacePosition queryAimPlacePosition(AimPlacePosition record);
 
     List<AimPlacePosition> query(AimPlacePosition record);
+
+    List<AimPlacePosition> queryAllAimPlacePositionChild(AimPlacePosition record);
 }
 

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

@@ -32,5 +32,7 @@ public interface LandMarkMapper {
     List<LandMark> query(LandMark record);
 
     LandMark queryLandMarkMapInfo(LandMark record);
+
+    List<LandMark> queryAllLandMarkChild(LandMark record);
 }
 

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

@@ -514,6 +514,24 @@
 
             </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
 
@@ -679,6 +697,176 @@
                 </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="queryAllLandMarkChild" parameterType="java.util.Map"
+            resultMap="LandMarkChildResultMap">
+        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="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
+                and front_level_id = #{frontLevelId}
+            </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},'%')
+                </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
@@ -924,5 +1112,14 @@
         </collection>
     </resultMap>
 
+    <resultMap id="LandMarkChildResultMap" type="com.izouma.awesomeadmin.model.LandMark" extends="BaseResultMap">
+
+
+        <collection property="landMarkChildList" ofType="com.izouma.awesomeadmin.model.LandMark"
+                    select="com.izouma.awesomeadmin.dao.LandMarkMapper.queryAllLandMarkChild"
+                    column="{frontLevelId = id}">
+        </collection>
+    </resultMap>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/model/AimPlaceContent.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 AimPlaceContent{
+public class AimPlaceContent {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -38,255 +39,292 @@ public class AimPlaceContent{
     private String remark5;
     private String remark6;
 
-private String idStr;
+    private List<AimPlaceContentChild> aimPlaceContentChildList;
+
+    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;
 
-    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 getName(){
+
+    public String getName() {
         return this.name;
     }
 
-    public void setName(String name){
+    public void setName(String name) {
         this.name = name;
     }
-    public String getType(){
+
+    public String getType() {
         return this.type;
     }
 
-    public void setType(String type){
+    public void setType(String type) {
         this.type = type;
     }
-    public String getOwnedLandMarkId(){
+
+    public String getOwnedLandMarkId() {
         return this.ownedLandMarkId;
     }
 
-    public void setOwnedLandMarkId(String ownedLandMarkId){
+    public void setOwnedLandMarkId(String ownedLandMarkId) {
         this.ownedLandMarkId = ownedLandMarkId;
     }
-    public String getArContentGroupId(){
+
+    public String getArContentGroupId() {
         return this.arContentGroupId;
     }
 
-    public void setArContentGroupId(String arContentGroupId){
+    public void setArContentGroupId(String arContentGroupId) {
         this.arContentGroupId = arContentGroupId;
     }
-    public String getArKitPosX(){
+
+    public String getArKitPosX() {
         return this.arKitPosX;
     }
 
-    public void setArKitPosX(String arKitPosX){
+    public void setArKitPosX(String arKitPosX) {
         this.arKitPosX = arKitPosX;
     }
-    public String getArKitPosY(){
+
+    public String getArKitPosY() {
         return this.arKitPosY;
     }
 
-    public void setArKitPosY(String arKitPosY){
+    public void setArKitPosY(String arKitPosY) {
         this.arKitPosY = arKitPosY;
     }
-    public String getArKitPosZ(){
+
+    public String getArKitPosZ() {
         return this.arKitPosZ;
     }
 
-    public void setArKitPosZ(String arKitPosZ){
+    public void setArKitPosZ(String arKitPosZ) {
         this.arKitPosZ = arKitPosZ;
     }
-    public String getArKitScale(){
+
+    public String getArKitScale() {
         return this.arKitScale;
     }
 
-    public void setArKitScale(String arKitScale){
+    public void setArKitScale(String arKitScale) {
         this.arKitScale = arKitScale;
     }
-    public String getArKitAngle(){
+
+    public String getArKitAngle() {
         return this.arKitAngle;
     }
 
-    public void setArKitAngle(String arKitAngle){
+    public void setArKitAngle(String arKitAngle) {
         this.arKitAngle = arKitAngle;
     }
-    public String getArKitShowLenth(){
+
+    public String getArKitShowLenth() {
         return this.arKitShowLenth;
     }
 
-    public void setArKitShowLenth(String arKitShowLenth){
+    public void setArKitShowLenth(String arKitShowLenth) {
         this.arKitShowLenth = arKitShowLenth;
     }
-    public String getGyroPosX(){
+
+    public String getGyroPosX() {
         return this.gyroPosX;
     }
 
-    public void setGyroPosX(String gyroPosX){
+    public void setGyroPosX(String gyroPosX) {
         this.gyroPosX = gyroPosX;
     }
-    public String getGyroPosY(){
+
+    public String getGyroPosY() {
         return this.gyroPosY;
     }
 
-    public void setGyroPosY(String gyroPosY){
+    public void setGyroPosY(String gyroPosY) {
         this.gyroPosY = gyroPosY;
     }
-    public String getGyroPosZ(){
+
+    public String getGyroPosZ() {
         return this.gyroPosZ;
     }
 
-    public void setGyroPosZ(String gyroPosZ){
+    public void setGyroPosZ(String gyroPosZ) {
         this.gyroPosZ = gyroPosZ;
     }
-    public String getGyroPosScale(){
+
+    public String getGyroPosScale() {
         return this.gyroPosScale;
     }
 
-    public void setGyroPosScale(String gyroPosScale){
+    public void setGyroPosScale(String gyroPosScale) {
         this.gyroPosScale = gyroPosScale;
     }
-    public String getGyroPosAngle(){
+
+    public String getGyroPosAngle() {
         return this.gyroPosAngle;
     }
 
-    public void setGyroPosAngle(String gyroPosAngle){
+    public void setGyroPosAngle(String gyroPosAngle) {
         this.gyroPosAngle = gyroPosAngle;
     }
-    public String getGyroPosShowLenth(){
+
+    public String getGyroPosShowLenth() {
         return this.gyroPosShowLenth;
     }
 
-    public void setGyroPosShowLenth(String gyroPosShowLenth){
+    public void setGyroPosShowLenth(String gyroPosShowLenth) {
         this.gyroPosShowLenth = gyroPosShowLenth;
     }
-    public String getVuforiaImageInfoAreaMarking(){
+
+    public String getVuforiaImageInfoAreaMarking() {
         return this.vuforiaImageInfoAreaMarking;
     }
 
-    public void setVuforiaImageInfoAreaMarking(String vuforiaImageInfoAreaMarking){
+    public void setVuforiaImageInfoAreaMarking(String vuforiaImageInfoAreaMarking) {
         this.vuforiaImageInfoAreaMarking = vuforiaImageInfoAreaMarking;
     }
-    public String getRemark1(){
+
+    public String getRemark1() {
         return this.remark1;
     }
 
-    public void setRemark1(String remark1){
+    public void setRemark1(String remark1) {
         this.remark1 = remark1;
     }
-    public String getRemark2(){
+
+    public String getRemark2() {
         return this.remark2;
     }
 
-    public void setRemark2(String remark2){
+    public void setRemark2(String remark2) {
         this.remark2 = remark2;
     }
-    public String getRemark3(){
+
+    public String getRemark3() {
         return this.remark3;
     }
 
-    public void setRemark3(String remark3){
+    public void setRemark3(String remark3) {
         this.remark3 = remark3;
     }
-    public String getRemark4(){
+
+    public String getRemark4() {
         return this.remark4;
     }
 
-    public void setRemark4(String remark4){
+    public void setRemark4(String remark4) {
         this.remark4 = remark4;
     }
-    public String getRemark5(){
+
+    public String getRemark5() {
         return this.remark5;
     }
 
-    public void setRemark5(String remark5){
+    public void setRemark5(String remark5) {
         this.remark5 = remark5;
     }
-    public String getRemark6(){
+
+    public String getRemark6() {
         return this.remark6;
     }
 
-    public void setRemark6(String remark6){
+    public void setRemark6(String remark6) {
         this.remark6 = remark6;
     }
 
-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<AimPlaceContentChild> getAimPlaceContentChildList() {
+        return aimPlaceContentChildList;
+    }
+
+    public void setAimPlaceContentChildList(List<AimPlaceContentChild> aimPlaceContentChildList) {
+        this.aimPlaceContentChildList = aimPlaceContentChildList;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/AimPlacePosition.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 AimPlacePosition{
+public class AimPlacePosition {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -25,164 +26,188 @@ public class AimPlacePosition{
     private String frontLevelId;
     private String ownedLandMarkId;
 
-private String idStr;
+    private List<AimPlacePosition> aimPlacePositionChildList;
+
+    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;
 
-    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 getName(){
+
+    public String getName() {
         return this.name;
     }
 
-    public void setName(String name){
+    public void setName(String name) {
         this.name = name;
     }
-    public String getType(){
+
+    public String getType() {
         return this.type;
     }
 
-    public void setType(String type){
+    public void setType(String type) {
         this.type = type;
     }
-    public String getPosX(){
+
+    public String getPosX() {
         return this.posX;
     }
 
-    public void setPosX(String posX){
+    public void setPosX(String posX) {
         this.posX = posX;
     }
-    public String getPosY(){
+
+    public String getPosY() {
         return this.posY;
     }
 
-    public void setPosY(String posY){
+    public void setPosY(String posY) {
         this.posY = posY;
     }
-    public String getPosZ(){
+
+    public String getPosZ() {
         return this.posZ;
     }
 
-    public void setPosZ(String posZ){
+    public void setPosZ(String posZ) {
         this.posZ = posZ;
     }
-    public String getRemark1(){
+
+    public String getRemark1() {
         return this.remark1;
     }
 
-    public void setRemark1(String remark1){
+    public void setRemark1(String remark1) {
         this.remark1 = remark1;
     }
-    public String getRemark2(){
+
+    public String getRemark2() {
         return this.remark2;
     }
 
-    public void setRemark2(String remark2){
+    public void setRemark2(String remark2) {
         this.remark2 = remark2;
     }
-    public String getRemark3(){
+
+    public String getRemark3() {
         return this.remark3;
     }
 
-    public void setRemark3(String remark3){
+    public void setRemark3(String remark3) {
         this.remark3 = remark3;
     }
-    public String getFrontLevelId(){
+
+    public String getFrontLevelId() {
         return this.frontLevelId;
     }
 
-    public void setFrontLevelId(String frontLevelId){
+    public void setFrontLevelId(String frontLevelId) {
         this.frontLevelId = frontLevelId;
     }
-    public String getOwnedLandMarkId(){
+
+    public String getOwnedLandMarkId() {
         return this.ownedLandMarkId;
     }
 
-    public void setOwnedLandMarkId(String ownedLandMarkId){
+    public void setOwnedLandMarkId(String ownedLandMarkId) {
         this.ownedLandMarkId = ownedLandMarkId;
     }
 
-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<AimPlacePosition> getAimPlacePositionChildList() {
+        return aimPlacePositionChildList;
+    }
 
+    public void setAimPlacePositionChildList(List<AimPlacePosition> aimPlacePositionChildList) {
+        this.aimPlacePositionChildList = aimPlacePositionChildList;
+    }
 }
 

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

@@ -45,6 +45,14 @@ public class LandMark {
 
     private List<AimPlacePosition> aimPlacePositionList;
 
+    private List<LandMark> landMarkChildList;
+
+
+    //距离、经纬度查询。
+    private String distance;
+    private String lngKey;
+    private String latKey;
+
 
     private String idStr;
 
@@ -339,5 +347,37 @@ public class LandMark {
     public void setAimPlacePositionList(List<AimPlacePosition> aimPlacePositionList) {
         this.aimPlacePositionList = aimPlacePositionList;
     }
+
+    public List<LandMark> getLandMarkChildList() {
+        return landMarkChildList;
+    }
+
+    public void setLandMarkChildList(List<LandMark> landMarkChildList) {
+        this.landMarkChildList = landMarkChildList;
+    }
+
+    public String getDistance() {
+        return distance;
+    }
+
+    public void setDistance(String distance) {
+        this.distance = distance;
+    }
+
+    public String getLngKey() {
+        return lngKey;
+    }
+
+    public void setLngKey(String lngKey) {
+        this.lngKey = lngKey;
+    }
+
+    public String getLatKey() {
+        return latKey;
+    }
+
+    public void setLatKey(String latKey) {
+        this.latKey = latKey;
+    }
 }
 

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

@@ -23,5 +23,7 @@ public interface AimPlacePositionService{
     boolean deleteAimPlacePosition(AimPlacePosition record);
 
     boolean updateAimPlacePosition(AimPlacePosition record);
+
+    List<AimPlacePosition> getAimPlacePositionChildList(AimPlacePosition record);
 }
 

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

@@ -25,5 +25,7 @@ public interface LandMarkService{
     boolean updateLandMark(LandMark record);
 
     LandMark getLandMarkMapInfo(LandMark record);
+
+    List<LandMark> getLandMarkChildList(LandMark record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/AimPlacePositionServiceImpl.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.AimPlacePositionService;
 import com.izouma.awesomeadmin.dao.AimPlacePositionMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class AimPlacePositionServiceImpl implements AimPlacePositionService{
+public class AimPlacePositionServiceImpl implements AimPlacePositionService {
 
     private static Logger logger = Logger.getLogger(AimPlacePositionServiceImpl.class);
 
@@ -27,26 +28,41 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
         logger.info("getAimPlacePositionList");
         try {
 
-        return aimPlacePositionMapper.queryAllAimPlacePosition(record);
+            return aimPlacePositionMapper.queryAllAimPlacePosition(record);
+        } catch (Exception e) {
+            logger.error("getAimPlacePositionList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<AimPlacePosition> getAimPlacePositionChildList(AimPlacePosition record) {
+
+        logger.info("getAimPlacePositionChildList");
+        try {
+
+            return aimPlacePositionMapper.queryAllAimPlacePositionChild(record);
         } catch (Exception e) {
-        logger.error("getAimPlacePositionList", e);
+            logger.error("getAimPlacePositionChildList", e);
         }
 
         return null;
     }
+
     @Override
     public List<AimPlacePosition> getAimPlacePositionByPage(Page page, AimPlacePosition record) {
 
         logger.info("getAimPlacePositionByPage");
         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 aimPlacePositionMapper.queryAimPlacePositionByPage(parameter);
+            return aimPlacePositionMapper.queryAimPlacePositionByPage(parameter);
         } catch (Exception e) {
-        logger.error("getAimPlacePositionByPage", e);
+            logger.error("getAimPlacePositionByPage", e);
         }
 
         return null;
@@ -60,7 +76,7 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
 
             return aimPlacePositionMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getAimPlacePositionById", e);
+            logger.error("getAimPlacePositionById", e);
         }
 
         return null;
@@ -74,7 +90,7 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
 
             return aimPlacePositionMapper.queryAimPlacePosition(record);
         } catch (Exception e) {
-        logger.error("getAimPlacePosition", e);
+            logger.error("getAimPlacePosition", e);
         }
 
         return null;
@@ -89,7 +105,7 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
             int updates = aimPlacePositionMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createAimPlacePosition", e);
@@ -104,13 +120,13 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
         logger.info("deleteAimPlacePosition");
         try {
 
-             int updates = aimPlacePositionMapper.delete(record);
+            int updates = aimPlacePositionMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteAimPlacePosition", e);
+            logger.error("deleteAimPlacePosition", e);
         }
 
         return false;
@@ -125,10 +141,10 @@ public class AimPlacePositionServiceImpl implements AimPlacePositionService{
             int updates = aimPlacePositionMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateAimPlacePosition", e);
+            logger.error("updateAimPlacePosition", e);
         }
 
         return false;

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

@@ -34,6 +34,21 @@ public class LandMarkServiceImpl implements LandMarkService{
 
         return null;
     }
+
+    @Override
+    public List<LandMark> getLandMarkChildList(LandMark record) {
+
+        logger.info("getLandMarkChildList");
+        try {
+
+        return landMarkMapper.queryAllLandMarkChild(record);
+        } catch (Exception e) {
+        logger.error("getLandMarkChildList", e);
+        }
+
+        return null;
+    }
+
     @Override
     public List<LandMark> getLandMarkByPage(Page page, LandMark record) {
 

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

@@ -30,7 +30,6 @@ public class AimPlaceContentController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(AimPlaceContent record) {

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

@@ -30,7 +30,6 @@ public class AimPlacePositionController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(AimPlacePosition record) {
@@ -38,6 +37,14 @@ public class AimPlacePositionController {
         return new Result(true, pp);
     }
 
+    @RequestMapping(value = "/child", method = RequestMethod.GET)
+    @ResponseBody
+    public Result child(AimPlacePosition record) {
+        List<AimPlacePosition> pp = aimPlacePositionService.getAimPlacePositionChildList(record);
+        return new Result(true, pp);
+    }
+
+
     /**
     * <p>根据Id。</p>
     */

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

@@ -30,7 +30,6 @@ public class ArContentController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(ArContent record) {

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

@@ -30,7 +30,6 @@ public class LandMarkController {
     /**
      * <p>获取全部记录。</p>
      */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(LandMark record) {
@@ -104,6 +103,14 @@ public class LandMarkController {
     }
 
 
+    @RequestMapping(value = "/child", method = RequestMethod.GET)
+    @ResponseBody
+    public Result child(LandMark record) {
+        List<LandMark> pp = landMarkService.getLandMarkChildList(record);
+        return new Result(true, pp);
+    }
+
+
     /**
      * <p>保存。</p>
      */

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

@@ -30,7 +30,6 @@ public class VuforiaImageInfoController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(VuforiaImageInfo record) {

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

@@ -20,19 +20,10 @@
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arContentGroupId" label="AR内容组ID">
-                <template>
-                    <el-select v-model="formData.arContentGroupId" clearable  placeholder="请选择" :disabled="'arContentGroupId'==subColumn">
-                        <el-option
-                                v-for="item in arContentGroupIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
+                                                                                                                                                                                                                        <el-form-item prop="arContentGroupId" label="AR内容组ID">
+                <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="arKitPosX" label="ArKit坐标X">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitPosX" label="ArKit坐标X">
                 <el-input v-model="formData.arKitPosX" :disabled="'arKitPosX'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="arKitPosY" label="ArKit坐标Y">
@@ -145,22 +136,7 @@
                         }
                         }
                         });
-                                                                                    
-
-
-                        this.$http.get({
-                        url:'/arContent/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.arContentGroupIdOptions.push({label: item.name, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
         data() {
             return {
                 saving: false,
@@ -168,8 +144,7 @@
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 },
                                                                                         ownedLandMarkIdOptions:[],
-                                            arContentGroupIdOptions:[],
-                                                                                                                                                                                        subColumn: '',
+                                                                                                                                                                                                subColumn: '',
             subValue: '',
         }
         },

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

@@ -44,19 +44,10 @@
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arContentGroupId" label="AR内容组ID">
-                <template>
-                    <el-select v-model="formData.arContentGroupId" clearable  placeholder="请选择" :disabled="'arContentGroupId'==subColumn">
-                        <el-option
-                                v-for="item in arContentGroupIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
+                                                                                                                                                                                                                        <el-form-item prop="arContentGroupId" label="AR内容组ID">
+                <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="posX" label="坐标X">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posX" label="坐标X">
                 <el-input v-model="formData.posX" :disabled="'posX'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="posY" label="坐标Y">
@@ -166,22 +157,7 @@
                         }
                         }
                         });
-                                                                                    
-
-
-                        this.$http.get({
-                        url:'/arContent/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.arContentGroupIdOptions.push({label: item.name, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                                                                                                                    },
         data() {
             return {
                 saving: false,
@@ -191,8 +167,7 @@
                                                                         vuforiaImageGroupIdOptions:[],
                                                     vuforiaImageTypeIdOptions:[],
                                                     landMarkIdOptions:[],
-                                            arContentGroupIdOptions:[],
-                                                                                                subColumn: '',
+                                                                                                        subColumn: '',
             subValue: '',
         }
         },