添加字段20181205

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

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

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

@@ -0,0 +1,572 @@
+<?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.AimTemplateAimMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.AimTemplateAim">
+        <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="aim_name" property="aimName" jdbcType="VARCHAR"/>
+        <result column="icon" property="icon" jdbcType="VARCHAR"/>
+        <result column="icon_rank" property="iconRank" jdbcType="INTEGER"/>
+        <result column="alone_flag" property="aloneFlag" jdbcType="VARCHAR"/>
+        <result column="auto_play" property="autoPlay" jdbcType="VARCHAR"/>
+        <result column="auto_display" property="autoDisplay" jdbcType="VARCHAR"/>
+        <result column="show_level" property="showLevel" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="template_id" property="templateId" jdbcType="VARCHAR"/>
+        <result column="power" property="power" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            aim_name,
+
+            icon,
+
+            icon_rank,
+
+            alone_flag,
+
+            auto_play,
+
+            auto_display,
+
+            show_level,
+
+            remark,
+
+            template_id,
+
+            power,
+
+        </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template_aim
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from aim_template_aim
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.AimTemplateAim" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into aim_template_aim
+        <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="aimName!= null">
+                aim_name,
+            </if>
+            <if test="icon!= null">
+                icon,
+            </if>
+            <if test="iconRank!= null">
+                icon_rank,
+            </if>
+            <if test="aloneFlag!= null">
+                alone_flag,
+            </if>
+            <if test="autoPlay!= null">
+                auto_play,
+            </if>
+            <if test="autoDisplay!= null">
+                auto_display,
+            </if>
+            <if test="showLevel!= null">
+                show_level,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="templateId!= null">
+                template_id,
+            </if>
+            <if test="power!= null">
+                power,
+            </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="aimName != null">
+                #{aimName,jdbcType=VARCHAR},
+            </if>
+            <if test="icon != null">
+                #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="iconRank != null">
+                #{iconRank,jdbcType=INTEGER},
+            </if>
+            <if test="aloneFlag != null">
+                #{aloneFlag,jdbcType=VARCHAR},
+            </if>
+            <if test="autoPlay != null">
+                #{autoPlay,jdbcType=VARCHAR},
+            </if>
+            <if test="autoDisplay != null">
+                #{autoDisplay,jdbcType=VARCHAR},
+            </if>
+            <if test="showLevel != null">
+                #{showLevel,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="templateId != null">
+                #{templateId,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                #{power,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.AimTemplateAim">
+        update aim_template_aim
+        <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="aimName != null">
+                aim_name= #{aimName,jdbcType=VARCHAR},
+            </if>
+            <if test="icon != null">
+                icon= #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="iconRank != null">
+                icon_rank= #{iconRank,jdbcType=INTEGER},
+            </if>
+            <if test="aloneFlag != null">
+                alone_flag= #{aloneFlag,jdbcType=VARCHAR},
+            </if>
+            <if test="autoPlay != null">
+                auto_play= #{autoPlay,jdbcType=VARCHAR},
+            </if>
+            <if test="autoDisplay != null">
+                auto_display= #{autoDisplay,jdbcType=VARCHAR},
+            </if>
+            <if test="showLevel != null">
+                show_level= #{showLevel,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="templateId != null">
+                template_id= #{templateId,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                power= #{power,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="queryAimTemplateAimByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.AimTemplateAim">
+        select
+        <include refid="Base_Column_List"/>
+        <if test="record.arNum != null and !&quot;&quot;.equals(record.arNum)">
+            , (SELECT
+            COUNT(aim_template_ar.id)
+            FROM
+            aim_template_ar
+            WHERE
+            aim_template_ar.del_flag = 'N'
+            AND aim_template_ar.template_aim_id = aim_template_aim.id) as arNum
+        </if>
+        from aim_template_aim
+        <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.aimName != null and !&quot;&quot;.equals(record.aimName)">
+                and aim_name = #{record.aimName}
+            </if>
+            <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
+                and icon = #{record.icon}
+            </if>
+            <if test="record.iconRank != null and !&quot;&quot;.equals(record.iconRank)">
+                and icon_rank = #{record.iconRank}
+            </if>
+            <if test="record.aloneFlag != null and !&quot;&quot;.equals(record.aloneFlag)">
+                and alone_flag = #{record.aloneFlag}
+            </if>
+            <if test="record.autoPlay != null and !&quot;&quot;.equals(record.autoPlay)">
+                and auto_play = #{record.autoPlay}
+            </if>
+            <if test="record.autoDisplay != null and !&quot;&quot;.equals(record.autoDisplay)">
+                and auto_display = #{record.autoDisplay}
+            </if>
+            <if test="record.showLevel != null and !&quot;&quot;.equals(record.showLevel)">
+                and show_level = #{record.showLevel}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
+            </if>
+            <if test="record.templateId != null and !&quot;&quot;.equals(record.templateId)">
+                and template_id = #{record.templateId}
+            </if>
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR aim_name LIKE concat('%',#{record.searchKey},'%')
+                    OR icon LIKE concat('%',#{record.searchKey},'%')
+                    OR icon_rank LIKE concat('%',#{record.searchKey},'%')
+                    OR alone_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR auto_play LIKE concat('%',#{record.searchKey},'%')
+                    OR auto_display LIKE concat('%',#{record.searchKey},'%')
+                    OR show_level LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                    OR template_id LIKE concat('%',#{record.searchKey},'%')
+                    OR power LIKE concat('%',#{record.searchKey},'%')
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllAimTemplateAim" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.AimTemplateAim">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template_aim
+        <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="aimName != null and !&quot;&quot;.equals(aimName)">
+                and aim_name = #{aimName}
+            </if>
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+            <if test="iconRank != null and !&quot;&quot;.equals(iconRank)">
+                and icon_rank = #{iconRank}
+            </if>
+            <if test="aloneFlag != null and !&quot;&quot;.equals(aloneFlag)">
+                and alone_flag = #{aloneFlag}
+            </if>
+            <if test="autoPlay != null and !&quot;&quot;.equals(autoPlay)">
+                and auto_play = #{autoPlay}
+            </if>
+            <if test="autoDisplay != null and !&quot;&quot;.equals(autoDisplay)">
+                and auto_display = #{autoDisplay}
+            </if>
+            <if test="showLevel != null and !&quot;&quot;.equals(showLevel)">
+                and show_level = #{showLevel}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="templateId != null and !&quot;&quot;.equals(templateId)">
+                and template_id = #{templateId}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR aim_name LIKE concat('%',#{searchKey},'%')
+                    OR icon LIKE concat('%',#{searchKey},'%')
+                    OR icon_rank LIKE concat('%',#{searchKey},'%')
+                    OR alone_flag LIKE concat('%',#{searchKey},'%')
+                    OR auto_play LIKE concat('%',#{searchKey},'%')
+                    OR auto_display LIKE concat('%',#{searchKey},'%')
+                    OR show_level LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                    OR template_id LIKE concat('%',#{searchKey},'%')
+                    OR power LIKE concat('%',#{searchKey},'%')
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryAimTemplateAim" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.AimTemplateAim">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template_aim
+        <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="aimName != null and !&quot;&quot;.equals(aimName)">
+                and aim_name = #{aimName}
+            </if>
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+            <if test="iconRank != null and !&quot;&quot;.equals(iconRank)">
+                and icon_rank = #{iconRank}
+            </if>
+            <if test="aloneFlag != null and !&quot;&quot;.equals(aloneFlag)">
+                and alone_flag = #{aloneFlag}
+            </if>
+            <if test="autoPlay != null and !&quot;&quot;.equals(autoPlay)">
+                and auto_play = #{autoPlay}
+            </if>
+            <if test="autoDisplay != null and !&quot;&quot;.equals(autoDisplay)">
+                and auto_display = #{autoDisplay}
+            </if>
+            <if test="showLevel != null and !&quot;&quot;.equals(showLevel)">
+                and show_level = #{showLevel}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="templateId != null and !&quot;&quot;.equals(templateId)">
+                and template_id = #{templateId}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE aim_template_aim 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.AimTemplateAim">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template_aim
+        <where>
+            and del_flag = 'N'
+        </where>
+        order by id desc
+    </select>
+</mapper>
+

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

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

@@ -0,0 +1,482 @@
+<?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.AimTemplateArMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.AimTemplateAr" >
+                <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="ar_name" property="arName" jdbcType="VARCHAR" />
+                                <result column="ar_type" property="arType" jdbcType="VARCHAR" />
+                                <result column="activation_mode" property="activationMode" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+                                <result column="template_id" property="templateId" jdbcType="VARCHAR" />
+                                <result column="template_aim_id" property="templateAimId" jdbcType="VARCHAR" />
+                                <result column="power" property="power" jdbcType="VARCHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            ar_name,
+
+            ar_type,
+
+            activation_mode,
+
+            remark,
+
+            template_id,
+
+            template_aim_id,
+
+            power,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from aim_template_ar
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from aim_template_ar
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.AimTemplateAr" useGeneratedKeys="true" keyProperty="id">
+        insert into aim_template_ar
+        <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="arName!= null" >
+                ar_name,
+            </if>
+                <if test="arType!= null" >
+                ar_type,
+            </if>
+                <if test="activationMode!= null" >
+                activation_mode,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+                <if test="templateId!= null" >
+                template_id,
+            </if>
+                <if test="templateAimId!= null" >
+                template_aim_id,
+            </if>
+                <if test="power!= null" >
+                power,
+            </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="arName != null" >
+                #{arName,jdbcType=VARCHAR},
+            </if>
+                    <if test="arType != null" >
+                #{arType,jdbcType=VARCHAR},
+            </if>
+                    <if test="activationMode != null" >
+                #{activationMode,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                    <if test="templateId != null" >
+                #{templateId,jdbcType=VARCHAR},
+            </if>
+                    <if test="templateAimId != null" >
+                #{templateAimId,jdbcType=VARCHAR},
+            </if>
+                    <if test="power != null" >
+                #{power,jdbcType=VARCHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.AimTemplateAr" >
+        update aim_template_ar
+        <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="arName != null" >
+               ar_name= #{arName,jdbcType=VARCHAR},
+            </if>
+                     <if test="arType != null" >
+               ar_type= #{arType,jdbcType=VARCHAR},
+            </if>
+                     <if test="activationMode != null" >
+               activation_mode= #{activationMode,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                     <if test="templateId != null" >
+               template_id= #{templateId,jdbcType=VARCHAR},
+            </if>
+                     <if test="templateAimId != null" >
+               template_aim_id= #{templateAimId,jdbcType=VARCHAR},
+            </if>
+                     <if test="power != null" >
+               power= #{power,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="queryAimTemplateArByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AimTemplateAr">
+        select <include refid="Base_Column_List"/> from aim_template_ar
+        <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.arName != null and !&quot;&quot;.equals(record.arName)">
+                and  ar_name = #{record.arName}
+            </if>
+                     <if test="record.arType != null and !&quot;&quot;.equals(record.arType)">
+                and  ar_type = #{record.arType}
+            </if>
+                     <if test="record.activationMode != null and !&quot;&quot;.equals(record.activationMode)">
+                and  activation_mode = #{record.activationMode}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                     <if test="record.templateId != null and !&quot;&quot;.equals(record.templateId)">
+                and  template_id = #{record.templateId}
+            </if>
+                     <if test="record.templateAimId != null and !&quot;&quot;.equals(record.templateAimId)">
+                and  template_aim_id = #{record.templateAimId}
+            </if>
+                     <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and  power = #{record.power}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  ar_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  ar_type LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  activation_mode LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  template_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  template_aim_id LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  power LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllAimTemplateAr" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AimTemplateAr">
+        select <include refid="Base_Column_List"/> from aim_template_ar
+        <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="arName != null and !&quot;&quot;.equals(arName)">
+                and  ar_name = #{arName}
+            </if>
+                    <if test="arType != null and !&quot;&quot;.equals(arType)">
+                and  ar_type = #{arType}
+            </if>
+                    <if test="activationMode != null and !&quot;&quot;.equals(activationMode)">
+                and  activation_mode = #{activationMode}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="templateId != null and !&quot;&quot;.equals(templateId)">
+                and  template_id = #{templateId}
+            </if>
+                    <if test="templateAimId != null and !&quot;&quot;.equals(templateAimId)">
+                and  template_aim_id = #{templateAimId}
+            </if>
+                    <if test="power != null and !&quot;&quot;.equals(power)">
+                and  power = #{power}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  ar_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  ar_type LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  activation_mode LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  template_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  template_aim_id LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  power LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryAimTemplateAr" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AimTemplateAr">
+        select <include refid="Base_Column_List"/> from aim_template_ar
+        <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="arName != null and !&quot;&quot;.equals(arName)">
+                and ar_name = #{arName}
+            </if>
+                     <if test="arType != null and !&quot;&quot;.equals(arType)">
+                and ar_type = #{arType}
+            </if>
+                     <if test="activationMode != null and !&quot;&quot;.equals(activationMode)">
+                and activation_mode = #{activationMode}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+                     <if test="templateId != null and !&quot;&quot;.equals(templateId)">
+                and template_id = #{templateId}
+            </if>
+                     <if test="templateAimId != null and !&quot;&quot;.equals(templateAimId)">
+                and template_aim_id = #{templateAimId}
+            </if>
+                     <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE aim_template_ar 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.AimTemplateAr">
+        select <include refid="Base_Column_List"/> from aim_template_ar
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

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

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

@@ -0,0 +1,432 @@
+<?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.AimTemplateMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.AimTemplate">
+        <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="template_name" property="templateName" jdbcType="VARCHAR"/>
+        <result column="apply_to" property="applyTo" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+        <result column="power" property="power" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            template_name,
+
+            apply_to,
+
+            remark,
+
+            power,
+
+        </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from aim_template
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.AimTemplate" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into aim_template
+        <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="templateName!= null">
+                template_name,
+            </if>
+            <if test="applyTo!= null">
+                apply_to,
+            </if>
+            <if test="remark!= null">
+                remark,
+            </if>
+            <if test="power!= null">
+                power,
+            </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="templateName != null">
+                #{templateName,jdbcType=VARCHAR},
+            </if>
+            <if test="applyTo != null">
+                #{applyTo,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                #{power,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.AimTemplate">
+        update aim_template
+        <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="templateName != null">
+                template_name= #{templateName,jdbcType=VARCHAR},
+            </if>
+            <if test="applyTo != null">
+                apply_to= #{applyTo,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                power= #{power,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="queryAimTemplateByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.AimTemplate">
+        select
+        <include refid="Base_Column_List"/>
+
+        <if test="record.aimNum != null and !&quot;&quot;.equals(record.aimNum)">
+            , (SELECT
+            COUNT(aim_template_aim.id)
+            FROM
+            aim_template_aim
+            WHERE
+            aim_template_aim.del_flag = 'N'
+            AND aim_template_aim.template_id = aim_template.id) as aimNum
+        </if>
+        from aim_template
+        <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.templateName != null and !&quot;&quot;.equals(record.templateName)">
+                and template_name = #{record.templateName}
+            </if>
+            <if test="record.applyTo != null and !&quot;&quot;.equals(record.applyTo)">
+                and apply_to = #{record.applyTo}
+            </if>
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
+            </if>
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR template_name LIKE concat('%',#{record.searchKey},'%')
+                    OR apply_to LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                </trim>
+            </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllAimTemplate" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.AimTemplate">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template
+        <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="templateName != null and !&quot;&quot;.equals(templateName)">
+                and template_name = #{templateName}
+            </if>
+            <if test="applyTo != null and !&quot;&quot;.equals(applyTo)">
+                and apply_to = #{applyTo}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR template_name LIKE concat('%',#{searchKey},'%')
+                    OR apply_to LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                </trim>
+            </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryAimTemplate" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AimTemplate">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template
+        <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="templateName != null and !&quot;&quot;.equals(templateName)">
+                and template_name = #{templateName}
+            </if>
+            <if test="applyTo != null and !&quot;&quot;.equals(applyTo)">
+                and apply_to = #{applyTo}
+            </if>
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE aim_template 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.AimTemplate">
+        select
+        <include refid="Base_Column_List"/>
+        from aim_template
+        <where>
+            and del_flag = 'N'
+        </where>
+        order by id desc
+    </select>
+</mapper>
+

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

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

@@ -29,6 +29,10 @@
         <result column="remark2" property="remark2" jdbcType="VARCHAR"/>
         <result column="remark3" property="remark3" jdbcType="VARCHAR"/>
         <result column="front_level_id" property="frontLevelId" jdbcType="VARCHAR"/>
+        <result column="type_id" property="typeId" jdbcType="INTEGER"/>
+        <result column="keyword" property="keyword" jdbcType="VARCHAR"/>
+        <result column="power" property="power" jdbcType="VARCHAR"/>
+        <result column="area_map_info" property="areaMapInfo" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -85,6 +89,10 @@
             remark3,
 
             front_level_id,
+            type_id,
+            keyword,
+            power,
+            area_map_info,
 
         </trim>
     </sql>
@@ -183,6 +191,18 @@
             <if test="frontLevelId!= null">
                 front_level_id,
             </if>
+            <if test="typeId!= null">
+                type_id,
+            </if>
+            <if test="keyword!= null">
+                keyword,
+            </if>
+            <if test="power!= null">
+                power,
+            </if>
+            <if test="areaMapInfo!= null">
+                area_map_info,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -266,6 +286,18 @@
             <if test="frontLevelId != null">
                 #{frontLevelId,jdbcType=VARCHAR},
             </if>
+            <if test="typeId != null">
+                #{typeId},
+            </if>
+            <if test="keyword != null">
+                #{keyword,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                #{power,jdbcType=VARCHAR},
+            </if>
+            <if test="areaMapInfo != null">
+                #{areaMapInfo,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandMark">
@@ -352,6 +384,18 @@
             <if test="frontLevelId != null">
                 front_level_id= #{frontLevelId,jdbcType=VARCHAR},
             </if>
+            <if test="typeId != null">
+                type_id= #{typeId},
+            </if>
+            <if test="keyword != null">
+                keyword= #{keyword,jdbcType=VARCHAR},
+            </if>
+            <if test="power != null">
+                power= #{power,jdbcType=VARCHAR},
+            </if>
+            <if test="areaMapInfo != null">
+                area_map_info= #{areaMapInfo,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -450,6 +494,18 @@
             <if test="record.remark3 != null and !&quot;&quot;.equals(record.remark3)">
                 and remark3 = #{record.remark3}
             </if>
+            <if test="record.typeId != null and !&quot;&quot;.equals(record.typeId)">
+                and type_id = #{record.typeId}
+            </if>
+            <if test="record.keyword != null and !&quot;&quot;.equals(record.keyword)">
+                and keyword = #{record.keyword}
+            </if>
+            <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and power = #{record.power}
+            </if>
+            <if test="record.areaMapInfo != null and !&quot;&quot;.equals(record.areaMapInfo)">
+                and area_map_info = #{record.areaMapInfo}
+            </if>
             <if test="record.frontLevelId != null and !&quot;&quot;.equals(record.frontLevelId)">
 
                 and (front_level_id = #{record.frontLevelId}
@@ -481,6 +537,7 @@
                     OR remark2 LIKE concat('%',#{record.searchKey},'%')
                     OR remark3 LIKE concat('%',#{record.searchKey},'%')
                     OR front_level_id LIKE concat('%',#{record.searchKey},'%')
+                    OR keyword LIKE concat('%',#{record.keyword},'%')
                 </trim>
             </if>
 
@@ -641,6 +698,18 @@
             <if test="remark3 != null and !&quot;&quot;.equals(remark3)">
                 and remark3 = #{remark3}
             </if>
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
 
                 and (front_level_id = #{frontLevelId}
@@ -672,6 +741,7 @@
                     OR remark2 LIKE concat('%',#{searchKey},'%')
                     OR remark3 LIKE concat('%',#{searchKey},'%')
                     OR front_level_id LIKE concat('%',#{searchKey},'%')
+                    OR keyword LIKE concat('%',#{keyword},'%')
                 </trim>
             </if>
             <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -816,6 +886,18 @@
             <if test="remark3 != null and !&quot;&quot;.equals(remark3)">
                 and remark3 = #{remark3}
             </if>
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
 
                 and (front_level_id = #{frontLevelId}
@@ -847,6 +929,7 @@
                     OR remark2 LIKE concat('%',#{searchKey},'%')
                     OR remark3 LIKE concat('%',#{searchKey},'%')
                     OR front_level_id LIKE concat('%',#{searchKey},'%')
+                    OR keyword LIKE concat('%',#{keyword},'%')
                 </trim>
             </if>
             <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -989,6 +1072,19 @@
                 and front_level_id = #{frontLevelId}
             </if>
 
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
+
         </where>
         LIMIT 1
     </select>
@@ -1081,6 +1177,19 @@
                 and front_level_id = #{frontLevelId}
             </if>
 
+            <if test="typeId != null and !&quot;&quot;.equals(typeId)">
+                and type_id = #{type_id}
+            </if>
+            <if test="keyword != null and !&quot;&quot;.equals(keyword)">
+                and keyword = #{keyword}
+            </if>
+            <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+            <if test="areaMapInfo != null and !&quot;&quot;.equals(areaMapInfo)">
+                and area_map_info = #{areaMapInfo}
+            </if>
+
         </where>
         LIMIT 1
     </select>

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

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

@@ -0,0 +1,480 @@
+<?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.LandmarkTypeMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.LandmarkType" >
+                <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="type_flag" property="typeFlag" jdbcType="VARCHAR" />
+                                <result column="type_name" property="typeName" jdbcType="VARCHAR" />
+                                <result column="area_name" property="areaName" jdbcType="VARCHAR" />
+                                <result column="thing_name" property="thingName" jdbcType="VARCHAR" />
+                                <result column="icon" property="icon" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+                                <result column="power" property="power" jdbcType="VARCHAR" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            type_flag,
+
+            type_name,
+
+            area_name,
+
+            thing_name,
+
+            icon,
+
+            remark,
+
+            power,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from landmark_type
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from landmark_type
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType" useGeneratedKeys="true" keyProperty="id">
+        insert into landmark_type
+        <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="typeFlag!= null" >
+                type_flag,
+            </if>
+                <if test="typeName!= null" >
+                type_name,
+            </if>
+                <if test="areaName!= null" >
+                area_name,
+            </if>
+                <if test="thingName!= null" >
+                thing_name,
+            </if>
+                <if test="icon!= null" >
+                icon,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+                <if test="power!= null" >
+                power,
+            </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="typeFlag != null" >
+                #{typeFlag,jdbcType=VARCHAR},
+            </if>
+                    <if test="typeName != null" >
+                #{typeName,jdbcType=VARCHAR},
+            </if>
+                    <if test="areaName != null" >
+                #{areaName,jdbcType=VARCHAR},
+            </if>
+                    <if test="thingName != null" >
+                #{thingName,jdbcType=VARCHAR},
+            </if>
+                    <if test="icon != null" >
+                #{icon,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                    <if test="power != null" >
+                #{power,jdbcType=VARCHAR},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandmarkType" >
+        update landmark_type
+        <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="typeFlag != null" >
+               type_flag= #{typeFlag,jdbcType=VARCHAR},
+            </if>
+                     <if test="typeName != null" >
+               type_name= #{typeName,jdbcType=VARCHAR},
+            </if>
+                     <if test="areaName != null" >
+               area_name= #{areaName,jdbcType=VARCHAR},
+            </if>
+                     <if test="thingName != null" >
+               thing_name= #{thingName,jdbcType=VARCHAR},
+            </if>
+                     <if test="icon != null" >
+               icon= #{icon,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                     <if test="power != null" >
+               power= #{power,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="queryLandmarkTypeByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select <include refid="Base_Column_List"/> from landmark_type
+        <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.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and  type_flag = #{record.typeFlag}
+            </if>
+                     <if test="record.typeName != null and !&quot;&quot;.equals(record.typeName)">
+                and  type_name = #{record.typeName}
+            </if>
+                     <if test="record.areaName != null and !&quot;&quot;.equals(record.areaName)">
+                and  area_name = #{record.areaName}
+            </if>
+                     <if test="record.thingName != null and !&quot;&quot;.equals(record.thingName)">
+                and  thing_name = #{record.thingName}
+            </if>
+                     <if test="record.icon != null and !&quot;&quot;.equals(record.icon)">
+                and  icon = #{record.icon}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                     <if test="record.power != null and !&quot;&quot;.equals(record.power)">
+                and  power = #{record.power}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  type_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  area_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  thing_name LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  icon LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                                                                                              </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+    </select>
+    <select id="queryAllLandmarkType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select <include refid="Base_Column_List"/> from landmark_type
+        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and  type_flag = #{typeFlag}
+            </if>
+                    <if test="typeName != null and !&quot;&quot;.equals(typeName)">
+                and  type_name = #{typeName}
+            </if>
+                    <if test="areaName != null and !&quot;&quot;.equals(areaName)">
+                and  area_name = #{areaName}
+            </if>
+                    <if test="thingName != null and !&quot;&quot;.equals(thingName)">
+                and  thing_name = #{thingName}
+            </if>
+                    <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and  icon = #{icon}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="power != null and !&quot;&quot;.equals(power)">
+                and  power = #{power}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  type_flag LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  type_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  area_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  thing_name LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  icon LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
+    <select id="queryLandmarkType" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandmarkType">
+        select <include refid="Base_Column_List"/> from landmark_type
+        <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="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
+            </if>
+                     <if test="typeName != null and !&quot;&quot;.equals(typeName)">
+                and type_name = #{typeName}
+            </if>
+                     <if test="areaName != null and !&quot;&quot;.equals(areaName)">
+                and area_name = #{areaName}
+            </if>
+                     <if test="thingName != null and !&quot;&quot;.equals(thingName)">
+                and thing_name = #{thingName}
+            </if>
+                     <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+                     <if test="power != null and !&quot;&quot;.equals(power)">
+                and power = #{power}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE landmark_type 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.LandmarkType">
+        select <include refid="Base_Column_List"/> from landmark_type
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </where>
+        order by id desc
+    </select>
+</mapper>
+

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

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

@@ -0,0 +1,180 @@
+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 AimGroupInfo{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String power;
+    private String cityId;
+    private String landmarkId;
+    private String areaId;
+    private String thingId;
+    private String groupName;
+    private String aimTemplateId;
+    private String userArea;
+    private String remark;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public String getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+    public String getCityId(){
+        return this.cityId;
+    }
+
+    public void setCityId(String cityId){
+        this.cityId = cityId;
+    }
+    public String getLandmarkId(){
+        return this.landmarkId;
+    }
+
+    public void setLandmarkId(String landmarkId){
+        this.landmarkId = landmarkId;
+    }
+    public String getAreaId(){
+        return this.areaId;
+    }
+
+    public void setAreaId(String areaId){
+        this.areaId = areaId;
+    }
+    public String getThingId(){
+        return this.thingId;
+    }
+
+    public void setThingId(String thingId){
+        this.thingId = thingId;
+    }
+    public String getGroupName(){
+        return this.groupName;
+    }
+
+    public void setGroupName(String groupName){
+        this.groupName = groupName;
+    }
+    public String getAimTemplateId(){
+        return this.aimTemplateId;
+    }
+
+    public void setAimTemplateId(String aimTemplateId){
+        this.aimTemplateId = aimTemplateId;
+    }
+    public String getUserArea(){
+        return this.userArea;
+    }
+
+    public void setUserArea(String userArea){
+        this.userArea = userArea;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

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

@@ -0,0 +1,159 @@
+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 AimTemplate {
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String templateName;
+    private String applyTo;
+    private String remark;
+    private String power;
+
+    private String aimNum;
+
+    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 getTemplateName() {
+        return this.templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getApplyTo() {
+        return this.applyTo;
+    }
+
+    public void setApplyTo(String applyTo) {
+        this.applyTo = applyTo;
+    }
+
+    public String getRemark() {
+        return this.remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPower() {
+        return this.power;
+    }
+
+    public void setPower(String power) {
+        this.power = power;
+    }
+
+    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;
+    }
+
+    public String getAimNum() {
+        return aimNum;
+    }
+
+    public void setAimNum(String aimNum) {
+        this.aimNum = aimNum;
+    }
+}
+

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

@@ -0,0 +1,213 @@
+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 AimTemplateAim {
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String aimName;
+    private String icon;
+    private Integer iconRank;
+    private String aloneFlag;
+    private String autoPlay;
+    private String autoDisplay;
+    private String showLevel;
+    private String remark;
+    private String templateId;
+    private String power;
+
+    private String arNum;
+
+    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 getAimName() {
+        return this.aimName;
+    }
+
+    public void setAimName(String aimName) {
+        this.aimName = aimName;
+    }
+
+    public String getIcon() {
+        return this.icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public Integer getIconRank() {
+        return this.iconRank;
+    }
+
+    public void setIconRank(Integer iconRank) {
+        this.iconRank = iconRank;
+    }
+
+    public String getAloneFlag() {
+        return this.aloneFlag;
+    }
+
+    public void setAloneFlag(String aloneFlag) {
+        this.aloneFlag = aloneFlag;
+    }
+
+    public String getAutoPlay() {
+        return this.autoPlay;
+    }
+
+    public void setAutoPlay(String autoPlay) {
+        this.autoPlay = autoPlay;
+    }
+
+    public String getAutoDisplay() {
+        return this.autoDisplay;
+    }
+
+    public void setAutoDisplay(String autoDisplay) {
+        this.autoDisplay = autoDisplay;
+    }
+
+    public String getShowLevel() {
+        return this.showLevel;
+    }
+
+    public void setShowLevel(String showLevel) {
+        this.showLevel = showLevel;
+    }
+
+    public String getRemark() {
+        return this.remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getTemplateId() {
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getPower() {
+        return this.power;
+    }
+
+    public void setPower(String power) {
+        this.power = power;
+    }
+
+    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;
+    }
+
+    public String getArNum() {
+        return arNum;
+    }
+
+    public void setArNum(String arNum) {
+        this.arNum = arNum;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/model/AimTemplateAr.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 AimTemplateAr{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String arName;
+    private String arType;
+    private String activationMode;
+    private String remark;
+    private String templateId;
+    private String templateAimId;
+    private String power;
+
+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 getArName(){
+        return this.arName;
+    }
+
+    public void setArName(String arName){
+        this.arName = arName;
+    }
+    public String getArType(){
+        return this.arType;
+    }
+
+    public void setArType(String arType){
+        this.arType = arType;
+    }
+    public String getActivationMode(){
+        return this.activationMode;
+    }
+
+    public void setActivationMode(String activationMode){
+        this.activationMode = activationMode;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getTemplateId(){
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId){
+        this.templateId = templateId;
+    }
+    public String getTemplateAimId(){
+        return this.templateAimId;
+    }
+
+    public void setTemplateAimId(String templateAimId){
+        this.templateAimId = templateAimId;
+    }
+    public String getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+
+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/AreaInfo.java

@@ -0,0 +1,260 @@
+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 AreaInfo{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String power;
+    private String cityId;
+    private String landmarkId;
+    private String areaName;
+    private String rankLevel;
+    private String allowEdit;
+    private String allowNavigate;
+    private String publicArea;
+    private String remark;
+    private String icon;
+    private String keyword;
+    private String video;
+    private String textIntroduction;
+    private String url;
+    private String showDistance;
+    private String templateId;
+    private String frontLevelId;
+    private String blockId;
+    private String areaType;
+
+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 getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+    public String getCityId(){
+        return this.cityId;
+    }
+
+    public void setCityId(String cityId){
+        this.cityId = cityId;
+    }
+    public String getLandmarkId(){
+        return this.landmarkId;
+    }
+
+    public void setLandmarkId(String landmarkId){
+        this.landmarkId = landmarkId;
+    }
+    public String getAreaName(){
+        return this.areaName;
+    }
+
+    public void setAreaName(String areaName){
+        this.areaName = areaName;
+    }
+    public String getRankLevel(){
+        return this.rankLevel;
+    }
+
+    public void setRankLevel(String rankLevel){
+        this.rankLevel = rankLevel;
+    }
+    public String getAllowEdit(){
+        return this.allowEdit;
+    }
+
+    public void setAllowEdit(String allowEdit){
+        this.allowEdit = allowEdit;
+    }
+    public String getAllowNavigate(){
+        return this.allowNavigate;
+    }
+
+    public void setAllowNavigate(String allowNavigate){
+        this.allowNavigate = allowNavigate;
+    }
+    public String getPublicArea(){
+        return this.publicArea;
+    }
+
+    public void setPublicArea(String publicArea){
+        this.publicArea = publicArea;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getIcon(){
+        return this.icon;
+    }
+
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+    public String getKeyword(){
+        return this.keyword;
+    }
+
+    public void setKeyword(String keyword){
+        this.keyword = keyword;
+    }
+    public String getVideo(){
+        return this.video;
+    }
+
+    public void setVideo(String video){
+        this.video = video;
+    }
+    public String getTextIntroduction(){
+        return this.textIntroduction;
+    }
+
+    public void setTextIntroduction(String textIntroduction){
+        this.textIntroduction = textIntroduction;
+    }
+    public String getUrl(){
+        return this.url;
+    }
+
+    public void setUrl(String url){
+        this.url = url;
+    }
+    public String getShowDistance(){
+        return this.showDistance;
+    }
+
+    public void setShowDistance(String showDistance){
+        this.showDistance = showDistance;
+    }
+    public String getTemplateId(){
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId){
+        this.templateId = templateId;
+    }
+    public String getFrontLevelId(){
+        return this.frontLevelId;
+    }
+
+    public void setFrontLevelId(String frontLevelId){
+        this.frontLevelId = frontLevelId;
+    }
+    public String getBlockId(){
+        return this.blockId;
+    }
+
+    public void setBlockId(String blockId){
+        this.blockId = blockId;
+    }
+    public String getAreaType(){
+        return this.areaType;
+    }
+
+    public void setAreaType(String areaType){
+        this.areaType = areaType;
+    }
+
+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

@@ -53,6 +53,11 @@ public class LandMark {
     private String lngKey;
     private String latKey;
 
+    private Integer typeId;
+    private String keyword;
+    private String power;
+    private String areaMapInfo;
+
 
     private String idStr;
 
@@ -379,5 +384,37 @@ public class LandMark {
     public void setLatKey(String latKey) {
         this.latKey = latKey;
     }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getPower() {
+        return power;
+    }
+
+    public void setPower(String power) {
+        this.power = power;
+    }
+
+    public String getAreaMapInfo() {
+        return areaMapInfo;
+    }
+
+    public void setAreaMapInfo(String areaMapInfo) {
+        this.areaMapInfo = areaMapInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/LandmarkType.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 LandmarkType{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String typeFlag;
+    private String typeName;
+    private String areaName;
+    private String thingName;
+    private String icon;
+    private String remark;
+    private String power;
+
+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 getTypeFlag(){
+        return this.typeFlag;
+    }
+
+    public void setTypeFlag(String typeFlag){
+        this.typeFlag = typeFlag;
+    }
+    public String getTypeName(){
+        return this.typeName;
+    }
+
+    public void setTypeName(String typeName){
+        this.typeName = typeName;
+    }
+    public String getAreaName(){
+        return this.areaName;
+    }
+
+    public void setAreaName(String areaName){
+        this.areaName = areaName;
+    }
+    public String getThingName(){
+        return this.thingName;
+    }
+
+    public void setThingName(String thingName){
+        this.thingName = thingName;
+    }
+    public String getIcon(){
+        return this.icon;
+    }
+
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+
+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/ThingInfo.java

@@ -0,0 +1,260 @@
+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 ThingInfo{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String power;
+    private String landmarkId;
+    private String thingName;
+    private String thingType;
+    private String rankLevel;
+    private String allowNavigate;
+    private String remark;
+    private String icon;
+    private String keyword;
+    private String image;
+    private String textIntroduction;
+    private String showDistance;
+    private String templateId;
+    private String frontLevelId;
+    private String cityId;
+    private String areaId;
+    private String mapX;
+    private String mapY;
+    private String mapIndex;
+
+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 getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+    public String getLandmarkId(){
+        return this.landmarkId;
+    }
+
+    public void setLandmarkId(String landmarkId){
+        this.landmarkId = landmarkId;
+    }
+    public String getThingName(){
+        return this.thingName;
+    }
+
+    public void setThingName(String thingName){
+        this.thingName = thingName;
+    }
+    public String getThingType(){
+        return this.thingType;
+    }
+
+    public void setThingType(String thingType){
+        this.thingType = thingType;
+    }
+    public String getRankLevel(){
+        return this.rankLevel;
+    }
+
+    public void setRankLevel(String rankLevel){
+        this.rankLevel = rankLevel;
+    }
+    public String getAllowNavigate(){
+        return this.allowNavigate;
+    }
+
+    public void setAllowNavigate(String allowNavigate){
+        this.allowNavigate = allowNavigate;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getIcon(){
+        return this.icon;
+    }
+
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+    public String getKeyword(){
+        return this.keyword;
+    }
+
+    public void setKeyword(String keyword){
+        this.keyword = keyword;
+    }
+    public String getImage(){
+        return this.image;
+    }
+
+    public void setImage(String image){
+        this.image = image;
+    }
+    public String getTextIntroduction(){
+        return this.textIntroduction;
+    }
+
+    public void setTextIntroduction(String textIntroduction){
+        this.textIntroduction = textIntroduction;
+    }
+    public String getShowDistance(){
+        return this.showDistance;
+    }
+
+    public void setShowDistance(String showDistance){
+        this.showDistance = showDistance;
+    }
+    public String getTemplateId(){
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId){
+        this.templateId = templateId;
+    }
+    public String getFrontLevelId(){
+        return this.frontLevelId;
+    }
+
+    public void setFrontLevelId(String frontLevelId){
+        this.frontLevelId = frontLevelId;
+    }
+    public String getCityId(){
+        return this.cityId;
+    }
+
+    public void setCityId(String cityId){
+        this.cityId = cityId;
+    }
+    public String getAreaId(){
+        return this.areaId;
+    }
+
+    public void setAreaId(String areaId){
+        this.areaId = areaId;
+    }
+    public String getMapX(){
+        return this.mapX;
+    }
+
+    public void setMapX(String mapX){
+        this.mapX = mapX;
+    }
+    public String getMapY(){
+        return this.mapY;
+    }
+
+    public void setMapY(String mapY){
+        this.mapY = mapY;
+    }
+    public String getMapIndex(){
+        return this.mapIndex;
+    }
+
+    public void setMapIndex(String mapIndex){
+        this.mapIndex = mapIndex;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimGroupInfo;
+
+
+/**
+*  service接口类
+*/
+public interface AimGroupInfoService{
+
+    List<AimGroupInfo> getAimGroupInfoList(AimGroupInfo record);
+
+    List<AimGroupInfo> getAimGroupInfoByPage(Page page, AimGroupInfo record);
+
+    AimGroupInfo getAimGroupInfoById(String id);
+
+    AimGroupInfo getAimGroupInfo(AimGroupInfo record);
+
+    boolean createAimGroupInfo(AimGroupInfo record);
+
+    boolean deleteAimGroupInfo(AimGroupInfo record);
+
+    boolean updateAimGroupInfo(AimGroupInfo record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimTemplateAim;
+
+
+/**
+*  service接口类
+*/
+public interface AimTemplateAimService{
+
+    List<AimTemplateAim> getAimTemplateAimList(AimTemplateAim record);
+
+    List<AimTemplateAim> getAimTemplateAimByPage(Page page, AimTemplateAim record);
+
+    AimTemplateAim getAimTemplateAimById(String id);
+
+    AimTemplateAim getAimTemplateAim(AimTemplateAim record);
+
+    boolean createAimTemplateAim(AimTemplateAim record);
+
+    boolean deleteAimTemplateAim(AimTemplateAim record);
+
+    boolean updateAimTemplateAim(AimTemplateAim record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimTemplateAr;
+
+
+/**
+*  service接口类
+*/
+public interface AimTemplateArService{
+
+    List<AimTemplateAr> getAimTemplateArList(AimTemplateAr record);
+
+    List<AimTemplateAr> getAimTemplateArByPage(Page page, AimTemplateAr record);
+
+    AimTemplateAr getAimTemplateArById(String id);
+
+    AimTemplateAr getAimTemplateAr(AimTemplateAr record);
+
+    boolean createAimTemplateAr(AimTemplateAr record);
+
+    boolean deleteAimTemplateAr(AimTemplateAr record);
+
+    boolean updateAimTemplateAr(AimTemplateAr record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimTemplate;
+
+
+/**
+*  service接口类
+*/
+public interface AimTemplateService{
+
+    List<AimTemplate> getAimTemplateList(AimTemplate record);
+
+    List<AimTemplate> getAimTemplateByPage(Page page, AimTemplate record);
+
+    AimTemplate getAimTemplateById(String id);
+
+    AimTemplate getAimTemplate(AimTemplate record);
+
+    boolean createAimTemplate(AimTemplate record);
+
+    boolean deleteAimTemplate(AimTemplate record);
+
+    boolean updateAimTemplate(AimTemplate record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AreaInfo;
+
+
+/**
+*  service接口类
+*/
+public interface AreaInfoService{
+
+    List<AreaInfo> getAreaInfoList(AreaInfo record);
+
+    List<AreaInfo> getAreaInfoByPage(Page page, AreaInfo record);
+
+    AreaInfo getAreaInfoById(String id);
+
+    AreaInfo getAreaInfo(AreaInfo record);
+
+    boolean createAreaInfo(AreaInfo record);
+
+    boolean deleteAreaInfo(AreaInfo record);
+
+    boolean updateAreaInfo(AreaInfo record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.LandmarkType;
+
+
+/**
+*  service接口类
+*/
+public interface LandmarkTypeService{
+
+    List<LandmarkType> getLandmarkTypeList(LandmarkType record);
+
+    List<LandmarkType> getLandmarkTypeByPage(Page page, LandmarkType record);
+
+    LandmarkType getLandmarkTypeById(String id);
+
+    LandmarkType getLandmarkType(LandmarkType record);
+
+    boolean createLandmarkType(LandmarkType record);
+
+    boolean deleteLandmarkType(LandmarkType record);
+
+    boolean updateLandmarkType(LandmarkType record);
+}
+

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

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ThingInfo;
+
+
+/**
+*  service接口类
+*/
+public interface ThingInfoService{
+
+    List<ThingInfo> getThingInfoList(ThingInfo record);
+
+    List<ThingInfo> getThingInfoByPage(Page page, ThingInfo record);
+
+    ThingInfo getThingInfoById(String id);
+
+    ThingInfo getThingInfo(ThingInfo record);
+
+    boolean createThingInfo(ThingInfo record);
+
+    boolean deleteThingInfo(ThingInfo record);
+
+    boolean updateThingInfo(ThingInfo record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AimGroupInfoServiceImpl.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.AimGroupInfo;
+import com.izouma.awesomeadmin.service.AimGroupInfoService;
+import com.izouma.awesomeadmin.dao.AimGroupInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AimGroupInfoServiceImpl implements AimGroupInfoService{
+
+    private static Logger logger = Logger.getLogger(AimGroupInfoServiceImpl.class);
+
+    @Autowired
+    private AimGroupInfoMapper aimGroupInfoMapper;
+
+    @Override
+    public List<AimGroupInfo> getAimGroupInfoList(AimGroupInfo record) {
+
+        logger.info("getAimGroupInfoList");
+        try {
+
+        return aimGroupInfoMapper.queryAllAimGroupInfo(record);
+        } catch (Exception e) {
+        logger.error("getAimGroupInfoList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AimGroupInfo> getAimGroupInfoByPage(Page page, AimGroupInfo record) {
+
+        logger.info("getAimGroupInfoByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return aimGroupInfoMapper.queryAimGroupInfoByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAimGroupInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimGroupInfo getAimGroupInfoById(String id) {
+
+        logger.info("getAimGroupInfoyId");
+        try {
+
+            return aimGroupInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAimGroupInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimGroupInfo getAimGroupInfo(AimGroupInfo record) {
+
+        logger.info("getAimGroupInfo");
+        try {
+
+            return aimGroupInfoMapper.queryAimGroupInfo(record);
+        } catch (Exception e) {
+        logger.error("getAimGroupInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAimGroupInfo(AimGroupInfo record) {
+
+        logger.info("createAimGroupInfo");
+        try {
+
+            int updates = aimGroupInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAimGroupInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAimGroupInfo(AimGroupInfo record) {
+
+        logger.info("deleteAimGroupInfo");
+        try {
+
+             int updates = aimGroupInfoMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAimGroupInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAimGroupInfo(AimGroupInfo record) {
+
+        logger.info("updateAimGroupInfo");
+        try {
+
+            int updates = aimGroupInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAimGroupInfo", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AimTemplateAimServiceImpl.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.AimTemplateAim;
+import com.izouma.awesomeadmin.service.AimTemplateAimService;
+import com.izouma.awesomeadmin.dao.AimTemplateAimMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AimTemplateAimServiceImpl implements AimTemplateAimService{
+
+    private static Logger logger = Logger.getLogger(AimTemplateAimServiceImpl.class);
+
+    @Autowired
+    private AimTemplateAimMapper aimTemplateAimMapper;
+
+    @Override
+    public List<AimTemplateAim> getAimTemplateAimList(AimTemplateAim record) {
+
+        logger.info("getAimTemplateAimList");
+        try {
+
+        return aimTemplateAimMapper.queryAllAimTemplateAim(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplateAimList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AimTemplateAim> getAimTemplateAimByPage(Page page, AimTemplateAim record) {
+
+        logger.info("getAimTemplateAimByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return aimTemplateAimMapper.queryAimTemplateAimByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAimTemplateAimByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplateAim getAimTemplateAimById(String id) {
+
+        logger.info("getAimTemplateAimyId");
+        try {
+
+            return aimTemplateAimMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAimTemplateAimById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplateAim getAimTemplateAim(AimTemplateAim record) {
+
+        logger.info("getAimTemplateAim");
+        try {
+
+            return aimTemplateAimMapper.queryAimTemplateAim(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplateAim", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAimTemplateAim(AimTemplateAim record) {
+
+        logger.info("createAimTemplateAim");
+        try {
+
+            int updates = aimTemplateAimMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAimTemplateAim", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAimTemplateAim(AimTemplateAim record) {
+
+        logger.info("deleteAimTemplateAim");
+        try {
+
+             int updates = aimTemplateAimMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAimTemplateAim", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAimTemplateAim(AimTemplateAim record) {
+
+        logger.info("updateAimTemplateAim");
+        try {
+
+            int updates = aimTemplateAimMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAimTemplateAim", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AimTemplateArServiceImpl.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.AimTemplateAr;
+import com.izouma.awesomeadmin.service.AimTemplateArService;
+import com.izouma.awesomeadmin.dao.AimTemplateArMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AimTemplateArServiceImpl implements AimTemplateArService{
+
+    private static Logger logger = Logger.getLogger(AimTemplateArServiceImpl.class);
+
+    @Autowired
+    private AimTemplateArMapper aimTemplateArMapper;
+
+    @Override
+    public List<AimTemplateAr> getAimTemplateArList(AimTemplateAr record) {
+
+        logger.info("getAimTemplateArList");
+        try {
+
+        return aimTemplateArMapper.queryAllAimTemplateAr(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplateArList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AimTemplateAr> getAimTemplateArByPage(Page page, AimTemplateAr record) {
+
+        logger.info("getAimTemplateArByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return aimTemplateArMapper.queryAimTemplateArByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAimTemplateArByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplateAr getAimTemplateArById(String id) {
+
+        logger.info("getAimTemplateAryId");
+        try {
+
+            return aimTemplateArMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAimTemplateArById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplateAr getAimTemplateAr(AimTemplateAr record) {
+
+        logger.info("getAimTemplateAr");
+        try {
+
+            return aimTemplateArMapper.queryAimTemplateAr(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplateAr", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAimTemplateAr(AimTemplateAr record) {
+
+        logger.info("createAimTemplateAr");
+        try {
+
+            int updates = aimTemplateArMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAimTemplateAr", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAimTemplateAr(AimTemplateAr record) {
+
+        logger.info("deleteAimTemplateAr");
+        try {
+
+             int updates = aimTemplateArMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAimTemplateAr", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAimTemplateAr(AimTemplateAr record) {
+
+        logger.info("updateAimTemplateAr");
+        try {
+
+            int updates = aimTemplateArMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAimTemplateAr", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AimTemplateServiceImpl.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.AimTemplate;
+import com.izouma.awesomeadmin.service.AimTemplateService;
+import com.izouma.awesomeadmin.dao.AimTemplateMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AimTemplateServiceImpl implements AimTemplateService{
+
+    private static Logger logger = Logger.getLogger(AimTemplateServiceImpl.class);
+
+    @Autowired
+    private AimTemplateMapper aimTemplateMapper;
+
+    @Override
+    public List<AimTemplate> getAimTemplateList(AimTemplate record) {
+
+        logger.info("getAimTemplateList");
+        try {
+
+        return aimTemplateMapper.queryAllAimTemplate(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplateList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AimTemplate> getAimTemplateByPage(Page page, AimTemplate record) {
+
+        logger.info("getAimTemplateByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return aimTemplateMapper.queryAimTemplateByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAimTemplateByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplate getAimTemplateById(String id) {
+
+        logger.info("getAimTemplateyId");
+        try {
+
+            return aimTemplateMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAimTemplateById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplate getAimTemplate(AimTemplate record) {
+
+        logger.info("getAimTemplate");
+        try {
+
+            return aimTemplateMapper.queryAimTemplate(record);
+        } catch (Exception e) {
+        logger.error("getAimTemplate", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAimTemplate(AimTemplate record) {
+
+        logger.info("createAimTemplate");
+        try {
+
+            int updates = aimTemplateMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAimTemplate", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAimTemplate(AimTemplate record) {
+
+        logger.info("deleteAimTemplate");
+        try {
+
+             int updates = aimTemplateMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAimTemplate", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAimTemplate(AimTemplate record) {
+
+        logger.info("updateAimTemplate");
+        try {
+
+            int updates = aimTemplateMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAimTemplate", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AreaInfoServiceImpl.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.AreaInfo;
+import com.izouma.awesomeadmin.service.AreaInfoService;
+import com.izouma.awesomeadmin.dao.AreaInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AreaInfoServiceImpl implements AreaInfoService{
+
+    private static Logger logger = Logger.getLogger(AreaInfoServiceImpl.class);
+
+    @Autowired
+    private AreaInfoMapper areaInfoMapper;
+
+    @Override
+    public List<AreaInfo> getAreaInfoList(AreaInfo record) {
+
+        logger.info("getAreaInfoList");
+        try {
+
+        return areaInfoMapper.queryAllAreaInfo(record);
+        } catch (Exception e) {
+        logger.error("getAreaInfoList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AreaInfo> getAreaInfoByPage(Page page, AreaInfo record) {
+
+        logger.info("getAreaInfoByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return areaInfoMapper.queryAreaInfoByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAreaInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AreaInfo getAreaInfoById(String id) {
+
+        logger.info("getAreaInfoyId");
+        try {
+
+            return areaInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAreaInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AreaInfo getAreaInfo(AreaInfo record) {
+
+        logger.info("getAreaInfo");
+        try {
+
+            return areaInfoMapper.queryAreaInfo(record);
+        } catch (Exception e) {
+        logger.error("getAreaInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAreaInfo(AreaInfo record) {
+
+        logger.info("createAreaInfo");
+        try {
+
+            int updates = areaInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAreaInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAreaInfo(AreaInfo record) {
+
+        logger.info("deleteAreaInfo");
+        try {
+
+             int updates = areaInfoMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAreaInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAreaInfo(AreaInfo record) {
+
+        logger.info("updateAreaInfo");
+        try {
+
+            int updates = areaInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAreaInfo", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/LandmarkTypeServiceImpl.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.LandmarkType;
+import com.izouma.awesomeadmin.service.LandmarkTypeService;
+import com.izouma.awesomeadmin.dao.LandmarkTypeMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class LandmarkTypeServiceImpl implements LandmarkTypeService{
+
+    private static Logger logger = Logger.getLogger(LandmarkTypeServiceImpl.class);
+
+    @Autowired
+    private LandmarkTypeMapper landmarkTypeMapper;
+
+    @Override
+    public List<LandmarkType> getLandmarkTypeList(LandmarkType record) {
+
+        logger.info("getLandmarkTypeList");
+        try {
+
+        return landmarkTypeMapper.queryAllLandmarkType(record);
+        } catch (Exception e) {
+        logger.error("getLandmarkTypeList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<LandmarkType> getLandmarkTypeByPage(Page page, LandmarkType record) {
+
+        logger.info("getLandmarkTypeByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return landmarkTypeMapper.queryLandmarkTypeByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getLandmarkTypeByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public LandmarkType getLandmarkTypeById(String id) {
+
+        logger.info("getLandmarkTypeyId");
+        try {
+
+            return landmarkTypeMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getLandmarkTypeById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public LandmarkType getLandmarkType(LandmarkType record) {
+
+        logger.info("getLandmarkType");
+        try {
+
+            return landmarkTypeMapper.queryLandmarkType(record);
+        } catch (Exception e) {
+        logger.error("getLandmarkType", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createLandmarkType(LandmarkType record) {
+
+        logger.info("createLandmarkType");
+        try {
+
+            int updates = landmarkTypeMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createLandmarkType", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteLandmarkType(LandmarkType record) {
+
+        logger.info("deleteLandmarkType");
+        try {
+
+             int updates = landmarkTypeMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteLandmarkType", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateLandmarkType(LandmarkType record) {
+
+        logger.info("updateLandmarkType");
+        try {
+
+            int updates = landmarkTypeMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateLandmarkType", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/ThingInfoServiceImpl.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.ThingInfo;
+import com.izouma.awesomeadmin.service.ThingInfoService;
+import com.izouma.awesomeadmin.dao.ThingInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class ThingInfoServiceImpl implements ThingInfoService{
+
+    private static Logger logger = Logger.getLogger(ThingInfoServiceImpl.class);
+
+    @Autowired
+    private ThingInfoMapper thingInfoMapper;
+
+    @Override
+    public List<ThingInfo> getThingInfoList(ThingInfo record) {
+
+        logger.info("getThingInfoList");
+        try {
+
+        return thingInfoMapper.queryAllThingInfo(record);
+        } catch (Exception e) {
+        logger.error("getThingInfoList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<ThingInfo> getThingInfoByPage(Page page, ThingInfo record) {
+
+        logger.info("getThingInfoByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return thingInfoMapper.queryThingInfoByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getThingInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ThingInfo getThingInfoById(String id) {
+
+        logger.info("getThingInfoyId");
+        try {
+
+            return thingInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getThingInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ThingInfo getThingInfo(ThingInfo record) {
+
+        logger.info("getThingInfo");
+        try {
+
+            return thingInfoMapper.queryThingInfo(record);
+        } catch (Exception e) {
+        logger.error("getThingInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createThingInfo(ThingInfo record) {
+
+        logger.info("createThingInfo");
+        try {
+
+            int updates = thingInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createThingInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteThingInfo(ThingInfo record) {
+
+        logger.info("deleteThingInfo");
+        try {
+
+             int updates = thingInfoMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteThingInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateThingInfo(ThingInfo record) {
+
+        logger.info("updateThingInfo");
+        try {
+
+            int updates = thingInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateThingInfo", e);
+        }
+
+        return false;
+    }
+}
+

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

@@ -0,0 +1,166 @@
+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.AimGroupInfo;
+import com.izouma.awesomeadmin.service.AimGroupInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/aimGroupInfo")
+public class AimGroupInfoController {
+
+    @Autowired
+    private AimGroupInfoService aimGroupInfoService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AimGroupInfo record) {
+        List<AimGroupInfo> pp = aimGroupInfoService.getAimGroupInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAimGroupInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAimGroupInfo(@RequestParam(required = false, value = "id") String id) {
+        AimGroupInfo data = aimGroupInfoService.getAimGroupInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AimGroupInfo record) {
+        AimGroupInfo data = aimGroupInfoService.getAimGroupInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AimGroupInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AimGroupInfo> pp =aimGroupInfoService.getAimGroupInfoByPage(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(AimGroupInfo record) {
+        boolean num = aimGroupInfoService.createAimGroupInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAimGroupInfo(AimGroupInfo record) {
+        boolean num = aimGroupInfoService.updateAimGroupInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAimGroupInfo(AimGroupInfo record) {
+
+        boolean num = aimGroupInfoService.deleteAimGroupInfo(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, AimGroupInfo record) throws Exception {
+
+    List<AimGroupInfo> aimGroupInfos = aimGroupInfoService.getAimGroupInfoList(record);
+
+
+        String sheetName = "aim_group_info";
+        String titleName = "点标组数据表";
+        String fileName = "点标组表";
+        int columnNumber = 15;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "权限" ,   "城市ID" ,   "地标ID" ,   "区域ID" ,   "事物ID" ,   "点标组名称" ,   "点标模板" ,   "区域" ,   "备注"  };
+        String[][] dataList = new String[aimGroupInfos.size()][15];
+
+        for (int i = 0; i < aimGroupInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(aimGroupInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(aimGroupInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(aimGroupInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(aimGroupInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(aimGroupInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(aimGroupInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(aimGroupInfos.get(i).getPower());
+                        dataList[i][7] = String.valueOf(aimGroupInfos.get(i).getCityId());
+                        dataList[i][8] = String.valueOf(aimGroupInfos.get(i).getLandmarkId());
+                        dataList[i][9] = String.valueOf(aimGroupInfos.get(i).getAreaId());
+                        dataList[i][10] = String.valueOf(aimGroupInfos.get(i).getThingId());
+                        dataList[i][11] = String.valueOf(aimGroupInfos.get(i).getGroupName());
+                        dataList[i][12] = String.valueOf(aimGroupInfos.get(i).getAimTemplateId());
+                        dataList[i][13] = String.valueOf(aimGroupInfos.get(i).getUserArea());
+                        dataList[i][14] = String.valueOf(aimGroupInfos.get(i).getRemark());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -0,0 +1,167 @@
+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.AimTemplateAim;
+import com.izouma.awesomeadmin.service.AimTemplateAimService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/aimTemplateAim")
+public class AimTemplateAimController {
+
+    @Autowired
+    private AimTemplateAimService aimTemplateAimService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AimTemplateAim record) {
+        List<AimTemplateAim> pp = aimTemplateAimService.getAimTemplateAimList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAimTemplateAim", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAimTemplateAim(@RequestParam(required = false, value = "id") String id) {
+        AimTemplateAim data = aimTemplateAimService.getAimTemplateAimById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AimTemplateAim record) {
+        AimTemplateAim data = aimTemplateAimService.getAimTemplateAim(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AimTemplateAim record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AimTemplateAim> pp =aimTemplateAimService.getAimTemplateAimByPage(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(AimTemplateAim record) {
+        boolean num = aimTemplateAimService.createAimTemplateAim(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAimTemplateAim(AimTemplateAim record) {
+        boolean num = aimTemplateAimService.updateAimTemplateAim(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAimTemplateAim(AimTemplateAim record) {
+
+        boolean num = aimTemplateAimService.deleteAimTemplateAim(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, AimTemplateAim record) throws Exception {
+
+    List<AimTemplateAim> aimTemplateAims = aimTemplateAimService.getAimTemplateAimList(record);
+
+
+        String sheetName = "aim_template_aim";
+        String titleName = "点标模板点标数据表";
+        String fileName = "点标模板点标表";
+        int columnNumber = 16;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "点标名称" ,   "图标" ,   "图标顺序" ,   "是否独占" ,   "自动触发" ,   "自动显示" ,   "显示层级" ,   "备注" ,   "上级模板" ,   "权限"  };
+        String[][] dataList = new String[aimTemplateAims.size()][16];
+
+        for (int i = 0; i < aimTemplateAims.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(aimTemplateAims.get(i).getId());
+                        dataList[i][1] = String.valueOf(aimTemplateAims.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(aimTemplateAims.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(aimTemplateAims.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(aimTemplateAims.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(aimTemplateAims.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(aimTemplateAims.get(i).getAimName());
+                        dataList[i][7] = String.valueOf(aimTemplateAims.get(i).getIcon());
+                        dataList[i][8] = String.valueOf(aimTemplateAims.get(i).getIconRank());
+                        dataList[i][9] = String.valueOf(aimTemplateAims.get(i).getAloneFlag());
+                        dataList[i][10] = String.valueOf(aimTemplateAims.get(i).getAutoPlay());
+                        dataList[i][11] = String.valueOf(aimTemplateAims.get(i).getAutoDisplay());
+                        dataList[i][12] = String.valueOf(aimTemplateAims.get(i).getShowLevel());
+                        dataList[i][13] = String.valueOf(aimTemplateAims.get(i).getRemark());
+                        dataList[i][14] = String.valueOf(aimTemplateAims.get(i).getTemplateId());
+                        dataList[i][15] = String.valueOf(aimTemplateAims.get(i).getPower());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/java/com/izouma/awesomeadmin/web/AimTemplateArController.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.AimTemplateAr;
+import com.izouma.awesomeadmin.service.AimTemplateArService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/aimTemplateAr")
+public class AimTemplateArController {
+
+    @Autowired
+    private AimTemplateArService aimTemplateArService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AimTemplateAr record) {
+        List<AimTemplateAr> pp = aimTemplateArService.getAimTemplateArList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAimTemplateAr", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAimTemplateAr(@RequestParam(required = false, value = "id") String id) {
+        AimTemplateAr data = aimTemplateArService.getAimTemplateArById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AimTemplateAr record) {
+        AimTemplateAr data = aimTemplateArService.getAimTemplateAr(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AimTemplateAr record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AimTemplateAr> pp =aimTemplateArService.getAimTemplateArByPage(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(AimTemplateAr record) {
+        boolean num = aimTemplateArService.createAimTemplateAr(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAimTemplateAr(AimTemplateAr record) {
+        boolean num = aimTemplateArService.updateAimTemplateAr(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAimTemplateAr(AimTemplateAr record) {
+
+        boolean num = aimTemplateArService.deleteAimTemplateAr(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, AimTemplateAr record) throws Exception {
+
+    List<AimTemplateAr> aimTemplateArs = aimTemplateArService.getAimTemplateArList(record);
+
+
+        String sheetName = "aim_template_ar";
+        String titleName = "点标模板AR数据表";
+        String fileName = "点标模板AR表";
+        int columnNumber = 13;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "ar内容名称" ,   "ar类型" ,   "激活方式" ,   "备注" ,   "模板" ,   "模板点标" ,   "权限"  };
+        String[][] dataList = new String[aimTemplateArs.size()][13];
+
+        for (int i = 0; i < aimTemplateArs.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(aimTemplateArs.get(i).getId());
+                        dataList[i][1] = String.valueOf(aimTemplateArs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(aimTemplateArs.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(aimTemplateArs.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(aimTemplateArs.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(aimTemplateArs.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(aimTemplateArs.get(i).getArName());
+                        dataList[i][7] = String.valueOf(aimTemplateArs.get(i).getArType());
+                        dataList[i][8] = String.valueOf(aimTemplateArs.get(i).getActivationMode());
+                        dataList[i][9] = String.valueOf(aimTemplateArs.get(i).getRemark());
+                        dataList[i][10] = String.valueOf(aimTemplateArs.get(i).getTemplateId());
+                        dataList[i][11] = String.valueOf(aimTemplateArs.get(i).getTemplateAimId());
+                        dataList[i][12] = String.valueOf(aimTemplateArs.get(i).getPower());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -0,0 +1,161 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.AimTemplate;
+import com.izouma.awesomeadmin.service.AimTemplateService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/aimTemplate")
+public class AimTemplateController {
+
+    @Autowired
+    private AimTemplateService aimTemplateService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AimTemplate record) {
+        List<AimTemplate> pp = aimTemplateService.getAimTemplateList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAimTemplate", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAimTemplate(@RequestParam(required = false, value = "id") String id) {
+        AimTemplate data = aimTemplateService.getAimTemplateById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AimTemplate record) {
+        AimTemplate data = aimTemplateService.getAimTemplate(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AimTemplate record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AimTemplate> pp =aimTemplateService.getAimTemplateByPage(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(AimTemplate record) {
+        boolean num = aimTemplateService.createAimTemplate(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAimTemplate(AimTemplate record) {
+        boolean num = aimTemplateService.updateAimTemplate(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAimTemplate(AimTemplate record) {
+
+        boolean num = aimTemplateService.deleteAimTemplate(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, AimTemplate record) throws Exception {
+
+    List<AimTemplate> aimTemplates = aimTemplateService.getAimTemplateList(record);
+
+
+        String sheetName = "aim_template";
+        String titleName = "点标模板数据表";
+        String fileName = "点标模板表";
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "模板名称" ,   "适用于" ,   "备注" ,   "权限"  };
+        String[][] dataList = new String[aimTemplates.size()][10];
+
+        for (int i = 0; i < aimTemplates.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(aimTemplates.get(i).getId());
+                        dataList[i][1] = String.valueOf(aimTemplates.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(aimTemplates.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(aimTemplates.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(aimTemplates.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(aimTemplates.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(aimTemplates.get(i).getTemplateName());
+                        dataList[i][7] = String.valueOf(aimTemplates.get(i).getApplyTo());
+                        dataList[i][8] = String.valueOf(aimTemplates.get(i).getRemark());
+                        dataList[i][9] = String.valueOf(aimTemplates.get(i).getPower());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -0,0 +1,176 @@
+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.AreaInfo;
+import com.izouma.awesomeadmin.service.AreaInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/areaInfo")
+public class AreaInfoController {
+
+    @Autowired
+    private AreaInfoService areaInfoService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AreaInfo record) {
+        List<AreaInfo> pp = areaInfoService.getAreaInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAreaInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAreaInfo(@RequestParam(required = false, value = "id") String id) {
+        AreaInfo data = areaInfoService.getAreaInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AreaInfo record) {
+        AreaInfo data = areaInfoService.getAreaInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AreaInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AreaInfo> pp =areaInfoService.getAreaInfoByPage(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(AreaInfo record) {
+        boolean num = areaInfoService.createAreaInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAreaInfo(AreaInfo record) {
+        boolean num = areaInfoService.updateAreaInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAreaInfo(AreaInfo record) {
+
+        boolean num = areaInfoService.deleteAreaInfo(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, AreaInfo record) throws Exception {
+
+    List<AreaInfo> areaInfos = areaInfoService.getAreaInfoList(record);
+
+
+        String sheetName = "area_info";
+        String titleName = "区域数据表";
+        String fileName = "区域表";
+        int columnNumber = 25;
+        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 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "权限" ,   "城市ID" ,   "地标ID" ,   "区域名称" ,   "优先级" ,   "允许编辑" ,   "允许导航" ,   "公共区域" ,   "备注" ,   "ICON" ,   "关键字" ,   "视频" ,   "文字介绍" ,   "官网" ,   "显示距离" ,   "模板ID" ,   "上级ID" ,   "地块ID" ,   "区域类型"  };
+        String[][] dataList = new String[areaInfos.size()][25];
+
+        for (int i = 0; i < areaInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(areaInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(areaInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(areaInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(areaInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(areaInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(areaInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(areaInfos.get(i).getPower());
+                        dataList[i][7] = String.valueOf(areaInfos.get(i).getCityId());
+                        dataList[i][8] = String.valueOf(areaInfos.get(i).getLandmarkId());
+                        dataList[i][9] = String.valueOf(areaInfos.get(i).getAreaName());
+                        dataList[i][10] = String.valueOf(areaInfos.get(i).getRankLevel());
+                        dataList[i][11] = String.valueOf(areaInfos.get(i).getAllowEdit());
+                        dataList[i][12] = String.valueOf(areaInfos.get(i).getAllowNavigate());
+                        dataList[i][13] = String.valueOf(areaInfos.get(i).getPublicArea());
+                        dataList[i][14] = String.valueOf(areaInfos.get(i).getRemark());
+                        dataList[i][15] = String.valueOf(areaInfos.get(i).getIcon());
+                        dataList[i][16] = String.valueOf(areaInfos.get(i).getKeyword());
+                        dataList[i][17] = String.valueOf(areaInfos.get(i).getVideo());
+                        dataList[i][18] = String.valueOf(areaInfos.get(i).getTextIntroduction());
+                        dataList[i][19] = String.valueOf(areaInfos.get(i).getUrl());
+                        dataList[i][20] = String.valueOf(areaInfos.get(i).getShowDistance());
+                        dataList[i][21] = String.valueOf(areaInfos.get(i).getTemplateId());
+                        dataList[i][22] = String.valueOf(areaInfos.get(i).getFrontLevelId());
+                        dataList[i][23] = String.valueOf(areaInfos.get(i).getBlockId());
+                        dataList[i][24] = String.valueOf(areaInfos.get(i).getAreaType());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -1,21 +1,23 @@
 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 com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
 *  controller类
@@ -30,7 +32,7 @@ public class CityInfoController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
+    //@RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(CityInfo record) {

src/main/java/com/izouma/awesomeadmin/web/LandmarkTypeController.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.LandmarkType;
+import com.izouma.awesomeadmin.service.LandmarkTypeService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/landmarkType")
+public class LandmarkTypeController {
+
+    @Autowired
+    private LandmarkTypeService landmarkTypeService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(LandmarkType record) {
+        List<LandmarkType> pp = landmarkTypeService.getLandmarkTypeList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getLandmarkType", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getLandmarkType(@RequestParam(required = false, value = "id") String id) {
+        LandmarkType data = landmarkTypeService.getLandmarkTypeById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(LandmarkType record) {
+        LandmarkType data = landmarkTypeService.getLandmarkType(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, LandmarkType record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<LandmarkType> pp =landmarkTypeService.getLandmarkTypeByPage(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(LandmarkType record) {
+        boolean num = landmarkTypeService.createLandmarkType(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateLandmarkType(LandmarkType record) {
+        boolean num = landmarkTypeService.updateLandmarkType(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteLandmarkType(LandmarkType record) {
+
+        boolean num = landmarkTypeService.deleteLandmarkType(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, LandmarkType record) throws Exception {
+
+    List<LandmarkType> landmarkTypes = landmarkTypeService.getLandmarkTypeList(record);
+
+
+        String sheetName = "landmark_type";
+        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" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "类别类型" ,   "类别名称" ,   "区域命名" ,   "事物命名" ,   "icon" ,   "备注" ,   "权限"  };
+        String[][] dataList = new String[landmarkTypes.size()][13];
+
+        for (int i = 0; i < landmarkTypes.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(landmarkTypes.get(i).getId());
+                        dataList[i][1] = String.valueOf(landmarkTypes.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(landmarkTypes.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(landmarkTypes.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(landmarkTypes.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(landmarkTypes.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(landmarkTypes.get(i).getTypeFlag());
+                        dataList[i][7] = String.valueOf(landmarkTypes.get(i).getTypeName());
+                        dataList[i][8] = String.valueOf(landmarkTypes.get(i).getAreaName());
+                        dataList[i][9] = String.valueOf(landmarkTypes.get(i).getThingName());
+                        dataList[i][10] = String.valueOf(landmarkTypes.get(i).getIcon());
+                        dataList[i][11] = String.valueOf(landmarkTypes.get(i).getRemark());
+                        dataList[i][12] = String.valueOf(landmarkTypes.get(i).getPower());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -0,0 +1,176 @@
+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.ThingInfo;
+import com.izouma.awesomeadmin.service.ThingInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/thingInfo")
+public class ThingInfoController {
+
+    @Autowired
+    private ThingInfoService thingInfoService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(ThingInfo record) {
+        List<ThingInfo> pp = thingInfoService.getThingInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getThingInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getThingInfo(@RequestParam(required = false, value = "id") String id) {
+        ThingInfo data = thingInfoService.getThingInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(ThingInfo record) {
+        ThingInfo data = thingInfoService.getThingInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, ThingInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<ThingInfo> pp =thingInfoService.getThingInfoByPage(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(ThingInfo record) {
+        boolean num = thingInfoService.createThingInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateThingInfo(ThingInfo record) {
+        boolean num = thingInfoService.updateThingInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteThingInfo(ThingInfo record) {
+
+        boolean num = thingInfoService.deleteThingInfo(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, ThingInfo record) throws Exception {
+
+    List<ThingInfo> thingInfos = thingInfoService.getThingInfoList(record);
+
+
+        String sheetName = "thing_info";
+        String titleName = "事物数据表";
+        String fileName = "事物表";
+        int columnNumber = 25;
+        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 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "权限" ,   "地标ID" ,   "事物名称" ,   "事物类型" ,   "优先级" ,   "允许导航" ,   "备注" ,   "ICON" ,   "关键字" ,   "图片" ,   "文字描述" ,   "显示距离" ,   "点标模板" ,   "上级ID" ,   "城市ID" ,   "区域ID" ,   "X" ,   "Y" ,   "index"  };
+        String[][] dataList = new String[thingInfos.size()][25];
+
+        for (int i = 0; i < thingInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(thingInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(thingInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(thingInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(thingInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(thingInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(thingInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(thingInfos.get(i).getPower());
+                        dataList[i][7] = String.valueOf(thingInfos.get(i).getLandmarkId());
+                        dataList[i][8] = String.valueOf(thingInfos.get(i).getThingName());
+                        dataList[i][9] = String.valueOf(thingInfos.get(i).getThingType());
+                        dataList[i][10] = String.valueOf(thingInfos.get(i).getRankLevel());
+                        dataList[i][11] = String.valueOf(thingInfos.get(i).getAllowNavigate());
+                        dataList[i][12] = String.valueOf(thingInfos.get(i).getRemark());
+                        dataList[i][13] = String.valueOf(thingInfos.get(i).getIcon());
+                        dataList[i][14] = String.valueOf(thingInfos.get(i).getKeyword());
+                        dataList[i][15] = String.valueOf(thingInfos.get(i).getImage());
+                        dataList[i][16] = String.valueOf(thingInfos.get(i).getTextIntroduction());
+                        dataList[i][17] = String.valueOf(thingInfos.get(i).getShowDistance());
+                        dataList[i][18] = String.valueOf(thingInfos.get(i).getTemplateId());
+                        dataList[i][19] = String.valueOf(thingInfos.get(i).getFrontLevelId());
+                        dataList[i][20] = String.valueOf(thingInfos.get(i).getCityId());
+                        dataList[i][21] = String.valueOf(thingInfos.get(i).getAreaId());
+                        dataList[i][22] = String.valueOf(thingInfos.get(i).getMapX());
+                        dataList[i][23] = String.valueOf(thingInfos.get(i).getMapY());
+                        dataList[i][24] = String.valueOf(thingInfos.get(i).getMapIndex());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/AimGroupInfo.vue

@@ -0,0 +1,251 @@
+<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="cityId" label="城市ID">
+                <template>
+                    <el-select v-model="formData.cityId" clearable  placeholder="请选择" :disabled="'cityId'==subColumn">
+                        <el-option
+                                v-for="item in cityIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="landmarkId" label="地标ID">
+                <template>
+                    <el-select v-model="formData.landmarkId" clearable  placeholder="请选择" :disabled="'landmarkId'==subColumn">
+                        <el-option
+                                v-for="item in landmarkIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="areaId" label="区域ID">
+                <template>
+                    <el-select v-model="formData.areaId" clearable  placeholder="请选择" :disabled="'areaId'==subColumn">
+                        <el-option
+                                v-for="item in areaIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="thingId" label="事物ID">
+                <template>
+                    <el-select v-model="formData.thingId" clearable  placeholder="请选择" :disabled="'thingId'==subColumn">
+                        <el-option
+                                v-for="item in thingIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="groupName" label="点标组名称">
+                <el-input v-model="formData.groupName" :disabled="'groupName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="aimTemplateId" label="点标模板">
+                <template>
+                    <el-select v-model="formData.aimTemplateId" clearable  placeholder="请选择" :disabled="'aimTemplateId'==subColumn">
+                        <el-option
+                                v-for="item in aimTemplateIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="userArea" label="区域">
+                <el-input v-model="formData.userArea" :disabled="'userArea'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/aimGroupInfo/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/cityInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.cityIdOptions.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.landmarkIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/areaInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.areaIdOptions.push({label: item.areaName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/thingInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.thingIdOptions.push({label: item.thingName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                
+
+
+                        this.$http.get({
+                        url:'/aimTemplate/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.aimTemplateIdOptions.push({label: item.templateName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                cityIdOptions:[],
+                                            landmarkIdOptions:[],
+                                            areaIdOptions:[],
+                                            thingIdOptions:[],
+                                                    aimTemplateIdOptions:[],
+                                                subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/aimGroupInfo/update' : '/aimGroupInfo/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: '/aimGroupInfo/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/AimGroupInfos.vue

@@ -0,0 +1,535 @@
+<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:'/aimGroupInfo',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('cityId')"
+                                prop="cityId"
+                                label="城市ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('landmarkId')"
+                                prop="landmarkId"
+                                label="地标ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('areaId')"
+                                prop="areaId"
+                                label="区域ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('thingId')"
+                                prop="thingId"
+                                label="事物ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('groupName')"
+                                prop="groupName"
+                                label="点标组名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('aimTemplateId')"
+                                prop="aimTemplateId"
+                                label="点标模板"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('userArea')"
+                                prop="userArea"
+                                label="区域"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                                                                        {
+                                label: '城市ID',
+                                value: 'cityId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'landmarkId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '区域ID',
+                                value: 'areaId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '事物ID',
+                                value: 'thingId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '点标组名称',
+                                value: 'groupName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '点标模板',
+                                value: 'aimTemplateId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '区域',
+                                value: 'userArea',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                                                                        {
+                                label: '城市ID',
+                                value: 'city_id'
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'landmark_id'
+                            },
+                                                                                                {
+                                label: '区域ID',
+                                value: 'area_id'
+                            },
+                                                                                                {
+                                label: '事物ID',
+                                value: 'thing_id'
+                            },
+                                                                                                {
+                                label: '点标组名称',
+                                value: 'group_name'
+                            },
+                                                                                                {
+                                label: '点标模板',
+                                value: 'aim_template_id'
+                            },
+                                                                                                {
+                                label: '区域',
+                                value: 'user_area'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/aimGroupInfo/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: '/aimGroupInfo',
+                    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 + "/aimGroupInfo/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: '/aimGroupInfo/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/AimTemplate.vue

@@ -0,0 +1,115 @@
+<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="templateName" label="模板名称">
+                <el-input v-model="formData.templateName" :disabled="'templateName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="applyTo" label="适用于">
+                <el-input v-model="formData.applyTo" :disabled="'applyTo'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                    <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/aimTemplate/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                        templateName:
+                    [
+                                                {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));
+                this.$http.post({
+                    url: this.formData.id ? '/aimTemplate/update' : '/aimTemplate/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: '/aimTemplate/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/AimTemplateAim.vue

@@ -0,0 +1,152 @@
+<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="aimName" label="点标名称">
+                <el-input v-model="formData.aimName" :disabled="'aimName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="icon" label="图标">
+                <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="icon" label="图标">
+                <el-input v-model="formData.icon" :disabled="'icon'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="iconRank" label="图标顺序">
+                <el-input type="number" v-model="formData.iconRank" :disabled="'iconRank'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="aloneFlag" label="是否独占">
+                <el-switch v-model="formData.aloneFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'aloneFlag'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="autoPlay" label="自动触发">
+                <el-switch v-model="formData.autoPlay" active-color="#13ce66" inactive-color="#ff4949" :disabled="'autoPlay'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="autoDisplay" label="自动显示">
+                <el-switch v-model="formData.autoDisplay" active-color="#13ce66" inactive-color="#ff4949" :disabled="'autoDisplay'==subColumn">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="showLevel" label="显示层级">
+                <el-input type="number" v-model="formData.showLevel" :disabled="'showLevel'==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="templateId" label="上级模板">
+                <el-input v-model="formData.templateId" :disabled="'templateId'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/aimTemplateAim/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.aloneFlag = this.formData.aloneFlag == 'Y' ? true : false;
+                    this.formData.autoDisplay = this.formData.autoDisplay == 'Y' ? true : false;
+                    this.formData.autoPlay = this.formData.autoPlay == 'Y' ? true : false;
+
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                iconRank: 1,
+                showLevel: 1,
+            },
+            rules: {
+                aimName:
+                    [
+                        { 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.aloneFlag = this.formData.aloneFlag ? 'Y' : 'N';
+            data.autoDisplay = this.formData.autoDisplay ? 'Y' : 'N';
+            data.autoPlay = this.formData.autoPlay ? 'Y' : 'N';
+
+            this.$http.post({
+                url: this.formData.id ? '/aimTemplateAim/update' : '/aimTemplateAim/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: '/aimTemplateAim/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/AimTemplateAims.vue

@@ -0,0 +1,495 @@
+<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:'/aimTemplateAim',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('aimName')" prop="aimName" label="点标名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arNum')" prop="arNum" label="AR内容数量" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('icon')" prop="icon" label="图标" min-width="100">
+                <template slot-scope="{row}" v-if="row.icon">
+                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('iconRank')" prop="iconRank" label="图标顺序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('aloneFlag')" prop="aloneFlag" label="是否独占" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('autoPlay')" prop="autoPlay" label="自动触发" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('autoDisplay')" prop="autoDisplay" label="自动显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('showLevel')" prop="showLevel" 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('templateId')" prop="templateId" label="上级模板" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="240">
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/AimTemplateArs',query:{column:scope.row.id+',templateAimId'}})" type="primary" size="small" plain>AR内容
+                    </el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '点标名称',
+                    value: 'aimName',
+                    show: true
+                },
+                {
+                    label: 'AR内容数量',
+                    value: 'arNum',
+                    show: true
+                },
+                {
+                    label: '图标',
+                    value: 'icon',
+                    show: true
+                },
+                {
+                    label: '图标顺序',
+                    value: 'iconRank',
+                    show: true
+                },
+                {
+                    label: '是否独占',
+                    value: 'aloneFlag',
+                    show: true
+                },
+                {
+                    label: '自动触发',
+                    value: 'autoPlay',
+                    show: true
+                },
+                {
+                    label: '自动显示',
+                    value: 'autoDisplay',
+                    show: true
+                },
+                {
+                    label: '显示层级',
+                    value: 'showLevel',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '上级模板',
+                    value: 'templateId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '点标名称',
+                    value: 'aim_name'
+                },
+                {
+                    label: '图标',
+                    value: 'icon'
+                },
+                {
+                    label: '图标顺序',
+                    value: 'icon_rank'
+                },
+                {
+                    label: '是否独占',
+                    value: 'alone_flag'
+                },
+                {
+                    label: '自动触发',
+                    value: 'auto_play'
+                },
+                {
+                    label: '自动显示',
+                    value: 'auto_display'
+                },
+                {
+                    label: '显示层级',
+                    value: 'show_level'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '上级模板',
+                    value: 'template_id'
+                },
+            ],
+            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,
+                arNum: 1,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/aimTemplateAim/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: '/aimTemplateAim',
+                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 + "/aimTemplateAim/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: '/aimTemplateAim/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/AimTemplateAr.vue

@@ -0,0 +1,174 @@
+<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="arName" label="ar内容名称">
+                <el-input v-model="formData.arName" :disabled="'arName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="arType" label="ar类型">
+                <template>
+                    <el-select v-model="formData.arType" clearable  placeholder="请选择" :disabled="'arType'==subColumn">
+                        <el-option
+                                v-for="item in arTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="activationMode" label="激活方式">
+                <template>
+                    <el-select v-model="formData.activationMode" clearable  placeholder="请选择" :disabled="'activationMode'==subColumn">
+                        <el-option
+                                v-for="item in activationModeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </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="templateId" label="模板">
+                <el-input v-model="formData.templateId" :disabled="'templateId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="templateAimId" label="模板点标">
+                <el-input v-model="formData.templateAimId" :disabled="'templateAimId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                    <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/aimTemplateAr/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                        arName:
+                    [
+                                                {required: true, message: '请输入 ar内容名称', trigger: 'blur'},
+                                                                    ],
+                                                                                                                                                                                                            },
+                                                                                arTypeOptions:[{
+          value: '1001',
+          label: '商铺基本信息'
+        }, {
+          value: '1002',
+          label: '类型2'
+        }, {
+          value: '1003',
+          label: '类型3'
+        }, {
+          value: '1004',
+          label: '类型4'
+        }, {
+          value: '1005',
+          label: '类型5'
+        }],
+                                            activationModeOptions:[{
+          value: '1',
+          label: '直接出现'
+        }, {
+          value: '2',
+          label: '渐变'
+        }, {
+          value: '3',
+          label: '由上向下飞入'
+        }, {
+          value: '4',
+          label: '由左至右飞入'
+        }, {
+          value: '5',
+          label: '由右至左飞入'
+        }],
+                                                                subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/aimTemplateAr/update' : '/aimTemplateAr/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: '/aimTemplateAr/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/AimTemplateArs.vue

@@ -0,0 +1,503 @@
+<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:'/aimTemplateAr',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('arName')"
+                                prop="arName"
+                                label="ar内容名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('arType')"
+                                prop="arType"
+                                label="ar类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('activationMode')"
+                                prop="activationMode"
+                                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('templateId')"
+                                prop="templateId"
+                                label="模板"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('templateAimId')"
+                                prop="templateAimId"
+                                label="模板点标"
+                                min-width="100">
+                        </el-table-column>
+                                                                                        <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="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: 'ar内容名称',
+                                value: 'arName',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'ar类型',
+                                value: 'arType',
+                                show: true
+                            },
+                                                                                                {
+                                label: '激活方式',
+                                value: 'activationMode',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: '模板',
+                                value: 'templateId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '模板点标',
+                                value: 'templateAimId',
+                                show: true
+                            },
+                                                                                                        ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
+                                label: 'ar内容名称',
+                                value: 'ar_name'
+                            },
+                                                                                                {
+                                label: 'ar类型',
+                                value: 'ar_type'
+                            },
+                                                                                                {
+                                label: '激活方式',
+                                value: 'activation_mode'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: '模板',
+                                value: 'template_id'
+                            },
+                                                                                                {
+                                label: '模板点标',
+                                value: 'template_aim_id'
+                            },
+                                                                                                        ],
+                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: '/aimTemplateAr/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: '/aimTemplateAr',
+                    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 + "/aimTemplateAr/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: '/aimTemplateAr/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/AimTemplates.vue

@@ -0,0 +1,419 @@
+<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:'/aimTemplate',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('templateName')" prop="templateName" label="模板名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('applyTo')" prop="applyTo" label="适用于" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('aimNum')" prop="aimNum" label="点标数量" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/AimTemplateAims',query:{column:scope.row.id+',templateId'}})" type="primary" size="small" plain>点标
+                    </el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '模板名称',
+                    value: 'templateName',
+                    show: true
+                },
+                {
+                    label: '适用于',
+                    value: 'applyTo',
+                    show: true
+                },
+                {
+                    label: '点标数量',
+                    value: 'aimNum',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '模板名称',
+                    value: 'template_name'
+                },
+                {
+                    label: '适用于',
+                    value: 'apply_to'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+                aimNum: 1,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/aimTemplate/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: '/aimTemplate',
+                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 + "/aimTemplate/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: '/aimTemplate/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/AreaInfo.vue

@@ -0,0 +1,271 @@
+<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="cityId" label="城市ID">
+                <template>
+                    <el-select v-model="formData.cityId" clearable  placeholder="请选择" :disabled="'cityId'==subColumn">
+                        <el-option
+                                v-for="item in cityIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="landmarkId" label="地标ID">
+                <template>
+                    <el-select v-model="formData.landmarkId" clearable  placeholder="请选择" :disabled="'landmarkId'==subColumn">
+                        <el-option
+                                v-for="item in landmarkIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="areaName" label="区域名称">
+                <el-input v-model="formData.areaName" :disabled="'areaName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="rankLevel" label="优先级">
+                <el-input type="number" v-model="formData.rankLevel" :disabled="'rankLevel'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="allowEdit" label="允许编辑">
+                <el-switch
+                        v-model="formData.allowEdit"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        :disabled="'allowEdit'==subColumn">
+                </el-switch>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="allowNavigate" label="允许导航">
+                <el-switch
+                        v-model="formData.allowNavigate"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        :disabled="'allowNavigate'==subColumn">
+                </el-switch>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="publicArea" label="公共区域">
+                <el-switch
+                        v-model="formData.publicArea"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        :disabled="'publicArea'==subColumn">
+                </el-switch>
+            </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="icon" label="ICON">
+                 <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                <el-form-item prop="keyword" label="关键字">
+                <el-input v-model="formData.keyword" :disabled="'keyword'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="video" label="视频">
+                 <single-upload v-model="formData.video" :disabled="'video'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                                    <el-form-item prop="textIntroduction" label="文字介绍">
+                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="'textIntroduction'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                        <el-form-item prop="url" label="官网">
+                <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="showDistance" label="显示距离">
+                <el-input type="number" v-model="formData.showDistance" :disabled="'showDistance'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="templateId" label="模板ID">
+                <template>
+                    <el-select v-model="formData.templateId" clearable  placeholder="请选择" :disabled="'templateId'==subColumn">
+                        <el-option
+                                v-for="item in templateIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </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 prop="blockId" label="地块ID">
+                <el-input v-model="formData.blockId" :disabled="'blockId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="areaType" label="区域类型">
+                <template>
+                    <el-select v-model="formData.areaType" clearable  placeholder="请选择" :disabled="'areaType'==subColumn">
+                        <el-option
+                                v-for="item in areaTypeOptions"
+                                :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>
+            </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: '/areaInfo/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/cityInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.cityIdOptions.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.landmarkIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/aimTemplate/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.templateIdOptions.push({label: item.templateName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                            
+
+
+                        this.$http.get({
+                        url:'/landmarkType/all?typeFlag=2'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.areaTypeOptions.push({label: item.typeName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                cityIdOptions:[],
+                                            landmarkIdOptions:[],
+                                                                                                                                            templateIdOptions:[],
+                                                            areaTypeOptions:[],
+                                subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/areaInfo/update' : '/areaInfo/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: '/areaInfo/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/AreaInfos.vue

@@ -0,0 +1,703 @@
+<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:'/areaInfo',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=""
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                                                                                                        
+                                            <el-table-column
+                                v-if="isColumnShow('cityId')"
+                                prop="cityId"
+                                label="城市ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('landmarkId')"
+                                prop="landmarkId"
+                                label="地标ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('areaName')"
+                                prop="areaName"
+                                label="区域名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rankLevel')"
+                                prop="rankLevel"
+                                label="优先级"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('allowEdit')"
+                                prop="allowEdit"
+                                label="允许编辑"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('allowNavigate')"
+                                prop="allowNavigate"
+                                label="允许导航"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('publicArea')"
+                                prop="publicArea"
+                                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('icon')"
+                                prop="icon"
+                                label="ICON"
+                                min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
+                        </el-table-column>
+                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('keyword')"
+                                prop="keyword"
+                                label="关键字"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('video')"
+                                prop="video"
+                                label="视频"
+                                min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.video" @click="showImg(row.video)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
+                        </el-table-column>
+                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('textIntroduction')"
+                                prop="textIntroduction"
+                                label="文字介绍"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('url')"
+                                prop="url"
+                                label="官网"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('showDistance')"
+                                prop="showDistance"
+                                label="显示距离"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('templateId')"
+                                prop="templateId"
+                                label="模板ID"
+                                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
+                                v-if="isColumnShow('blockId')"
+                                prop="blockId"
+                                label="地块ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('areaType')"
+                                prop="areaType"
+                                label="区域类型"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="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: '',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                                                                        {
+                                label: '城市ID',
+                                value: 'cityId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'landmarkId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '区域名称',
+                                value: 'areaName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '优先级',
+                                value: 'rankLevel',
+                                show: true
+                            },
+                                                                                                {
+                                label: '允许编辑',
+                                value: 'allowEdit',
+                                show: true
+                            },
+                                                                                                {
+                                label: '允许导航',
+                                value: 'allowNavigate',
+                                show: true
+                            },
+                                                                                                {
+                                label: '公共区域',
+                                value: 'publicArea',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'ICON',
+                                value: 'icon',
+                                show: true
+                            },
+                                                                                                {
+                                label: '关键字',
+                                value: 'keyword',
+                                show: true
+                            },
+                                                                                                {
+                                label: '视频',
+                                value: 'video',
+                                show: true
+                            },
+                                                                                                {
+                                label: '文字介绍',
+                                value: 'textIntroduction',
+                                show: true
+                            },
+                                                                                                {
+                                label: '官网',
+                                value: 'url',
+                                show: true
+                            },
+                                                                                                {
+                                label: '显示距离',
+                                value: 'showDistance',
+                                show: true
+                            },
+                                                                                                {
+                                label: '模板ID',
+                                value: 'templateId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'frontLevelId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '地块ID',
+                                value: 'blockId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '区域类型',
+                                value: 'areaType',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                        {
+                                label: '',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                                                                        {
+                                label: '城市ID',
+                                value: 'city_id'
+                            },
+                                                                                                {
+                                label: '地标ID',
+                                value: 'landmark_id'
+                            },
+                                                                                                {
+                                label: '区域名称',
+                                value: 'area_name'
+                            },
+                                                                                                {
+                                label: '优先级',
+                                value: 'rank_level'
+                            },
+                                                                                                {
+                                label: '允许编辑',
+                                value: 'allow_edit'
+                            },
+                                                                                                {
+                                label: '允许导航',
+                                value: 'allow_navigate'
+                            },
+                                                                                                {
+                                label: '公共区域',
+                                value: 'public_area'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: 'ICON',
+                                value: 'icon'
+                            },
+                                                                                                {
+                                label: '关键字',
+                                value: 'keyword'
+                            },
+                                                                                                {
+                                label: '视频',
+                                value: 'video'
+                            },
+                                                                                                {
+                                label: '文字介绍',
+                                value: 'text_introduction'
+                            },
+                                                                                                {
+                                label: '官网',
+                                value: 'url'
+                            },
+                                                                                                {
+                                label: '显示距离',
+                                value: 'show_distance'
+                            },
+                                                                                                {
+                                label: '模板ID',
+                                value: 'template_id'
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'front_level_id'
+                            },
+                                                                                                {
+                                label: '地块ID',
+                                value: 'block_id'
+                            },
+                                                                                                {
+                                label: '区域类型',
+                                value: 'area_type'
+                            },
+                                                            ],
+                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: '/areaInfo/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: '/areaInfo',
+                    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 + "/areaInfo/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: '/areaInfo/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/CityInfo.vue

@@ -28,7 +28,7 @@
                     </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>

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

@@ -5,6 +5,15 @@
             <el-tab-pane label="地标信息" name="1">
                 <div :style="{height:totalHeight-120+'px'}" style="overflow:auto">
                     <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+                        <el-form-item prop="typeId" label="地标类型">
+                            <template>
+                                <el-select v-model="formData.typeId" clearable placeholder="请选择" :disabled="'typeId'==subColumn">
+                                    <el-option v-for="item in typeIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </template>
+                        </el-form-item>
+
                         <el-form-item prop="mapName" label="地标名称">
                             <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
                         </el-form-item>
@@ -85,6 +94,18 @@
                         <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="keyword" label="关键词">
+                            <template>
+                                <div v-for="(item,index) in formData.keyword" style="margin-bottom:10px">
+                                    <el-input  v-model="formData.keyword[index]" style="width:180px" ></el-input>
+                                    <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
+                                </div>
+                                <el-button @click="addKeyword" type="primary">添加</el-button>
+                            </template>
+                        </el-form-item>
+                        <el-form-item prop="areaMapInfo" label="区域地图信息">
+                            <el-input type="textarea" v-model="formData.areaMapInfo"></el-input>
+                        </el-form-item>
                         <el-form-item prop="frontLevelId" label="上级地标ID">
                             <template>
                                 <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
@@ -118,7 +139,7 @@
 
                 <el-container>
                     <el-aside width="50%">
-                        <AimPlacePositions  :MapWidth="formData.mapWidth" ref="PlacePositions" @updatePoint='updatePoint2'></AimPlacePositions>
+                        <AimPlacePositions :MapWidth="formData.mapWidth" ref="PlacePositions" @updatePoint='updatePoint2'></AimPlacePositions>
                     </el-aside>
                     <el-main>
                         <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
@@ -163,6 +184,10 @@ export default {
                         res.data.longitude = this.formData.longitude;
                     }
 
+                    if (res.data.keyword) {
+                        res.data.keyword = res.data.keyword.split(',')
+                    }
+
                     this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -179,6 +204,22 @@ export default {
 
 
 
+        this.$http.get({
+            url: '/landmarkType/all',
+            data: {
+                typeFlag: '1'
+            }
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.typeIdOptions.push({ label: item.typeName, value: item.id });
+                    })
+                }
+            }
+        });
+
         this.$http.get({
             url: '/cityInfo/all'
         }).then(res => {
@@ -214,11 +255,14 @@ export default {
             formData: {
                 latitude: 32.05838,
                 longitude: 118.79647,
+                typeId: '',
+                keyword: [],
             },
             rules: {
             },
             ownedCityIdOptions: [],
             frontLevelIdOptions: [],
+            typeIdOptions: [],
             subColumn: '',
             subValue: '',
             mapDialogVisible: false,
@@ -258,6 +302,8 @@ export default {
         },
         submit() {
             var data = JSON.parse(JSON.stringify(this.formData));
+            data.keyword = data.keyword.join();
+
             this.$http.post({
                 url: this.formData.id ? '/landMark/update' : '/landMark/save',
                 data: data
@@ -300,6 +346,14 @@ export default {
             this.formData.latitude = data.lnglat.lat;
             this.formData.longitude = data.lnglat.lng;
         },
+        onDeleteKeyword(index) {
+            console.log("111")
+            this.formData.keyword.splice(index,1)
+        },
+        addKeyword() {
+            this.formData.keyword.push('')
+            console.log("222")
+        },
     },
     components: {
         CoordinateSelect, AimPlaceContents, AimPlacePositions, VuforiaImageInfos, MapInfo

src/main/vue/src/pages/LandmarkType.vue

@@ -0,0 +1,147 @@
+<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="typeFlag" label="类别类型">
+                <template>
+                    <el-select v-model="formData.typeFlag" clearable placeholder="请选择" :disabled="'typeFlag'==subColumn">
+                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="typeName" label="类别名称">
+                <el-input v-model="formData.typeName" :disabled="'typeName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="areaName" label="区域命名" v-if="formData.typeFlag=='1'">
+                <el-input v-model="formData.areaName" :disabled="'areaName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="thingName" label="事物命名" v-if="formData.typeFlag=='1'">
+                <el-input v-model="formData.thingName" :disabled="'thingName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="icon" label="icon">
+                <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="icon" label="icon">
+                <el-input v-model="formData.icon" :disabled="'icon'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/landmarkType/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
+        }
+
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                typeFlag: '1',
+            },
+            rules: {
+                typeFlag:
+                    [
+                        { required: true, message: '请输入 类别类型', trigger: 'blur' },
+                    ],
+                typeName:
+                    [
+                        { required: true, message: '请输入 类别名称', trigger: 'blur' },
+                    ],
+            },
+            typeFlagOptions: [{
+                value: '1',
+                label: '地标类别'
+            }, {
+                value: '2',
+                label: '区域类别'
+            }, {
+                value: '3',
+                label: '事物类别'
+            }],
+            subColumn: '',
+            subValue: '',
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/landmarkType/update' : '/landmarkType/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: '/landmarkType/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/LandmarkTypes.vue

@@ -0,0 +1,462 @@
+<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:'/landmarkType',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('typeFlag')" prop="typeFlag" label="类别类型" :formatter="TypeFlagFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('typeName')" prop="typeName" label="类别名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('areaName')" prop="areaName" label="区域命名" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('thingName')" prop="thingName" label="事物命名" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('icon')" prop="icon" label="icon" min-width="100">
+                <template slot-scope="{row}" v-if="row.icon">
+                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="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: '类别类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '类别名称',
+                    value: 'typeName',
+                    show: true
+                },
+                {
+                    label: '区域命名',
+                    value: 'areaName',
+                    show: true
+                },
+                {
+                    label: '事物命名',
+                    value: 'thingName',
+                    show: true
+                },
+                {
+                    label: 'icon',
+                    value: 'icon',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '类别类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '类别名称',
+                    value: 'type_name'
+                },
+                {
+                    label: '区域命名',
+                    value: 'area_name'
+                },
+                {
+                    label: '事物命名',
+                    value: 'thing_name'
+                },
+                {
+                    label: 'icon',
+                    value: 'icon'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+            typeFlagOptions: [{
+                value: '1',
+                label: '地标类别'
+            }, {
+                value: '2',
+                label: '区域类别'
+            }, {
+                value: '3',
+                label: '事物类别'
+            }],
+        }
+    },
+    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: '/landmarkType/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: '/landmarkType',
+                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 + "/landmarkType/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: '/landmarkType/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;
+        },
+        TypeFlagFormatter(row, column, cellValue) {
+            var row = this.typeFlagOptions.find(i => i.value === cellValue);
+            return row ? row.label : "";
+
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/ThingInfo.vue

@@ -0,0 +1,286 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="landmarkId" label="地标ID">
+                <template>
+                    <el-select v-model="formData.landmarkId" clearable  placeholder="请选择" :disabled="'landmarkId'==subColumn">
+                        <el-option
+                                v-for="item in landmarkIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="thingName" label="事物名称">
+                <el-input v-model="formData.thingName" :disabled="'thingName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="thingType" label="事物类型">
+                <template>
+                    <el-select v-model="formData.thingType" clearable  placeholder="请选择" :disabled="'thingType'==subColumn">
+                        <el-option
+                                v-for="item in thingTypeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                <el-form-item prop="rankLevel" label="优先级">
+                <el-input type="number" v-model="formData.rankLevel" :disabled="'rankLevel'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="allowNavigate" label="允许导航">
+                <el-switch
+                        v-model="formData.allowNavigate"
+                        active-color="#13ce66"
+                        inactive-color="#ff4949"
+                        :disabled="'allowNavigate'==subColumn">
+                </el-switch>
+            </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="icon" label="ICON">
+                 <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                <el-form-item prop="keyword" label="关键字">
+                <el-input v-model="formData.keyword" :disabled="'keyword'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="image" label="图片">
+                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                                    <el-form-item prop="textIntroduction" label="文字描述">
+                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="'textIntroduction'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="showDistance" label="显示距离">
+                <el-input type="number" v-model="formData.showDistance" :disabled="'showDistance'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="templateId" label="点标模板">
+                <template>
+                    <el-select v-model="formData.templateId" clearable  placeholder="请选择" :disabled="'templateId'==subColumn">
+                        <el-option
+                                v-for="item in templateIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </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 prop="cityId" label="城市ID">
+                <template>
+                    <el-select v-model="formData.cityId" clearable  placeholder="请选择" :disabled="'cityId'==subColumn">
+                        <el-option
+                                v-for="item in cityIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="areaId" label="区域ID">
+                <template>
+                    <el-select v-model="formData.areaId" clearable  placeholder="请选择" :disabled="'areaId'==subColumn">
+                        <el-option
+                                v-for="item in areaIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="mapX" label="X">
+                <el-input v-model="formData.mapX" :disabled="'mapX'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapY" label="Y">
+                <el-input v-model="formData.mapY" :disabled="'mapY'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapIndex" label="index">
+                <el-input v-model="formData.mapIndex" :disabled="'mapIndex'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/thingInfo/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/landMark/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.landmarkIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                
+
+
+                        this.$http.get({
+                        url:'/landmarkType/all?typeFlag=3'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.thingTypeOptions.push({label: item.typeName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                                                    
+
+
+                        this.$http.get({
+                        url:'/aimTemplate/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.templateIdOptions.push({label: item.templateName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                
+
+
+                        this.$http.get({
+                        url:'/cityInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.cityIdOptions.push({label: item.cityName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/areaInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.areaIdOptions.push({label: item.areaName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                            },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                landmarkIdOptions:[],
+                                                    thingTypeOptions:[],
+                                                                                                            templateIdOptions:[],
+                                                    cityIdOptions:[],
+                                            areaIdOptions:[],
+                                                        subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/thingInfo/update' : '/thingInfo/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: '/thingInfo/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/ThingInfos.vue

@@ -0,0 +1,687 @@
+<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:'/thingInfo',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('landmarkId')"
+                                prop="landmarkId"
+                                label="地标ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('thingName')"
+                                prop="thingName"
+                                label="事物名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('thingType')"
+                                prop="thingType"
+                                label="事物类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rankLevel')"
+                                prop="rankLevel"
+                                label="优先级"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('allowNavigate')"
+                                prop="allowNavigate"
+                                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('icon')"
+                                prop="icon"
+                                label="ICON"
+                                min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
+                        </el-table-column>
+                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('keyword')"
+                                prop="keyword"
+                                label="关键字"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('image')"
+                                prop="image"
+                                label="图片"
+                                min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.image" @click="showImg(row.image)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
+                        </el-table-column>
+                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('textIntroduction')"
+                                prop="textIntroduction"
+                                label="文字描述"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('showDistance')"
+                                prop="showDistance"
+                                label="显示距离"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('templateId')"
+                                prop="templateId"
+                                label="点标模板"
+                                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
+                                v-if="isColumnShow('cityId')"
+                                prop="cityId"
+                                label="城市ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('areaId')"
+                                prop="areaId"
+                                label="区域ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('mapX')"
+                                prop="mapX"
+                                label="X"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('mapY')"
+                                prop="mapY"
+                                label="Y"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('mapIndex')"
+                                prop="mapIndex"
+                                label="index"
+                                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: 'landmarkId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '事物名称',
+                                value: 'thingName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '事物类型',
+                                value: 'thingType',
+                                show: true
+                            },
+                                                                                                {
+                                label: '优先级',
+                                value: 'rankLevel',
+                                show: true
+                            },
+                                                                                                {
+                                label: '允许导航',
+                                value: 'allowNavigate',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'ICON',
+                                value: 'icon',
+                                show: true
+                            },
+                                                                                                {
+                                label: '关键字',
+                                value: 'keyword',
+                                show: true
+                            },
+                                                                                                {
+                                label: '图片',
+                                value: 'image',
+                                show: true
+                            },
+                                                                                                {
+                                label: '文字描述',
+                                value: 'textIntroduction',
+                                show: true
+                            },
+                                                                                                {
+                                label: '显示距离',
+                                value: 'showDistance',
+                                show: true
+                            },
+                                                                                                {
+                                label: '点标模板',
+                                value: 'templateId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'frontLevelId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '城市ID',
+                                value: 'cityId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '区域ID',
+                                value: 'areaId',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'X',
+                                value: 'mapX',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'Y',
+                                value: 'mapY',
+                                show: true
+                            },
+                                                                                                {
+                                label: 'index',
+                                value: 'mapIndex',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                                                            {
+                                label: '地标ID',
+                                value: 'landmark_id'
+                            },
+                                                                                                {
+                                label: '事物名称',
+                                value: 'thing_name'
+                            },
+                                                                                                {
+                                label: '事物类型',
+                                value: 'thing_type'
+                            },
+                                                                                                {
+                                label: '优先级',
+                                value: 'rank_level'
+                            },
+                                                                                                {
+                                label: '允许导航',
+                                value: 'allow_navigate'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: 'ICON',
+                                value: 'icon'
+                            },
+                                                                                                {
+                                label: '关键字',
+                                value: 'keyword'
+                            },
+                                                                                                {
+                                label: '图片',
+                                value: 'image'
+                            },
+                                                                                                {
+                                label: '文字描述',
+                                value: 'text_introduction'
+                            },
+                                                                                                {
+                                label: '显示距离',
+                                value: 'show_distance'
+                            },
+                                                                                                {
+                                label: '点标模板',
+                                value: 'template_id'
+                            },
+                                                                                                {
+                                label: '上级ID',
+                                value: 'front_level_id'
+                            },
+                                                                                                {
+                                label: '城市ID',
+                                value: 'city_id'
+                            },
+                                                                                                {
+                                label: '区域ID',
+                                value: 'area_id'
+                            },
+                                                                                                {
+                                label: 'X',
+                                value: 'map_x'
+                            },
+                                                                                                {
+                                label: 'Y',
+                                value: 'map_y'
+                            },
+                                                                                                {
+                                label: 'index',
+                                value: 'map_index'
+                            },
+                                                            ],
+                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: '/thingInfo/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: '/thingInfo',
+                    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 + "/thingInfo/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: '/thingInfo/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/router/index.js

@@ -433,6 +433,76 @@ const router = new Router({
                     name: 'ArContentChilds',
                     component: () =>
                         import ('../pages/ArContentChilds')
+                },
+                {
+                    path: '/landmarkType',
+                    name: 'LandmarkType',
+                    component: () => import('../pages/LandmarkType')
+                },
+                {
+                    path: '/landmarkTypes',
+                    name: 'LandmarkTypes',
+                    component: () => import('../pages/LandmarkTypes')
+                },
+                {
+                    path: '/aimTemplate',
+                    name: 'AimTemplate',
+                    component: () => import('../pages/AimTemplate')
+                },
+                {
+                    path: '/aimTemplates',
+                    name: 'AimTemplates',
+                    component: () => import('../pages/AimTemplates')
+                },
+                {
+                    path: '/aimTemplateAim',
+                    name: 'AimTemplateAim',
+                    component: () => import('../pages/AimTemplateAim')
+                },
+                {
+                    path: '/aimTemplateAims',
+                    name: 'AimTemplateAims',
+                    component: () => import('../pages/AimTemplateAims')
+                },
+                {
+                    path: '/aimTemplateAr',
+                    name: 'AimTemplateAr',
+                    component: () => import('../pages/AimTemplateAr')
+                },
+                {
+                    path: '/aimTemplateArs',
+                    name: 'AimTemplateArs',
+                    component: () => import('../pages/AimTemplateArs')
+                },
+                {
+                    path: '/areaInfo',
+                    name: 'AreaInfo',
+                    component: () => import('../pages/AreaInfo')
+                },
+                {
+                    path: '/areaInfos',
+                    name: 'AreaInfos',
+                    component: () => import('../pages/AreaInfos')
+                },
+                {
+                    path: '/thingInfo',
+                    name: 'ThingInfo',
+                    component: () => import('../pages/ThingInfo')
+                },
+                {
+                    path: '/thingInfos',
+                    name: 'ThingInfos',
+                    component: () => import('../pages/ThingInfos')
+                },
+                {
+                    path: '/aimGroupInfo',
+                    name: 'AimGroupInfo',
+                    component: () => import('../pages/AimGroupInfo')
+                },
+                {
+                    path: '/aimGroupInfos',
+                    name: 'AimGroupInfos',
+                    component: () => import('../pages/AimGroupInfos')
                 }
                 /**INSERT_LOCATION**/
             ]