20190403获取地标优化

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

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.LandMarkVersion;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.LandMarkVersionMapper")
+public interface LandMarkVersionMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(LandMarkVersion record);
+
+    LandMarkVersion selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(LandMarkVersion record);
+
+    List<LandMarkVersion> queryAllLandMarkVersion(LandMarkVersion record);
+
+    List<LandMarkVersion> queryLandMarkVersionByPage(Map<String, Object> parameter);
+
+    int delete(LandMarkVersion record);
+
+    LandMarkVersion queryLandMarkVersion(LandMarkVersion record);
+
+    List<LandMarkVersion> query(LandMarkVersion record);
+}
+

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

@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.izouma.awesomeadmin.dao.LandMarkVersionMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.LandMarkVersion" >
+                <id column="id" property="id" jdbcType="INTEGER" />
+                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
+                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+                                <result column="land_mark_id" property="landMarkId" jdbcType="INTEGER" />
+                                <result column="version" property="version" jdbcType="INTEGER" />
+                                <result column="json_text" property="jsonText" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            land_mark_id,
+
+            version,
+
+            json_text,
+
+            remark,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from land_mark_version
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from land_mark_version
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.LandMarkVersion" useGeneratedKeys="true" keyProperty="id">
+        insert into land_mark_version
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="updateTime!= null" >
+                update_time,
+            </if>
+                <if test="updateUser!= null" >
+                update_user,
+            </if>
+                <if test="createTime!= null" >
+                create_time,
+            </if>
+                <if test="createUser!= null" >
+                create_user,
+            </if>
+                <if test="landMarkId!= null" >
+                land_mark_id,
+            </if>
+                <if test="version!= null" >
+                version,
+            </if>
+                <if test="jsonText!= null" >
+                json_text,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="updateUser != null" >
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="createUser != null" >
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="landMarkId != null" >
+                #{landMarkId,jdbcType=INTEGER},
+            </if>
+                    <if test="version != null" >
+                #{version,jdbcType=INTEGER},
+            </if>
+                    <if test="jsonText != null" >
+                #{jsonText,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandMarkVersion" >
+        update land_mark_version
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="updateTime != null" >
+               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="updateUser != null" >
+               update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="createTime != null" >
+               create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="createUser != null" >
+               create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="landMarkId != null" >
+               land_mark_id= #{landMarkId,jdbcType=INTEGER},
+            </if>
+                     <if test="version != null" >
+               version= #{version,jdbcType=INTEGER},
+            </if>
+                     <if test="jsonText != null" >
+               json_text= #{jsonText,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                 </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryLandMarkVersionByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMarkVersion">
+        select <include refid="Base_Column_List"/> from land_mark_version
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and  update_time = #{record.updateTime}
+            </if>
+                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and  update_user = #{record.updateUser}
+            </if>
+                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and  create_time = #{record.createTime}
+            </if>
+                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and  create_user = #{record.createUser}
+            </if>
+                     <if test="record.landMarkId != null and !&quot;&quot;.equals(record.landMarkId)">
+                and  land_mark_id = #{record.landMarkId}
+            </if>
+                     <if test="record.version != null and !&quot;&quot;.equals(record.version)">
+                and  version = #{record.version}
+            </if>
+                     <if test="record.jsonText != null and !&quot;&quot;.equals(record.jsonText)">
+                and  json_text = #{record.jsonText}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  land_mark_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  version LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  json_text LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllLandMarkVersion" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMarkVersion">
+        select <include refid="Base_Column_List"/> from land_mark_version
+        <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="landMarkId != null and !&quot;&quot;.equals(landMarkId)">
+                and  land_mark_id = #{landMarkId}
+            </if>
+                    <if test="version != null and !&quot;&quot;.equals(version)">
+                and  version = #{version}
+            </if>
+                    <if test="jsonText != null and !&quot;&quot;.equals(jsonText)">
+                and  json_text = #{jsonText}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  land_mark_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  version LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  json_text LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryLandMarkVersion" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMarkVersion">
+        select <include refid="Base_Column_List"/> from land_mark_version
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+                     <if test="landMarkId != null and !&quot;&quot;.equals(landMarkId)">
+                and land_mark_id = #{landMarkId}
+            </if>
+                     <if test="version != null and !&quot;&quot;.equals(version)">
+                and version = #{version}
+            </if>
+                     <if test="jsonText != null and !&quot;&quot;.equals(jsonText)">
+                and json_text = #{jsonText}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE land_mark_version SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMarkVersion">
+        select <include refid="Base_Column_List"/> from land_mark_version
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

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

