键基础表。

src/main/java/com/izouma/awesomeadmin/dao/CityInfoMapper.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.CityInfo;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.CityInfoMapper")
+public interface CityInfoMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(CityInfo record);
+
+    CityInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(CityInfo record);
+
+    List<CityInfo> queryAllCityInfo(CityInfo record);
+
+    List<CityInfo> queryCityInfoByPage(Map<String, Object> parameter);
+
+    int delete(CityInfo record);
+
+    CityInfo queryCityInfo(CityInfo record);
+
+    List<CityInfo> query(CityInfo record);
+}
+

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

@@ -0,0 +1,489 @@
+<?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.CityInfoMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CityInfo">
+        <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="code" property="code" jdbcType="VARCHAR"/>
+        <result column="city_name" property="cityName" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="rank" property="rank" jdbcType="INTEGER"/>
+        <result column="hot_flag" property="hotFlag" jdbcType="CHAR"/>
+        <result column="latest_time" property="latestTime" jdbcType="TIMESTAMP"/>
+        <result column="pin_yin" property="pinYin" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            code,
+
+            city_name,
+
+            remark,
+
+            rank,
+
+            hot_flag,
+
+            latest_time,
+
+            pin_yin,
+
+        </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from city_info
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from city_info
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CityInfo" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into city_info
+        <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="code!= null">
+                code,
+            </if>
+            <if test="cityName!= null">
+                city_name,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="rank!= null">
+                rank,
+            </if>
+            <if test="hotFlag!= null">
+                hot_flag,
+            </if>
+            <if test="latestTime!= null">
+                latest_time,
+            </if>
+            <if test="pinYin!= null">
+                pin_yin,
+            </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="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="cityName != null">
+                #{cityName,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                #{rank,jdbcType=INTEGER},
+            </if>
+            <if test="hotFlag != null">
+                #{hotFlag,jdbcType=CHAR},
+            </if>
+            <if test="latestTime != null">
+                #{latestTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="pinYin != null">
+                #{pinYin,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CityInfo">
+        update city_info
+        <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="code != null">
+                code= #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="cityName != null">
+                city_name= #{cityName,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="rank != null">
+                rank= #{rank,jdbcType=INTEGER},
+            </if>
+            <if test="hotFlag != null">
+                hot_flag= #{hotFlag,jdbcType=CHAR},
+            </if>
+            <if test="latestTime != null">
+                latest_time= #{latestTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="pinYin != null">
+                pin_yin= #{pinYin,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="queryCityInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CityInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from city_info
+        <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.code != null and !&quot;&quot;.equals(record.code)">
+                and code = #{record.code}
+            </if>
+            <if test="record.cityName != null and !&quot;&quot;.equals(record.cityName)">
+                and city_name = #{record.cityName}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
+            </if>
+            <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and rank = #{record.rank}
+            </if>
+            <if test="record.hotFlag != null and !&quot;&quot;.equals(record.hotFlag)">
+                and hot_flag = #{record.hotFlag}
+            </if>
+            <if test="record.latestTime != null and !&quot;&quot;.equals(record.latestTime)">
+                and latest_time = #{record.latestTime}
+            </if>
+            <if test="record.pinYin != null and !&quot;&quot;.equals(record.pinYin)">
+                and pin_yin = #{record.pinYin}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR code LIKE concat('%',#{record.searchKey},'%')
+                    OR city_name LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR rank LIKE concat('%',#{record.searchKey},'%')
+                    OR hot_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR pin_yin 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>
+       rank desc, id desc
+    </select>
+    <select id="queryAllCityInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CityInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from city_info
+        <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="code != null and !&quot;&quot;.equals(code)">
+                and code = #{code}
+            </if>
+            <if test="cityName != null and !&quot;&quot;.equals(cityName)">
+                and city_name = #{cityName}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
+                and hot_flag = #{hotFlag}
+            </if>
+            <if test="latestTime != null and !&quot;&quot;.equals(latestTime)">
+                and latest_time = #{latestTime}
+            </if>
+            <if test="pinYin != null and !&quot;&quot;.equals(pinYin)">
+                and pin_yin = #{pinYin}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR code LIKE concat('%',#{searchKey},'%')
+                    OR city_name LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR rank LIKE concat('%',#{searchKey},'%')
+                    OR hot_flag LIKE concat('%',#{searchKey},'%')
+                    OR pin_yin 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>
+
+        rank desc,id desc
+    </select>
+    <select id="queryCityInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CityInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from city_info
+        <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="code != null and !&quot;&quot;.equals(code)">
+                and code = #{code}
+            </if>
+            <if test="cityName != null and !&quot;&quot;.equals(cityName)">
+                and city_name = #{cityName}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+            <if test="hotFlag != null and !&quot;&quot;.equals(hotFlag)">
+                and hot_flag = #{hotFlag}
+            </if>
+            <if test="latestTime != null and !&quot;&quot;.equals(latestTime)">
+                and latest_time = #{latestTime}
+            </if>
+            <if test="pinYin != null and !&quot;&quot;.equals(pinYin)">
+                and pin_yin = #{pinYin}
+            </if>
+
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE city_info 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.CityInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from city_info
+        <where>
+            and del_flag = 'N'
+        </where>
+        order by id desc
+    </select>
+</mapper>
+

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

@@ -22,6 +22,7 @@ public class AimPlacePosition{
     private String remark1;
     private String remark2;
     private String remark3;
+    private String frontLevelId;
 
 private String idStr;
 
@@ -135,6 +136,13 @@ private String orderByStr;
     public void setRemark3(String remark3){
         this.remark3 = remark3;
     }
+    public String getFrontLevelId(){
+        return this.frontLevelId;
+    }
+
+    public void setFrontLevelId(String frontLevelId){
+        this.frontLevelId = frontLevelId;
+    }
 
 public String getSearchKey() {
     return searchKey;

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

@@ -0,0 +1,164 @@
+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 CityInfo{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String code;
+    private String cityName;
+    private String remark;
+    private Integer rank;
+    private String hotFlag;
+    private Date latestTime;
+    private String pinYin;
+
+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 String getCode(){
+        return this.code;
+    }
+
+    public void setCode(String code){
+        this.code = code;
+    }
+    public String getCityName(){
+        return this.cityName;
+    }
+
+    public void setCityName(String cityName){
+        this.cityName = cityName;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public Integer getRank(){
+        return this.rank;
+    }
+
+    public void setRank(Integer rank){
+        this.rank = rank;
+    }
+    public String getHotFlag(){
+        return this.hotFlag;
+    }
+
+    public void setHotFlag(String hotFlag){
+        this.hotFlag = hotFlag;
+    }
+    public Date getLatestTime(){
+        return this.latestTime;
+    }
+
+    public void setLatestTime(Date latestTime){
+        this.latestTime = latestTime;
+    }
+    public String getPinYin(){
+        return this.pinYin;
+    }
+
+    public void setPinYin(String pinYin){
+        this.pinYin = pinYin;
+    }
+
+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/model/LandMark.java

@@ -34,6 +34,7 @@ public class LandMark{
     private String remark1;
     private String remark2;
     private String remark3;
+    private String frontLevelId;
 
 private String idStr;
 
@@ -231,6 +232,13 @@ private String orderByStr;
     public void setRemark3(String remark3){
         this.remark3 = remark3;
     }
+    public String getFrontLevelId(){
+        return this.frontLevelId;
+    }
+
+    public void setFrontLevelId(String frontLevelId){
+        this.frontLevelId = frontLevelId;
+    }
 
 public String getSearchKey() {
     return searchKey;

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.CityInfo;
+
+
+/**
+*  service接口类
+*/
+public interface CityInfoService{
+
+    List<CityInfo> getCityInfoList(CityInfo record);
+
+    List<CityInfo> getCityInfoByPage(Page page, CityInfo record);
+
+    CityInfo getCityInfoById(String id);
+
+    CityInfo getCityInfo(CityInfo record);
+
+    boolean createCityInfo(CityInfo record);
+
+    boolean deleteCityInfo(CityInfo record);
+
+    boolean updateCityInfo(CityInfo record);
+}
+

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

@@ -0,0 +1,137 @@
+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.CityInfo;
+import com.izouma.awesomeadmin.service.CityInfoService;
+import com.izouma.awesomeadmin.dao.CityInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class CityInfoServiceImpl implements CityInfoService{
+
+    private static Logger logger = Logger.getLogger(CityInfoServiceImpl.class);
+
+    @Autowired
+    private CityInfoMapper cityInfoMapper;
+
+    @Override
+    public List<CityInfo> getCityInfoList(CityInfo record) {
+
+        logger.info("getCityInfoList");
+        try {
+
+        return cityInfoMapper.queryAllCityInfo(record);
+        } catch (Exception e) {
+        logger.error("getCityInfoList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<CityInfo> getCityInfoByPage(Page page, CityInfo record) {
+
+        logger.info("getCityInfoByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return cityInfoMapper.queryCityInfoByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getCityInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public CityInfo getCityInfoById(String id) {
+
+        logger.info("getCityInfoyId");
+        try {
+
+            return cityInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getCityInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public CityInfo getCityInfo(CityInfo record) {
+
+        logger.info("getCityInfo");
+        try {
+
+            return cityInfoMapper.queryCityInfo(record);
+        } catch (Exception e) {
+        logger.error("getCityInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createCityInfo(CityInfo record) {
+
+        logger.info("createCityInfo");
+        try {
+
+            int updates = cityInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createCityInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteCityInfo(CityInfo record) {
+
+        logger.info("deleteCityInfo");
+        try {
+
+             int updates = cityInfoMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteCityInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateCityInfo(CityInfo record) {
+
+        logger.info("updateCityInfo");
+        try {
+
+            int updates = cityInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateCityInfo", e);
+        }
+
+        return false;
+    }
+}
+

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

@@ -132,10 +132,10 @@ public class AimPlacePositionController {
         String sheetName = "aim_place_position";
         String titleName = "目标点-位置数据表";
         String fileName = "目标点-位置表";
-        int columnNumber = 14;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "类别" ,   "坐标X" ,   "坐标Y" ,   "坐标Z" ,   "备注1" ,   "备注2" ,   "备注3"  };
-        String[][] dataList = new String[aimPlacePositions.size()][14];
+        int columnNumber = 15;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "类别" ,   "坐标X" ,   "坐标Y" ,   "坐标Z" ,   "备注1" ,   "备注2" ,   "备注3" ,   "上级ID"  };
+        String[][] dataList = new String[aimPlacePositions.size()][15];
 
         for (int i = 0; i < aimPlacePositions.size(); i++) {
 
@@ -153,6 +153,7 @@ public class AimPlacePositionController {
                         dataList[i][11] = String.valueOf(aimPlacePositions.get(i).getRemark1());
                         dataList[i][12] = String.valueOf(aimPlacePositions.get(i).getRemark2());
                         dataList[i][13] = String.valueOf(aimPlacePositions.get(i).getRemark3());
+                        dataList[i][14] = String.valueOf(aimPlacePositions.get(i).getFrontLevelId());
                     }
 
 

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

@@ -0,0 +1,164 @@
+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.CityInfo;
+import com.izouma.awesomeadmin.service.CityInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/cityInfo")
+public class CityInfoController {
+
+    @Autowired
+    private CityInfoService cityInfoService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(CityInfo record) {
+        List<CityInfo> pp = cityInfoService.getCityInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getCityInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getCityInfo(@RequestParam(required = false, value = "id") String id) {
+        CityInfo data = cityInfoService.getCityInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(CityInfo record) {
+        CityInfo data = cityInfoService.getCityInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, CityInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<CityInfo> pp =cityInfoService.getCityInfoByPage(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(CityInfo record) {
+        boolean num = cityInfoService.createCityInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateCityInfo(CityInfo record) {
+        boolean num = cityInfoService.updateCityInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteCityInfo(CityInfo record) {
+
+        boolean num = cityInfoService.deleteCityInfo(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, CityInfo record) throws Exception {
+
+    List<CityInfo> cityInfos = cityInfoService.getCityInfoList(record);
+
+
+        String sheetName = "city_info";
+        String titleName = "城市信息数据表";
+        String fileName = "城市信息表";
+        int columnNumber = 13;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "CODE" ,   "城市名" ,   "备注" ,   "排序" ,   "热门" ,   "最近访问时间" ,   "拼音"  };
+        String[][] dataList = new String[cityInfos.size()][13];
+
+        for (int i = 0; i < cityInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(cityInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(cityInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(cityInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(cityInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(cityInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(cityInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(cityInfos.get(i).getCode());
+                        dataList[i][7] = String.valueOf(cityInfos.get(i).getCityName());
+                        dataList[i][8] = String.valueOf(cityInfos.get(i).getRemark());
+                        dataList[i][9] = String.valueOf(cityInfos.get(i).getRank());
+                        dataList[i][10] = String.valueOf(cityInfos.get(i).getHotFlag());
+                        dataList[i][11] = String.valueOf(cityInfos.get(i).getLatestTime());
+                        dataList[i][12] = String.valueOf(cityInfos.get(i).getPinYin());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -132,10 +132,10 @@ public class LandMarkController {
         String sheetName = "land_mark";
         String titleName = "地标信息数据表";
         String fileName = "地标信息表";
-        int columnNumber = 26;
-        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 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "地标名称" ,   "所属城市Id" ,   "缩略图" ,   "地点Loge图" ,   "营业/开放情况" ,   "地标简介" ,   "识别图组名称" ,   "模式" ,   "识别图集ID" ,   "识别图集数据名称" ,   "地图信息" ,   "地图宽" ,   "地图高" ,   "比率" ,   "是否显示" ,   "经度" ,   "纬度" ,   "备注1" ,   "备注2" ,   "备注3"  };
-        String[][] dataList = new String[landMarks.size()][26];
+        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"  };
+        String[][] dataList = new String[landMarks.size()][27];
 
         for (int i = 0; i < landMarks.size(); i++) {
 
@@ -165,6 +165,7 @@ public class LandMarkController {
                         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());
                     }
 
 

src/main/vue/src/pages/AimPlacePosition.vue

@@ -25,6 +25,9 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="frontLevelId" label="上级ID">
+                <el-input v-model="formData.frontLevelId" :disabled="'frontLevelId'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -53,7 +56,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -67,14 +70,14 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                    subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/AimPlacePositions.vue

@@ -99,6 +99,13 @@
                                 label="备注3"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('frontLevelId')"
+                                prop="frontLevelId"
+                                label="上级ID"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -280,6 +287,11 @@
                                 label: '备注3',
                                 value: 'remark3',
                                 show: true
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'frontLevelId',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -320,6 +332,10 @@
                                                                                                 {
                                 label: '备注3',
                                 value: 'remark3'
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'front_level_id'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/CityInfo.vue

@@ -0,0 +1,142 @@
+<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="code" label="CODE">
+                <el-input v-model="formData.code" :disabled="'code'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="cityName" label="城市名">
+                <el-input v-model="formData.cityName" :disabled="'cityName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="pinYin" label="拼音">
+                <el-input v-model="formData.pinYin" :disabled="'pinYin'==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 prop="rank" label="排序">
+                <el-input type="number" v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="hotFlag" label="热门">
+                <el-switch v-model="formData.hotFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'hotFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="latestTime" label="最近访问时间">
+                <template>
+                    <div class="block">
+                        <el-date-picker v-model="formData.latestTime" type="datetime" value-format="timestamp" placeholder="选择日期" :disabled="'latestTime'==subColumn">
+                        </el-date-picker>
+                    </div>
+                </template>
+            </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: '/cityInfo/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;
+                    }
+
+                    this.formData.hotFlag = this.formData.hotFlag == 'Y' ? true : false;
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                code:
+                    [
+                        { required: true, message: '请输入 CODE', trigger: 'blur' },
+                    ],
+                cityName:
+                    [
+                        { required: true, message: '请输入 城市名', trigger: 'blur' },
+                    ],
+            },
+            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));
+
+            data.hotFlag = this.formData.hotFlag ? 'Y' : 'N';
+
+            this.$http.post({
+                url: this.formData.id ? '/cityInfo/update' : '/cityInfo/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: '/cityInfo/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/CityInfos.vue

@@ -0,0 +1,453 @@
+<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:'/cityInfo',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('code')" prop="code" label="CODE" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('cityName')" prop="cityName" label="城市名" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('pinYin')" prop="pinYin" 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 v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('hotFlag')" prop="hotFlag" label="热门" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('latestTime')" prop="latestTime" label="最近访问时间" :formatter="DateTimeFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <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: 'CODE',
+                    value: 'code',
+                    show: true
+                },
+                {
+                    label: '城市名',
+                    value: 'cityName',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+                {
+                    label: '热门',
+                    value: 'hotFlag',
+                    show: true
+                },
+                {
+                    label: '最近访问时间',
+                    value: 'latestTime',
+                    show: true
+                },
+                {
+                    label: '拼音',
+                    value: 'pinYin',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'CODE',
+                    value: 'code'
+                },
+                {
+                    label: '城市名',
+                    value: 'city_name'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+                {
+                    label: '热门',
+                    value: 'hot_flag'
+                },
+                {
+                    label: '最近访问时间',
+                    value: 'latest_time'
+                },
+                {
+                    label: '拼音',
+                    value: 'pin_yin'
+                },
+            ],
+            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: '/cityInfo/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: '/cityInfo',
+                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 + "/cityInfo/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: '/cityInfo/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        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/LandMark.vue

@@ -5,22 +5,31 @@
                                                                                                                                                                                                                                     <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-input v-model="formData.ownedCotyId" :disabled="'ownedCotyId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapSprite" label="缩略图">
-                <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="logeSprite" label="地点Loge图">
-                <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="openDescribe" label="营业/开放情况">
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="ownedCotyId" label="所属城市Id">
+                <template>
+                    <el-select v-model="formData.ownedCotyId" clearable  placeholder="请选择" :disabled="'ownedCotyId'==subColumn">
+                        <el-option
+                                v-for="item in ownedCotyIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="mapSprite" label="缩略图">
+                 <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                                                                                                                                                             <el-form-item prop="logeSprite" label="地点Loge图">
+                 <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                <el-form-item prop="openDescribe" label="营业/开放情况">
                 <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="markDescribe" label="地标简介">
-                <el-input v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="markDescribe" label="地标简介">
+                <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="anchorImageGroupName" label="识别图组名称">
+                                                                                                                                                                                                                                                                                                        <el-form-item prop="anchorImageGroupName" label="识别图组名称">
                 <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="defaultMode" label="模式">
@@ -32,10 +41,10 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="vuforiaDataName" label="识别图集数据名称">
                 <el-input v-model="formData.vuforiaDataName" :disabled="'vuforiaDataName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapInfo" label="地图信息">
-                <el-input v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="mapInfo" label="地图信息">
+                <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapWidth" label="地图宽">
+                                                                                                                                                                                                                                                                                                        <el-form-item prop="mapWidth" label="地图宽">
                 <el-input v-model="formData.mapWidth" :disabled="'mapWidth'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="mapHeight" label="地图高">
@@ -62,7 +71,19 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="frontLevelId" label="上级地标ID">
+                <template>
+                    <el-select v-model="formData.frontLevelId" clearable  placeholder="请选择" :disabled="'frontLevelId'==subColumn">
+                        <el-option
+                                v-for="item in frontLevelIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </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>
@@ -89,7 +110,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -103,14 +124,46 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/cityInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.ownedCotyIdOptions.push({label: item.cityName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
+
+                        this.$http.get({
+                        url:'/landMark/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.frontLevelIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                                                                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                ownedCotyIdOptions:[],
+                                                                                                                                                                                            frontLevelIdOptions:[],
+                                subColumn: '',
             subValue: '',
         }
         },

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

@@ -43,7 +43,14 @@
                     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('mapName')"
                                 prop="mapName"
@@ -63,15 +70,23 @@
                                 prop="mapSprite"
                                 label="缩略图"
                                 min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.mapSprite" @click="showImg(row.mapSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
                         </el-table-column>
-                                                                
+                                                                    
                                             <el-table-column
                                 v-if="isColumnShow('logeSprite')"
                                 prop="logeSprite"
                                 label="地点Loge图"
                                 min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.logeSprite" @click="showImg(row.logeSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
                         </el-table-column>
-                                                                
+                                                                    
                                             <el-table-column
                                 v-if="isColumnShow('openDescribe')"
                                 prop="openDescribe"
@@ -183,6 +198,13 @@
                                 label="备注3"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('frontLevelId')"
+                                prop="frontLevelId"
+                                label="上级地标ID"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -325,7 +347,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '地标名称',
                                 value: 'mapName',
                                 show: true
@@ -424,6 +451,11 @@
                                 label: '备注3',
                                 value: 'remark3',
                                 show: true
+                            },
+                                                                                                {
+                                label: '上级地标ID',
+                                value: 'frontLevelId',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -433,7 +465,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '地标名称',
                                 value: 'map_name'
                             },
@@ -512,6 +548,10 @@
                                                                                                 {
                                 label: '备注3',
                                 value: 'remark3'
+                            },
+                                                                                                {
+                                label: '上级地标ID',
+                                value: 'front_level_id'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/VuforiaImageGroup.vue

@@ -64,7 +64,15 @@
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                        vuforiaDataName:
+                    [
+                                                {required: true, message: '请输入 识别图数据名称', trigger: 'blur'},
+                                                                    ],
+                                                                vuforiaName:
+                    [
+                                                {required: true, message: '请输入 识别图集名称', trigger: 'blur'},
+                                                                    ],
+                                                                                                                        },
                                                                                                     subColumn: '',
             subValue: '',
         }

src/main/vue/src/pages/VuforiaImageGroups.vue

@@ -43,7 +43,14 @@
                     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('vuforiaDataName')"
                                 prop="vuforiaDataName"
@@ -220,7 +227,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '识别图数据名称',
                                 value: 'vuforiaDataName',
                                 show: true
@@ -253,7 +265,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '识别图数据名称',
                                 value: 'vuforia_data_name'
                             },

src/main/vue/src/pages/VuforiaImageType.vue

@@ -64,7 +64,11 @@
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                        typeName:
+                    [
+                                                {required: true, message: '请输入 识别类型名称', trigger: 'blur'},
+                                                                    ],
+                                                                                                                                                    },
                                                                                                     subColumn: '',
             subValue: '',
         }

src/main/vue/src/pages/VuforiaImageTypes.vue

@@ -43,7 +43,14 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label=""
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('typeName')"
                                 prop="typeName"
@@ -220,7 +227,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: '',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '识别类型名称',
                                 value: 'typeName',
                                 show: true
@@ -253,7 +265,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: '',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '识别类型名称',
                                 value: 'type_name'
                             },

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

@@ -325,6 +325,16 @@ const router = new Router({
                     path: '/aimPlacePositionLevels',
                     name: 'AimPlacePositionLevels',
                     component: () => import('../pages/AimPlacePositionLevels')
+                },
+                {
+                    path: '/cityInfo',
+                    name: 'CityInfo',
+                    component: () => import('../pages/CityInfo')
+                },
+                {
+                    path: '/cityInfos',
+                    name: 'CityInfos',
+                    component: () => import('../pages/CityInfos')
                 }
                 /**INSERT_LOCATION**/
             ]