landmark

src/main/java/com/izouma/awesomeadmin/constant/RongConstant.java

@@ -11,7 +11,7 @@ public interface RongConstant {
     /**
      * 验证码模板
      */
-    String VERIFY_TEMPLATEID = "3rmDMeOnAYPbM-iZuGb3zW";
+    String VERIFY_TEMPLATEID = "fMsDXJ0Y4pCbrtN4a66JGx";
 
     /**
      * 通知模板

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.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.LandMark;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.LandMarkMapper")
-public interface LandMarkMapper{
+public interface LandMarkMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -29,5 +30,7 @@ public interface LandMarkMapper{
     LandMark queryLandMark(LandMark record);
 
     List<LandMark> query(LandMark record);
+
+    LandMark queryLandMarkMapInfo(LandMark record);
 }
 

src/main/java/com/izouma/awesomeadmin/model/LandMark.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 LandMark{
+public class LandMark {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -15,7 +16,7 @@ public class LandMark{
     private Date createTime;
     private String createUser;
     private String mapName;
-    private Integer ownedCotyId;
+    private Integer ownedCityId;
     private String mapSprite;
     private String logeSprite;
     private String openDescribe;
@@ -36,241 +37,307 @@ public class LandMark{
     private String remark3;
     private String frontLevelId;
 
-private String idStr;
+    private VuforiaImageGroup vuforiaImageGroup;
+
+    private List<VuforiaImageInfo> vuforiaImageInfoList;
+
+    private List<AimPlaceContent> aimPlaceContentList;
+
+    private List<AimPlacePosition> aimPlacePositionList;
 
-private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    private String idStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private String searchKey;
 
-    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 getMapName(){
+
+    public String getMapName() {
         return this.mapName;
     }
 
-    public void setMapName(String mapName){
+    public void setMapName(String mapName) {
         this.mapName = mapName;
     }
-    public Integer getOwnedCotyId(){
-        return this.ownedCotyId;
+
+    public Integer getOwnedCityId() {
+        return this.ownedCityId;
     }
 
-    public void setOwnedCotyId(Integer ownedCotyId){
-        this.ownedCotyId = ownedCotyId;
+    public void setOwnedCityId(Integer ownedCityId) {
+        this.ownedCityId = ownedCityId;
     }
-    public String getMapSprite(){
+
+    public String getMapSprite() {
         return this.mapSprite;
     }
 
-    public void setMapSprite(String mapSprite){
+    public void setMapSprite(String mapSprite) {
         this.mapSprite = mapSprite;
     }
-    public String getLogeSprite(){
+
+    public String getLogeSprite() {
         return this.logeSprite;
     }
 
-    public void setLogeSprite(String logeSprite){
+    public void setLogeSprite(String logeSprite) {
         this.logeSprite = logeSprite;
     }
-    public String getOpenDescribe(){
+
+    public String getOpenDescribe() {
         return this.openDescribe;
     }
 
-    public void setOpenDescribe(String openDescribe){
+    public void setOpenDescribe(String openDescribe) {
         this.openDescribe = openDescribe;
     }
-    public String getMarkDescribe(){
+
+    public String getMarkDescribe() {
         return this.markDescribe;
     }
 
-    public void setMarkDescribe(String markDescribe){
+    public void setMarkDescribe(String markDescribe) {
         this.markDescribe = markDescribe;
     }
-    public String getAnchorImageGroupName(){
+
+    public String getAnchorImageGroupName() {
         return this.anchorImageGroupName;
     }
 
-    public void setAnchorImageGroupName(String anchorImageGroupName){
+    public void setAnchorImageGroupName(String anchorImageGroupName) {
         this.anchorImageGroupName = anchorImageGroupName;
     }
-    public Integer getDefaultMode(){
+
+    public Integer getDefaultMode() {
         return this.defaultMode;
     }
 
-    public void setDefaultMode(Integer defaultMode){
+    public void setDefaultMode(Integer defaultMode) {
         this.defaultMode = defaultMode;
     }
-    public Integer getVuforiaImageGroupId(){
+
+    public Integer getVuforiaImageGroupId() {
         return this.vuforiaImageGroupId;
     }
 
-    public void setVuforiaImageGroupId(Integer vuforiaImageGroupId){
+    public void setVuforiaImageGroupId(Integer vuforiaImageGroupId) {
         this.vuforiaImageGroupId = vuforiaImageGroupId;
     }
-    public String getVuforiaDataName(){
+
+    public String getVuforiaDataName() {
         return this.vuforiaDataName;
     }
 
-    public void setVuforiaDataName(String vuforiaDataName){
+    public void setVuforiaDataName(String vuforiaDataName) {
         this.vuforiaDataName = vuforiaDataName;
     }
-    public String getMapInfo(){
+
+    public String getMapInfo() {
         return this.mapInfo;
     }
 
-    public void setMapInfo(String mapInfo){
+    public void setMapInfo(String mapInfo) {
         this.mapInfo = mapInfo;
     }
-    public String getMapWidth(){
+
+    public String getMapWidth() {
         return this.mapWidth;
     }
 
-    public void setMapWidth(String mapWidth){
+    public void setMapWidth(String mapWidth) {
         this.mapWidth = mapWidth;
     }
-    public String getMapHeight(){
+
+    public String getMapHeight() {
         return this.mapHeight;
     }
 
-    public void setMapHeight(String mapHeight){
+    public void setMapHeight(String mapHeight) {
         this.mapHeight = mapHeight;
     }
-    public String getMapRate(){
+
+    public String getMapRate() {
         return this.mapRate;
     }
 
-    public void setMapRate(String mapRate){
+    public void setMapRate(String mapRate) {
         this.mapRate = mapRate;
     }
-    public String getShowInPanel(){
+
+    public String getShowInPanel() {
         return this.showInPanel;
     }
 
-    public void setShowInPanel(String showInPanel){
+    public void setShowInPanel(String showInPanel) {
         this.showInPanel = showInPanel;
     }
-    public String getLongitude(){
+
+    public String getLongitude() {
         return this.longitude;
     }
 
-    public void setLongitude(String longitude){
+    public void setLongitude(String longitude) {
         this.longitude = longitude;
     }
-    public String getLatitude(){
+
+    public String getLatitude() {
         return this.latitude;
     }
 
-    public void setLatitude(String latitude){
+    public void setLatitude(String latitude) {
         this.latitude = latitude;
     }
-    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 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 VuforiaImageGroup getVuforiaImageGroup() {
+        return vuforiaImageGroup;
+    }
+
+    public void setVuforiaImageGroup(VuforiaImageGroup vuforiaImageGroup) {
+        this.vuforiaImageGroup = vuforiaImageGroup;
+    }
+
+    public List<VuforiaImageInfo> getVuforiaImageInfoList() {
+        return vuforiaImageInfoList;
+    }
+
+    public void setVuforiaImageInfoList(List<VuforiaImageInfo> vuforiaImageInfoList) {
+        this.vuforiaImageInfoList = vuforiaImageInfoList;
+    }
+
+    public List<AimPlaceContent> getAimPlaceContentList() {
+        return aimPlaceContentList;
+    }
+
+    public void setAimPlaceContentList(List<AimPlaceContent> aimPlaceContentList) {
+        this.aimPlaceContentList = aimPlaceContentList;
+    }
+
+    public List<AimPlacePosition> getAimPlacePositionList() {
+        return aimPlacePositionList;
+    }
+
+    public void setAimPlacePositionList(List<AimPlacePosition> aimPlacePositionList) {
+        this.aimPlacePositionList = aimPlacePositionList;
+    }
 }
 

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

@@ -23,5 +23,7 @@ public interface LandMarkService{
     boolean deleteLandMark(LandMark record);
 
     boolean updateLandMark(LandMark record);
+
+    LandMark getLandMarkMapInfo(LandMark record);
 }
 

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

@@ -80,6 +80,20 @@ public class LandMarkServiceImpl implements LandMarkService{
         return null;
     }
 
+    @Override
+    public LandMark getLandMarkMapInfo(LandMark record) {
+
+        logger.info("getLandMarkMapInfo");
+        try {
+
+            return landMarkMapper.queryLandMarkMapInfo(record);
+        } catch (Exception e) {
+        logger.error("getLandMarkMapInfo", e);
+        }
+
+        return null;
+    }
+
     @Override
     public boolean createLandMark(LandMark record) {
 

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

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/landMark")
 public class LandMarkController {
@@ -28,8 +28,8 @@ public class LandMarkController {
     private LandMarkService landMarkService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class LandMarkController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getLandMark", method = RequestMethod.GET)
     @ResponseBody
     public Result getLandMark(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class LandMarkController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(LandMark record) {
@@ -59,15 +59,44 @@ public class LandMarkController {
     }
 
 
+    @RequestMapping(value = "/mapInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result mapInfo(LandMark record) {
+        LandMark data = landMarkService.getLandMarkMapInfo(record);
+        return new Result(true, data);
+    }
+
+
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, LandMark record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<LandMark> pp =landMarkService.getLandMarkByPage(page, record);
+        List<LandMark> pp = landMarkService.getLandMarkByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+     * <p>分页查询。本城市没有则显示其他城市的</p>
+     */
+    @RequestMapping(value = "/pageByCity", method = RequestMethod.GET)
+    @ResponseBody
+    public Result pageByCity(Page page, LandMark record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<LandMark> pp = landMarkService.getLandMarkByPage(page, record);
+
+        if (pp.isEmpty()) {
+            record.setOwnedCityId(null);
+            pp = landMarkService.getLandMarkByPage(page, record);
+        }
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,103 +105,104 @@ public class LandMarkController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(LandMark record) {
         boolean num = landMarkService.createLandMark(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateLandMark(LandMark record) {
         boolean num = landMarkService.updateLandMark(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteLandMark(LandMark record) {
 
         boolean num = landMarkService.deleteLandMark(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, LandMark record) throws Exception {
 
-    List<LandMark> landMarks = landMarkService.getLandMarkList(record);
+        List<LandMark> landMarks = landMarkService.getLandMarkList(record);
 
 
         String sheetName = "land_mark";
         String titleName = "地标信息数据表";
         String fileName = "地标信息表";
         int columnNumber = 27;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "地标名称" ,   "所属城市Id" ,   "缩略图" ,   "地点Loge图" ,   "营业/开放情况" ,   "地标简介" ,   "识别图组名称" ,   "模式" ,   "识别图集ID" ,   "识别图集数据名称" ,   "地图信息" ,   "地图宽" ,   "地图高" ,   "比率" ,   "是否显示" ,   "经度" ,   "纬度" ,   "备注1" ,   "备注2" ,   "备注3" ,   "上级地标ID"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"ID", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "地标名称", "所属城市Id", "缩略图", "地点Loge图", "营业/开放情况", "地标简介", "识别图组名称", "模式", "识别图集ID", "识别图集数据名称", "地图信息", "地图宽", "地图高", "比率", "是否显示", "经度", "纬度", "备注1", "备注2", "备注3", "上级地标ID"};
         String[][] dataList = new String[landMarks.size()][27];
 
         for (int i = 0; i < landMarks.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(landMarks.get(i).getId());
-                        dataList[i][1] = String.valueOf(landMarks.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(landMarks.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(landMarks.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(landMarks.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(landMarks.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(landMarks.get(i).getMapName());
-                        dataList[i][7] = String.valueOf(landMarks.get(i).getOwnedCotyId());
-                        dataList[i][8] = String.valueOf(landMarks.get(i).getMapSprite());
-                        dataList[i][9] = String.valueOf(landMarks.get(i).getLogeSprite());
-                        dataList[i][10] = String.valueOf(landMarks.get(i).getOpenDescribe());
-                        dataList[i][11] = String.valueOf(landMarks.get(i).getMarkDescribe());
-                        dataList[i][12] = String.valueOf(landMarks.get(i).getAnchorImageGroupName());
-                        dataList[i][13] = String.valueOf(landMarks.get(i).getDefaultMode());
-                        dataList[i][14] = String.valueOf(landMarks.get(i).getVuforiaImageGroupId());
-                        dataList[i][15] = String.valueOf(landMarks.get(i).getVuforiaDataName());
-                        dataList[i][16] = String.valueOf(landMarks.get(i).getMapInfo());
-                        dataList[i][17] = String.valueOf(landMarks.get(i).getMapWidth());
-                        dataList[i][18] = String.valueOf(landMarks.get(i).getMapHeight());
-                        dataList[i][19] = String.valueOf(landMarks.get(i).getMapRate());
-                        dataList[i][20] = String.valueOf(landMarks.get(i).getShowInPanel());
-                        dataList[i][21] = String.valueOf(landMarks.get(i).getLongitude());
-                        dataList[i][22] = String.valueOf(landMarks.get(i).getLatitude());
-                        dataList[i][23] = String.valueOf(landMarks.get(i).getRemark1());
-                        dataList[i][24] = String.valueOf(landMarks.get(i).getRemark2());
-                        dataList[i][25] = String.valueOf(landMarks.get(i).getRemark3());
-                        dataList[i][26] = String.valueOf(landMarks.get(i).getFrontLevelId());
-                    }
+            dataList[i][0] = String.valueOf(landMarks.get(i).getId());
+            dataList[i][1] = String.valueOf(landMarks.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(landMarks.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(landMarks.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(landMarks.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(landMarks.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(landMarks.get(i).getMapName());
+            dataList[i][7] = String.valueOf(landMarks.get(i).getOwnedCityId());
+            dataList[i][8] = String.valueOf(landMarks.get(i).getMapSprite());
+            dataList[i][9] = String.valueOf(landMarks.get(i).getLogeSprite());
+            dataList[i][10] = String.valueOf(landMarks.get(i).getOpenDescribe());
+            dataList[i][11] = String.valueOf(landMarks.get(i).getMarkDescribe());
+            dataList[i][12] = String.valueOf(landMarks.get(i).getAnchorImageGroupName());
+            dataList[i][13] = String.valueOf(landMarks.get(i).getDefaultMode());
+            dataList[i][14] = String.valueOf(landMarks.get(i).getVuforiaImageGroupId());
+            dataList[i][15] = String.valueOf(landMarks.get(i).getVuforiaDataName());
+            dataList[i][16] = String.valueOf(landMarks.get(i).getMapInfo());
+            dataList[i][17] = String.valueOf(landMarks.get(i).getMapWidth());
+            dataList[i][18] = String.valueOf(landMarks.get(i).getMapHeight());
+            dataList[i][19] = String.valueOf(landMarks.get(i).getMapRate());
+            dataList[i][20] = String.valueOf(landMarks.get(i).getShowInPanel());
+            dataList[i][21] = String.valueOf(landMarks.get(i).getLongitude());
+            dataList[i][22] = String.valueOf(landMarks.get(i).getLatitude());
+            dataList[i][23] = String.valueOf(landMarks.get(i).getRemark1());
+            dataList[i][24] = String.valueOf(landMarks.get(i).getRemark2());
+            dataList[i][25] = String.valueOf(landMarks.get(i).getRemark3());
+            dataList[i][26] = String.valueOf(landMarks.get(i).getFrontLevelId());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}
 

src/main/resources/properties/outsidews.properties

@@ -7,8 +7,8 @@ aliosskey=e1MS6j0wypXJrw8CM0hObZu8qKbfah
 aliossendpoit=http://oss-cn-hangzhou.aliyuncs.com
 alibucketname=microball
 aliImageSever=http://oss.izouma.com
-rongyunappkey=x18ywvqfxbmic
-rongyunappsecret=MnM3kGXf7a
+rongyunappkey=pwe86ga5ee376
+rongyunappsecret=ARj0hyU5Cp
 jwtsecret=3MgWy/pJjxHCQW2pHlQbkjomTUPRo9WhsPFjUPYZZlo=
 host=http://1eaed69e.ngrok.io
 base_domain=https://www.tutuxiang.com/

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

@@ -5,11 +5,11 @@
                                                                                                                                                                                                                                     <el-form-item prop="mapName" label="地标名称">
                 <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="ownedCotyId" label="所属城市Id">
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="ownedCityId" label="所属城市Id">
                 <template>
-                    <el-select v-model="formData.ownedCotyId" clearable  placeholder="请选择" :disabled="'ownedCotyId'==subColumn">
+                    <el-select v-model="formData.ownedCityId" clearable  placeholder="请选择" :disabled="'ownedCityId'==subColumn">
                         <el-option
-                                v-for="item in ownedCotyIdOptions"
+                                v-for="item in ownedCityIdOptions"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value">
@@ -134,7 +134,7 @@
 
                         if (res.data.length > 0) {
                         res.data.forEach(item => {
-                        this.ownedCotyIdOptions.push({label: item.cityName, value:item.id});
+                        this.ownedCityIdOptions.push({label: item.cityName, value:item.id});
                         })
                         }
                         }
@@ -161,7 +161,7 @@
                 formData: {},
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         },
-                                                                                ownedCotyIdOptions:[],
+                                                                                ownedCityIdOptions:[],
                                                                                                                                                                                             frontLevelIdOptions:[],
                                 subColumn: '',
             subValue: '',

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

@@ -59,8 +59,8 @@
                         </el-table-column>
                                                                 
                                             <el-table-column
-                                v-if="isColumnShow('ownedCotyId')"
-                                prop="ownedCotyId"
+                                v-if="isColumnShow('ownedCityId')"
+                                prop="ownedCityId"
                                 label="所属城市Id"
                                 min-width="100">
                         </el-table-column>
@@ -365,7 +365,7 @@
                             },
                                                                                                 {
                                 label: '所属城市Id',
-                                value: 'ownedCotyId',
+                                value: 'ownedCityId',
                                 show: true
                             },
                                                                                                 {
@@ -481,7 +481,7 @@
                             },
                                                                                                 {
                                 label: '所属城市Id',
-                                value: 'owned_coty_id'
+                                value: 'owned_city_id'
                             },
                                                                                                 {
                                 label: '缩略图',