@@ -0,0 +1,140 @@
+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 LandMarkVersion{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer landMarkId;
+    private Integer version;
+    private String jsonText;
+    private String remark;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* 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){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getLandMarkId(){
+        return this.landMarkId;
+    }
+
+    public void setLandMarkId(Integer landMarkId){
+        this.landMarkId = landMarkId;
+    }
+    public Integer getVersion(){
+        return this.version;
+    }
+
+    public void setVersion(Integer version){
+        this.version = version;
+    }
+    public String getJsonText(){
+        return this.jsonText;
+    }
+
+    public void setJsonText(String jsonText){
+        this.jsonText = jsonText;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

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

@@ -23,5 +23,7 @@ public interface AreaInfoService{
     boolean deleteAreaInfo(AreaInfo record);
 
     boolean updateAreaInfo(AreaInfo record);
+
+    List<AreaInfo> allForLandMark(AreaInfo record);
 }
 

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

@@ -0,0 +1,28 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.LandMarkVersion;
+
+
+/**
+*  service接口类
+*/
+public interface LandMarkVersionService{
+
+    List<LandMarkVersion> getLandMarkVersionList(LandMarkVersion record);
+
+    List<LandMarkVersion> getLandMarkVersionByPage(Page page, LandMarkVersion record);
+
+    LandMarkVersion getLandMarkVersionById(String id);
+
+    LandMarkVersion getLandMarkVersion(LandMarkVersion record);
+
+    boolean createLandMarkVersion(LandMarkVersion record);
+
+    boolean deleteLandMarkVersion(LandMarkVersion record);
+
+    boolean updateLandMarkVersion(LandMarkVersion record);
+
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AreaInfoServiceImpl.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.AreaInfoService;
 import com.izouma.awesomeadmin.dao.AreaInfoMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class AreaInfoServiceImpl implements AreaInfoService{
+public class AreaInfoServiceImpl implements AreaInfoService {
 
     private static Logger logger = Logger.getLogger(AreaInfoServiceImpl.class);
 
@@ -27,26 +28,41 @@ public class AreaInfoServiceImpl implements AreaInfoService{
         logger.info("getAreaInfoList");
         try {
 
-        return areaInfoMapper.queryAllAreaInfo(record);
+            return areaInfoMapper.queryAllAreaInfo(record);
+        } catch (Exception e) {
+            logger.error("getAreaInfoList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<AreaInfo> allForLandMark(AreaInfo record) {
+
+        logger.info("allForLandMark");
+        try {
+
+            return areaInfoMapper.queryAllAreaInfoAllInfo(record);
         } catch (Exception e) {
-        logger.error("getAreaInfoList", e);
+            logger.error("allForLandMark", e);
         }
 
         return null;
     }
+
     @Override
     public List<AreaInfo> getAreaInfoByPage(Page page, AreaInfo record) {
 
         logger.info("getAreaInfoByPage");
         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 areaInfoMapper.queryAreaInfoByPage(parameter);
+            return areaInfoMapper.queryAreaInfoByPage(parameter);
         } catch (Exception e) {
-        logger.error("getAreaInfoByPage", e);
+            logger.error("getAreaInfoByPage", e);
         }
 
         return null;
@@ -60,7 +76,7 @@ public class AreaInfoServiceImpl implements AreaInfoService{
 
             return areaInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getAreaInfoById", e);
+            logger.error("getAreaInfoById", e);
         }
 
         return null;
@@ -74,7 +90,7 @@ public class AreaInfoServiceImpl implements AreaInfoService{
 
             return areaInfoMapper.queryAreaInfo(record);
         } catch (Exception e) {
-        logger.error("getAreaInfo", e);
+            logger.error("getAreaInfo", e);
         }
 
         return null;
@@ -89,7 +105,7 @@ public class AreaInfoServiceImpl implements AreaInfoService{
             int updates = areaInfoMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createAreaInfo", e);
@@ -104,13 +120,13 @@ public class AreaInfoServiceImpl implements AreaInfoService{
         logger.info("deleteAreaInfo");
         try {
 
-             int updates = areaInfoMapper.delete(record);
+            int updates = areaInfoMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteAreaInfo", e);
+            logger.error("deleteAreaInfo", e);
         }
 
         return false;
@@ -125,10 +141,10 @@ public class AreaInfoServiceImpl implements AreaInfoService{
             int updates = areaInfoMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateAreaInfo", e);
+            logger.error("updateAreaInfo", e);
         }
 
         return false;

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

@@ -0,0 +1,138 @@
+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;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.LandMarkVersion;
+import com.izouma.awesomeadmin.service.LandMarkVersionService;
+import com.izouma.awesomeadmin.dao.LandMarkVersionMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class LandMarkVersionServiceImpl implements LandMarkVersionService{
+
+    private static Logger logger = Logger.getLogger(LandMarkVersionServiceImpl.class);
+
+    @Autowired
+    private LandMarkVersionMapper landMarkVersionMapper;
+
+    @Override
+    public List<LandMarkVersion> getLandMarkVersionList(LandMarkVersion record) {
+
+        logger.info("getLandMarkVersionList");
+        try {
+
+        return landMarkVersionMapper.queryAllLandMarkVersion(record);
+        } catch (Exception e) {
+        logger.error("getLandMarkVersionList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<LandMarkVersion> getLandMarkVersionByPage(Page page, LandMarkVersion record) {
+
+        logger.info("getLandMarkVersionByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return landMarkVersionMapper.queryLandMarkVersionByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getLandMarkVersionByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public LandMarkVersion getLandMarkVersionById(String id) {
+
+        logger.info("getLandMarkVersionyId");
+        try {
+
+            return landMarkVersionMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getLandMarkVersionById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public LandMarkVersion getLandMarkVersion(LandMarkVersion record) {
+
+        logger.info("getLandMarkVersion");
+        try {
+
+            return landMarkVersionMapper.queryLandMarkVersion(record);
+        } catch (Exception e) {
+        logger.error("getLandMarkVersion", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createLandMarkVersion(LandMarkVersion record) {
+
+        logger.info("createLandMarkVersion");
+        try {
+
+            int updates = landMarkVersionMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createLandMarkVersion", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteLandMarkVersion(LandMarkVersion record) {
+
+        logger.info("deleteLandMarkVersion");
+        try {
+
+             int updates = landMarkVersionMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteLandMarkVersion", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateLandMarkVersion(LandMarkVersion record) {
+
+        logger.info("updateLandMarkVersion");
+        try {
+
+            int updates = landMarkVersionMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateLandMarkVersion", e);
+        }
+
+        return false;
+    }
+
+}
+

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

@@ -44,6 +44,13 @@ public class AreaInfoController {
         return new Result(true, pp);
     }
 
+    @RequestMapping(value = "/allForLandMark", method = RequestMethod.GET)
+    @ResponseBody
+    public Result allForLandMark(AreaInfo record) {
+        List<AreaInfo> pp = areaInfoService.allForLandMark(record);
+        return new Result(true, pp);
+    }
+
     /**
     * <p>根据Id。</p>
     */

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

@@ -3,7 +3,10 @@ package com.izouma.awesomeadmin.web;
 import java.util.*;
 
 import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
+import com.izouma.awesomeadmin.model.LandMarkVersion;
 import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.LandMarkVersionService;
 import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
@@ -33,6 +36,9 @@ public class LandMarkController {
     @Autowired
     private UserUpdateLogService userUpdateLogService;
 
+    @Autowired
+    private LandMarkVersionService landMarkVersionService;
+
     /**
      * <p>获取全部记录。</p>
      */
@@ -77,8 +83,83 @@ public class LandMarkController {
     @RequestMapping(value = "/mapInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result mapInfo(LandMark record) {
+
+        LandMark data;
+
+        Gson gson = new Gson();
+
+        if (record.getId() != null) {
+            LandMarkVersion landMarkVersion = new LandMarkVersion();
+            landMarkVersion.setLandMarkId(record.getId());
+
+            landMarkVersion = landMarkVersionService.getLandMarkVersion(landMarkVersion);//获取版本信息
+
+            if (landMarkVersion != null) {//如果存在
+                data = gson.fromJson(landMarkVersion.getJsonText(), LandMark.class);
+            } else {
+
+                data = landMarkService.getLandMarkMapInfo(record);
+                String jsonText = gson.toJson(data);
+
+                LandMarkVersion newVersion = new LandMarkVersion();
+
+                newVersion.setLandMarkId(record.getId());
+                newVersion.setJsonText(jsonText);
+
+                landMarkVersionService.createLandMarkVersion(newVersion);
+
+
+            }
+
+            return new Result(true, data);
+
+        }
+
+        return new Result(false, "无查询结果");
+
+    }
+
+
+    /**
+     * 提交新版本
+     *
+     * @param record LandMark
+     * @return
+     */
+    @RequestMapping(value = "/newVersion", method = RequestMethod.POST)
+    @ResponseBody
+    public Result newVersion(LandMark record) {
+
+
+        Gson gson = new Gson();
         LandMark data = landMarkService.getLandMarkMapInfo(record);
-        return new Result(true, data);
+        String jsonText = gson.toJson(data);
+
+
+        LandMarkVersion landMarkVersion = new LandMarkVersion();
+        landMarkVersion.setLandMarkId(record.getId());
+        landMarkVersion = landMarkVersionService.getLandMarkVersion(landMarkVersion);
+
+        if (landMarkVersion != null) {
+
+            landMarkVersion.setJsonText(jsonText);
+            landMarkVersion.setVersion(landMarkVersion.getVersion() + 1);
+
+            landMarkVersionService.updateLandMarkVersion(landMarkVersion);
+
+        } else {
+
+
+            LandMarkVersion newVersion = new LandMarkVersion();
+
+            newVersion.setLandMarkId(record.getId());
+            newVersion.setJsonText(jsonText);
+
+            landMarkVersionService.createLandMarkVersion(newVersion);
+        }
+
+
+        return new Result(true, "发布成功");
     }
 
 

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

@@ -0,0 +1,161 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.LandMarkVersion;
+import com.izouma.awesomeadmin.service.LandMarkVersionService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/landMarkVersion")
+public class LandMarkVersionController {
+
+    @Autowired
+    private LandMarkVersionService landMarkVersionService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(LandMarkVersion record) {
+        List<LandMarkVersion> pp = landMarkVersionService.getLandMarkVersionList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getLandMarkVersion", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getLandMarkVersion(@RequestParam(required = false, value = "id") String id) {
+        LandMarkVersion data = landMarkVersionService.getLandMarkVersionById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(LandMarkVersion record) {
+        LandMarkVersion data = landMarkVersionService.getLandMarkVersion(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, LandMarkVersion record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<LandMarkVersion> pp =landMarkVersionService.getLandMarkVersionByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(LandMarkVersion record) {
+        boolean num = landMarkVersionService.createLandMarkVersion(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateLandMarkVersion(LandMarkVersion record) {
+        boolean num = landMarkVersionService.updateLandMarkVersion(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteLandMarkVersion(LandMarkVersion record) {
+
+        boolean num = landMarkVersionService.deleteLandMarkVersion(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, LandMarkVersion record) throws Exception {
+
+    List<LandMarkVersion> landMarkVersions = landMarkVersionService.getLandMarkVersionList(record);
+
+
+        String sheetName = "land_mark_version";
+        String titleName = "地标版本数据表";
+        String fileName = "地标版本表";
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "地标ID" ,   "版本号" ,   "内容" ,   "备注"  };
+        String[][] dataList = new String[landMarkVersions.size()][10];
+
+        for (int i = 0; i < landMarkVersions.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(landMarkVersions.get(i).getId());
+                        dataList[i][1] = String.valueOf(landMarkVersions.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(landMarkVersions.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(landMarkVersions.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(landMarkVersions.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(landMarkVersions.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(landMarkVersions.get(i).getLandMarkId());
+                        dataList[i][7] = String.valueOf(landMarkVersions.get(i).getVersion());
+                        dataList[i][8] = String.valueOf(landMarkVersions.get(i).getJsonText());
+                        dataList[i][9] = String.valueOf(landMarkVersions.get(i).getRemark());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/LandMarkVersion.vue

@@ -0,0 +1,114 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="landMarkId" label="地标ID">
+                <el-input v-model="formData.landMarkId" :disabled="'landMarkId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="version" label="版本号">
+                <el-input v-model="formData.version" :disabled="'version'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="jsonText" label="内容">
+                <el-input v-model="formData.jsonText" :disabled="'jsonText'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==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>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/landMarkVersion/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                            },
+                                                                                            subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/landMarkVersion/update' : '/landMarkVersion/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                    url: '/landMarkVersion/del',
+                    data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/LandMarkVersions.vue

@@ -0,0 +1,450 @@
+<template>
+    <div>
+        <div class="filters-container">
+
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/landMarkVersion',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('landMarkId')" prop="landMarkId" label="地标ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('version')" prop="version" label="版本号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('jsonText')" prop="jsonText" label="内容" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="newVersion(scope.row)" type="primary" size="mini" plain>发布</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '地标ID',
+                    value: 'landMarkId',
+                    show: true
+                },
+                {
+                    label: '版本号',
+                    value: 'version',
+                    show: true
+                },
+                {
+                    label: '内容',
+                    value: 'jsonText',
+                    show: false
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '地标ID',
+                    value: 'land_mark_id'
+                },
+                {
+                    label: '版本号',
+                    value: 'version'
+                },
+                {
+                    label: '内容',
+                    value: 'json_text'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/landMarkVersion/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/landMarkVersion',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/landMarkVersion/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/landMarkVersion/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        newVersion(row) {
+            this.$alert('发布新版本将无法恢复，确认要发布么？', '警告', { type: 'error' }).then(() => {
+
+                const loading = this.$loading({
+                    lock: true,
+                });
+
+                this.$http.post({
+                    url: '/landMark/newVersion',
+                    data: { id: row.landMarkId }
+                }).then(res => {
+
+
+                    loading.close();
+                    if (res.success) {
+                        this.$message.success('发布成功');
+                        this.getData();
+
+                    } else {
+                        this.$message.warning('失败')
+                    }
+
+
+                })
+
+
+            })
+
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

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

@@ -89,7 +89,7 @@
 
       <!-- <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
       </el-table-column>-->
-      <el-table-column label="操作" align="center" fixed="right" width="220">
+      <el-table-column label="操作" align="center" fixed="right" width="230">
         <template slot-scope="scope">
           <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
             </el-button>
@@ -100,6 +100,7 @@
           <el-button @click="$router.push({path:'/areaInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>区域</el-button>
           <el-button @click="$router.push({path:'/thingInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>事物</el-button>
           <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+          <el-button @click="newVersion(scope.row)" type="primary" size="mini" plain>发布</el-button>
           <el-button @click="drawMapInfo(scope.row)" type="primary" size="mini" plain>地图</el-button>
           <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
         </template>
@@ -623,6 +624,37 @@ export default {
         }
       })
     },
+
+    newVersion(row) {
+      this.$alert('发布新版本将无法恢复，确认要发布么？', '警告', { type: 'error' }).then(() => {
+
+        const loading = this.$loading({
+          lock: true,
+        });
+
+        this.$http.post({
+          url: '/landMark/newVersion',
+          data: { id: row.id }
+        }).then(res => {
+
+
+          loading.close();
+          if (res.success) {
+            this.$message.success('发布成功');
+            //this.getData();
+
+          } else {
+            this.$message.warning('失败')
+          }
+
+
+        })
+
+
+      })
+
+    },
+
     DateTimeFormatter(row, column, cellValue) {
       if (cellValue) {
         return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })

src/main/vue/src/router/index.js

@@ -599,6 +599,16 @@ const router = new Router({
                     path: '/userUpdateLogs',
                     name: 'UserUpdateLogs',
                     component: () => import('../pages/UserUpdateLogs')
+                },
+                {
+                    path: '/landMarkVersion',
+                    name: 'LandMarkVersion',
+                    component: () => import('../pages/LandMarkVersion')
+                },
+                {
+                    path: '/landMarkVersions',
+                    name: 'LandMarkVersions',
+                    component: () => import('../pages/LandMarkVersions')
                 }
                 /**INSERT_LOCATION**/
             ]

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

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

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

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

src/main/webapp/static/js/82.3e388f8d336291ed0eff.js → src/main/webapp/static/js/85.2045d4a21a5c0dffcc5f.js

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

src/main/webapp/static/js/95.c49c8490d7a4fd038944.js → src/main/webapp/static/js/97.dae5708a15838bfd12ce.js

@@ -1 +1 @@
-webpackJsonp([95],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});
+webpackJsonp([97],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});