20190305

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

@@ -34,6 +34,7 @@
         <result column="power" property="power" jdbcType="VARCHAR"/>
         <result column="area_map_info" property="areaMapInfo" jdbcType="VARCHAR"/>
         <result column="ad_image" property="adImage" jdbcType="VARCHAR"/>
+        <result column="map_angle" property="mapAngle" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -95,6 +96,7 @@
             power,
             area_map_info,
             ad_image,
+            map_angle,
 
         </trim>
     </sql>
@@ -208,6 +210,9 @@
             <if test="adImage!= null">
                 ad_image,
             </if>
+            <if test="mapAngle!= null">
+                map_angle,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -306,6 +311,9 @@
             <if test="adImage != null">
                 #{adImage,jdbcType=VARCHAR},
             </if>
+            <if test="mapAngle != null">
+                #{mapAngle,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandMark">
@@ -407,6 +415,9 @@
             <if test="adImage != null">
                 ad_image = #{adImage,jdbcType=VARCHAR},
             </if>
+            <if test="mapAngle != null">
+                map_angle = #{mapAngle,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

src/main/java/com/izouma/awesomeadmin/model/AreaShowPoint.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 AreaShowPoint{
+public class AreaShowPoint {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -25,164 +26,228 @@ public class AreaShowPoint{
     private String mapY;
     private String mapIndex;
 
-private String idStr;
+    private String longitude;
+    private String latitude;
+
+    private String idStr;
+
+    private String searchKey;
+
+    private LandMark landMark;
 
-private String searchKey;
+    private CityInfo cityInfo;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    private AreaInfo areaInfo;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
 
-    public Integer getId(){
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
+
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    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 getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
-    public String getCityId(){
+
+    public String getCityId() {
         return this.cityId;
     }
 
-    public void setCityId(String cityId){
+    public void setCityId(String cityId) {
         this.cityId = cityId;
     }
-    public String getLandmarkId(){
+
+    public String getLandmarkId() {
         return this.landmarkId;
     }
 
-    public void setLandmarkId(String landmarkId){
+    public void setLandmarkId(String landmarkId) {
         this.landmarkId = landmarkId;
     }
-    public String getAreaId(){
+
+    public String getAreaId() {
         return this.areaId;
     }
 
-    public void setAreaId(String areaId){
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
-    public String getPointName(){
+
+    public String getPointName() {
         return this.pointName;
     }
 
-    public void setPointName(String pointName){
+    public void setPointName(String pointName) {
         this.pointName = pointName;
     }
-    public String getDoorFlag(){
+
+    public String getDoorFlag() {
         return this.doorFlag;
     }
 
-    public void setDoorFlag(String doorFlag){
+    public void setDoorFlag(String doorFlag) {
         this.doorFlag = doorFlag;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getMapX(){
+
+    public String getMapX() {
         return this.mapX;
     }
 
-    public void setMapX(String mapX){
+    public void setMapX(String mapX) {
         this.mapX = mapX;
     }
-    public String getMapY(){
+
+    public String getMapY() {
         return this.mapY;
     }
 
-    public void setMapY(String mapY){
+    public void setMapY(String mapY) {
         this.mapY = mapY;
     }
-    public String getMapIndex(){
+
+    public String getMapIndex() {
         return this.mapIndex;
     }
 
-    public void setMapIndex(String mapIndex){
+    public void setMapIndex(String mapIndex) {
         this.mapIndex = mapIndex;
     }
 
-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 String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public LandMark getLandMark() {
+        return landMark;
+    }
+
+    public void setLandMark(LandMark landMark) {
+        this.landMark = landMark;
+    }
 
+    public CityInfo getCityInfo() {
+        return cityInfo;
+    }
+
+    public void setCityInfo(CityInfo cityInfo) {
+        this.cityInfo = cityInfo;
+    }
+
+    public AreaInfo getAreaInfo() {
+        return areaInfo;
+    }
+
+    public void setAreaInfo(AreaInfo areaInfo) {
+        this.areaInfo = areaInfo;
+    }
 }
 

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

@@ -64,6 +64,8 @@ public class LandMark {
     private String power;
     private String areaMapInfo;
 
+    private String mapAngle;
+
     /**
      * 闪屏广告图片
      */
@@ -459,5 +461,13 @@ public class LandMark {
     public void setAreaTypeId(String areaTypeId) {
         this.areaTypeId = areaTypeId;
     }
+
+    public String getMapAngle() {
+        return mapAngle;
+    }
+
+    public void setMapAngle(String mapAngle) {
+        this.mapAngle = mapAngle;
+    }
 }
 

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

@@ -41,6 +41,23 @@
         <el-form-item prop="mapIndex" label="index">
           <el-input v-model="formData.mapIndex" :disabled="checkSubColumn('mapIndex')" disabled></el-input>
         </el-form-item>
+
+        <el-form-item>
+          <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+
+          <div class="amap-page-container" v-if="mapDialogVisible">
+            <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+          </div>
+        </el-form-item>
+
+        <el-form-item prop="longitude" label="经度">
+          <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
+        </el-form-item>
+
+        <el-form-item prop="latitude" label="纬度">
+          <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
+        </el-form-item>
+
         <el-form-item>
           <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
           <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
@@ -52,12 +69,13 @@
       <el-card style="height:660px;">
         <drug-area :doorFlag='doorFlag' :isAreaShowPoint="true" :areaWidth="areaWidth" :areaHeight="areaHeight" :landmarkId="landmarkId" :areaId="areaId" :mapPointInfo="mapPointInfo" @mapAddition="mapAddition" @subtraction="subtraction" @choosePoint="choosePoint"></drug-area>
       </el-card>
-    </el-aside> 
+    </el-aside>
   </el-container>
 </template>
 <script>
-import formValidator from '../formValidator'
-import drugArea from '../components/DrugArea'
+import formValidator from '../formValidator';
+import drugArea from '../components/DrugArea';
+import CoordinateSelect from '../components/CoordinateSelect';
 
 export default {
   created() {
@@ -91,6 +109,12 @@ export default {
           if (!res.data.mapIndex) {
             res.data.mapIndex = ''
           }
+          if (!res.data.longitude) {
+            res.data.longitude = ''
+          }
+          if (!res.data.lnglat) {
+            res.data.lnglat = ''
+          }
           this.formData = res.data;
           if (this.$route.query.column) {
             var columnList = this.$route.query.column.split(';')
@@ -168,9 +192,11 @@ export default {
     return {
       saving: false,
       formData: {
-        mapX:'',
-        mapY:'',
-        mapIndex:''
+        mapX: '',
+        mapY: '',
+        mapIndex: '',
+        latitude: '',
+        longitude: '',
       },
       rules: {
         pointName:
@@ -185,7 +211,8 @@ export default {
       subValue: '',
       subColumnList: [],
       areaWidth: 1000,
-      areaHeight:1000,
+      areaHeight: 1000,
+      mapDialogVisible: false,
     }
   },
   computed: {
@@ -202,13 +229,13 @@ export default {
     areaId() {
       return Number(this.formData.areaId) || 0
     },
-    doorFlag(){
-        return this.formData.doorFlag
+    doorFlag() {
+      return this.formData.doorFlag
     }
   },
   methods: {
     choosePoint(jsonp) {
-     
+
       this.formData.mapX = jsonp.x;
       this.formData.mapY = jsonp.y;
       this.formData.mapIndex = jsonp.index
@@ -278,9 +305,14 @@ export default {
       }
       return false;
     },
+    coordinateSelected(data) {
+      //this.formData.address = data.formattedAddress;
+      this.formData.latitude = data.lnglat.lat;
+      this.formData.longitude = data.lnglat.lng;
+    },
   },
   components: {
-    drugArea
+    drugArea, CoordinateSelect
   }
 }
 </script>

src/main/vue/src/pages/AreaShowPoints.vue

@@ -33,13 +33,13 @@
             <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('cityId')" prop="cityId" label="城市ID" min-width="100">
+            <el-table-column v-if="isColumnShow('cityId')" prop="cityInfo.cityName" label="城市" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('landmarkId')" prop="landmarkId" label="地标ID" min-width="100">
+            <el-table-column v-if="isColumnShow('landmarkId')" prop="landMark.mapName" label="地标" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('areaId')" prop="areaId" label="区域ID" min-width="100">
+            <el-table-column v-if="isColumnShow('areaId')" prop="areaInfo.areaName" label="区域" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('pointName')" prop="pointName" label="名称" min-width="100">
@@ -223,17 +223,17 @@ export default {
                 {
                     label: 'X',
                     value: 'mapX',
-                    show: true
+                    show: false
                 },
                 {
                     label: 'Y',
                     value: 'mapY',
-                    show: true
+                    show: false
                 },
                 {
                     label: 'index',
                     value: 'mapIndex',
-                    show: true
+                    show: false
                 },
             ],
             multipleMode: false,

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

@@ -15,7 +15,12 @@
               </template>
             </el-form-item>
             <el-form-item prop="defaultMode" label="AR属性">
-              <el-input v-model="formData.defaultMode" :disabled="'defaultMode'==subColumn"></el-input>
+              <template>
+                <el-select v-model="formData.defaultMode" clearable placeholder="请选择" :disabled="'defaultMode'==subColumn">
+                  <el-option v-for="item in defaultModeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </template>
+
             </el-form-item>
             <el-form-item prop="typeId" label="地标类型">
               <template>
@@ -33,13 +38,7 @@
             <el-form-item prop="logeSprite" label="地点Loge图URL">
               <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item>
-              <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
 
-              <div class="amap-page-container" v-if="mapDialogVisible">
-                <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
-              </div>
-            </el-form-item>
             <el-form-item prop="adImage" label="闪屏">
               <single-upload v-model="formData.adImage" :disabled="'adImage'==subColumn"></single-upload>
             </el-form-item>
@@ -63,9 +62,9 @@
               <el-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
             </el-form-item>
 
-            <el-button v-if="!showMore" type="text" @click="showMore=!showMore">高级设置</el-button>
+            <el-button type="text" @click="showMore=!showMore">高级设置</el-button>
 
-            <template v-else>
+            <template v-if="showMore">
               <el-form-item prop="openDescribe" label="营业/开放情况">
                 <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
               </el-form-item>
@@ -84,9 +83,19 @@
               <el-form-item prop="mapRate" label="比率">
                 <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
               </el-form-item>
+
+              <el-form-item>
+                <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+
+                <div class="amap-page-container" v-if="mapDialogVisible">
+                  <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+                </div>
+              </el-form-item>
+
               <el-form-item prop="longitude" label="经度">
                 <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
               </el-form-item>
+
               <el-form-item prop="latitude" label="纬度">
                 <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
               </el-form-item>
@@ -109,6 +118,11 @@
                   </el-select>
                 </template>
               </el-form-item>
+
+              <el-form-item prop="mapAngle" label="地图角度">
+                <el-input v-model="formData.mapAngle"></el-input>
+              </el-form-item>
+
             </template>
 
             <el-form-item>
@@ -254,6 +268,8 @@ export default {
         longitude: 118.79647,
         typeId: '',
         keyword: [],
+        mapAngle: 0,
+        defaultMode: 1,
       },
       rules: {
       },
@@ -264,7 +280,19 @@ export default {
       subValue: '',
       mapDialogVisible: false,
       tabVal: "1",
-      showMore:false,
+      showMore: false,
+
+      defaultModeOptions: [{
+        value: 1,
+        label: 'ARkit/core'
+      }, {
+        value: 2,
+        label: '陀螺仪'
+      }, {
+        value: 3,
+        label: 'LBS'
+      }],
+
     }
   },
   computed: {