Merge remote-tracking branch 'origin/master'

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

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.AimGroupInfo;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.AimGroupInfoMapper")
-public interface AimGroupInfoMapper{
+public interface AimGroupInfoMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -28,6 +29,8 @@ public interface AimGroupInfoMapper{
 
     AimGroupInfo queryAimGroupInfo(AimGroupInfo record);
 
+    AimGroupInfo queryAimGroupInfoAllInfo(AimGroupInfo record);
+
     List<AimGroupInfo> query(AimGroupInfo record);
 }
 

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

@@ -22,6 +22,8 @@ public interface AimPlaceInfoMapper{
 
     List<AimPlaceInfo> queryAllAimPlaceInfo(AimPlaceInfo record);
 
+    List<AimPlaceInfo> queryAllAimPlaceInfoAllInfo(AimPlaceInfo record);
+
     List<AimPlaceInfo> queryAimPlaceInfoByPage(Map<String, Object> parameter);
 
     int delete(AimPlaceInfo record);

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

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.AimTemplateAim;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.AimTemplateAimMapper")
-public interface AimTemplateAimMapper{
+public interface AimTemplateAimMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -22,6 +23,8 @@ public interface AimTemplateAimMapper{
 
     List<AimTemplateAim> queryAllAimTemplateAim(AimTemplateAim record);
 
+    List<AimTemplateAim> queryAllAimTemplateAimAllInfo(AimTemplateAim record);
+
     List<AimTemplateAim> queryAimTemplateAimByPage(Map<String, Object> parameter);
 
     int delete(AimTemplateAim record);

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

@@ -489,6 +489,129 @@
 
         id desc
     </select>
+    <select id="queryAllAimTemplateAimAllInfo" parameterType="java.util.Map" resultMap="AllInfoResultMap">
+        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
@@ -568,5 +691,16 @@
         </where>
         order by id desc
     </select>
+
+
+    <resultMap id="AllInfoResultMap" type="com.izouma.awesomeadmin.model.AimTemplateAim" extends="BaseResultMap">
+
+
+        <collection property="aimTemplateArList" ofType="com.izouma.awesomeadmin.model.AimTemplateAr"
+                    select="com.izouma.awesomeadmin.dao.AimTemplateArMapper.queryAllAimTemplateAr"
+                    column="{templateAimId = id}">
+        </collection>
+    </resultMap>
+
 </mapper>
 

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

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.AimTemplateAr;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.AimTemplateArMapper")
-public interface AimTemplateArMapper{
+public interface AimTemplateArMapper {
 
     int deleteByPrimaryKey(Integer id);
 

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

@@ -28,6 +28,8 @@ public interface AimTemplateMapper{
 
     AimTemplate queryAimTemplate(AimTemplate record);
 
+    AimTemplate queryAimTemplateAllInfo(AimTemplate record);
+
     List<AimTemplate> query(AimTemplate record);
 }
 

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

@@ -408,6 +408,46 @@
         </where>
         LIMIT 1
     </select>
+    <select id="queryAimTemplateAllInfo" parameterType="java.util.Map" resultMap="AllInfoResultMap">
+        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
@@ -428,5 +468,15 @@
         </where>
         order by id desc
     </select>
+
+
+    <resultMap id="AllInfoResultMap" type="com.izouma.awesomeadmin.model.AimTemplate" extends="BaseResultMap">
+
+
+        <collection property="aimTemplateAimList" ofType="com.izouma.awesomeadmin.model.AimTemplateAim"
+                    select="com.izouma.awesomeadmin.dao.AimTemplateAimMapper.queryAllAimTemplateAimAllInfo"
+                    column="{templateId = id}">
+        </collection>
+    </resultMap>
 </mapper>
 

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

@@ -29,6 +29,14 @@
         <result column="remark8" property="remark8" jdbcType="VARCHAR"/>
         <result column="remark9" property="remark9" jdbcType="VARCHAR"/>
         <result column="remark10" property="remark10" jdbcType="VARCHAR"/>
+        <result column="area_id" property="areaId" jdbcType="VARCHAR"/>
+        <result column="thing_id" property="thingId" jdbcType="VARCHAR"/>
+        <result column="aim_group_id" property="aimGroupId" jdbcType="VARCHAR"/>
+        <result column="template_id" property="templateId" jdbcType="VARCHAR"/>
+        <result column="template_aim_id" property="templateAimId" jdbcType="VARCHAR"/>
+        <result column="activation_mode" property="activationMode" jdbcType="VARCHAR"/>
+        <result column="aimPlaceId" property="aimPlaceId" jdbcType="VARCHAR"/>
+        <result column="template_ar_id" property="templateArId" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -81,6 +89,14 @@
             remark8,
             remark9,
             remark10,
+            area_id,
+            thing_id,
+            aim_group_id,
+            template_id,
+            template_aim_id,
+            activation_mode,
+            aim_place_id,
+            template_ar_id,
 
         </trim>
     </sql>
@@ -179,6 +195,30 @@
             <if test="remark10!= null">
                 remark10,
             </if>
+            <if test="areaId!= null">
+                area_id,
+            </if>
+            <if test="thingId!= null">
+                thing_id,
+            </if>
+            <if test="aimGroupId!= null">
+                aim_group_id,
+            </if>
+            <if test="templateId!= null">
+                template_id,
+            </if>
+            <if test="templateAimId!= null">
+                template_aim_id,
+            </if>
+            <if test="activationMode!= null">
+                activation_mode,
+            </if>
+            <if test="aimPlaceId!= null">
+                aim_place_id,
+            </if>
+            <if test="templateArId!= null">
+                template_ar_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -262,6 +302,30 @@
             <if test="remark10 != null">
                 #{remark10,jdbcType=VARCHAR},
             </if>
+            <if test="areaId != null">
+                #{areaId,jdbcType=VARCHAR},
+            </if>
+            <if test="thingId != null">
+                #{thingId,jdbcType=VARCHAR},
+            </if>
+            <if test="aimGroupId != null">
+                #{aimGroupId,jdbcType=VARCHAR},
+            </if>
+            <if test="templateId != null">
+                #{templateId,jdbcType=VARCHAR},
+            </if>
+            <if test="templateAimId != null">
+                #{templateAimId,jdbcType=VARCHAR},
+            </if>
+            <if test="activationMode != null">
+                #{activationMode,jdbcType=VARCHAR},
+            </if>
+            <if test="aimPlaceId != null">
+                #{aimPlaceId,jdbcType=VARCHAR},
+            </if>
+            <if test="templateArId != null">
+                #{templateArId,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ArContent">
@@ -348,6 +412,30 @@
             <if test="remark10 != null">
                 remark10= #{remark10,jdbcType=VARCHAR},
             </if>
+            <if test="areaId != null">
+                area_id= #{areaId,jdbcType=VARCHAR},
+            </if>
+            <if test="thingId != null">
+                thing_id= #{thingId,jdbcType=VARCHAR},
+            </if>
+            <if test="aimGroupId != null">
+                aim_group_id= #{aimGroupId,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="activationMode != null">
+                activation_mode= #{activationMode,jdbcType=VARCHAR},
+            </if>
+            <if test="aimPlaceId != null">
+                aim_place_id= #{aimPlaceId,jdbcType=VARCHAR},
+            </if>
+            <if test="templateArId != null">
+                template_ar_id= #{templateArId,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -438,6 +526,30 @@
             <if test="record.remark6 != null and !&quot;&quot;.equals(record.remark6)">
                 and remark6 = #{record.remark6}
             </if>
+            <if test="record.areaId != null and !&quot;&quot;.equals(record.areaId)">
+                and area_id = #{record.areaId}
+            </if>
+            <if test="record.thingId != null and !&quot;&quot;.equals(record.thingId)">
+                and thing_id = #{record.thingId}
+            </if>
+            <if test="record.aimGroupId != null and !&quot;&quot;.equals(record.aimGroupId)">
+                and aim_group_id = #{record.aimGroupId}
+            </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.activationMode != null and !&quot;&quot;.equals(record.activationMode)">
+                and activation_mode = #{record.activationMode}
+            </if>
+            <if test="record.aimPlaceId != null and !&quot;&quot;.equals(record.aimPlaceId)">
+                and aim_place_id = #{record.aimPlaceId}
+            </if>
+            <if test="record.templateArId != null and !&quot;&quot;.equals(record.templateArId)">
+                and template_ar_id = #{record.templateArId}
+            </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR group_id LIKE concat('%',#{record.searchKey},'%')
@@ -590,6 +702,30 @@
             <if test="remark6 != null and !&quot;&quot;.equals(remark6)">
                 and remark6 = #{remark6}
             </if>
+            <if test="areaId != null and !&quot;&quot;.equals(areaId)">
+                and area_id = #{areaId}
+            </if>
+            <if test="thingId != null and !&quot;&quot;.equals(thingId)">
+                and thing_id = #{thingId}
+            </if>
+            <if test="aimGroupId != null and !&quot;&quot;.equals(aimGroupId)">
+                and aim_group_id = #{aimGroupId}
+            </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="activationMode != null and !&quot;&quot;.equals(activationMode)">
+                and activation_mode = #{activationMode}
+            </if>
+            <if test="aimPlaceId != null and !&quot;&quot;.equals(aimPlaceId)">
+                and aim_place_id = #{aimPlaceId}
+            </if>
+            <if test="templateArId != null and !&quot;&quot;.equals(templateArId)">
+                and template_ar_id = #{templateArId}
+            </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR group_id LIKE concat('%',#{searchKey},'%')
@@ -738,6 +874,30 @@
             <if test="remark6 != null and !&quot;&quot;.equals(remark6)">
                 and remark6 = #{remark6}
             </if>
+            <if test="areaId != null and !&quot;&quot;.equals(areaId)">
+                and area_id = #{areaId}
+            </if>
+            <if test="thingId != null and !&quot;&quot;.equals(thingId)">
+                and thing_id = #{thingId}
+            </if>
+            <if test="aimGroupId != null and !&quot;&quot;.equals(aimGroupId)">
+                and aim_group_id = #{aimGroupId}
+            </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="activationMode != null and !&quot;&quot;.equals(activationMode)">
+                and activation_mode = #{activationMode}
+            </if>
+            <if test="aimPlaceId != null and !&quot;&quot;.equals(aimPlaceId)">
+                and aim_place_id = #{aimPlaceId}
+            </if>
+            <if test="templateArId != null and !&quot;&quot;.equals(templateArId)">
+                and template_ar_id = #{templateArId}
+            </if>
 
         </where>
         LIMIT 1

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

@@ -22,6 +22,8 @@ public interface AreaInfoMapper{
 
     List<AreaInfo> queryAllAreaInfo(AreaInfo record);
 
+    List<AreaInfo> queryAllAreaInfoAllInfo(AreaInfo record);
+
     List<AreaInfo> queryAreaInfoByPage(Map<String, Object> parameter);
 
     int delete(AreaInfo record);

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

@@ -1234,6 +1234,11 @@
                     select="com.izouma.awesomeadmin.dao.AimPlacePositionMapper.queryAllAimPlacePosition"
                     column="{ownedLandMarkId = id}">
         </collection>
+        <collection property="areaInfoList" ofType="com.izouma.awesomeadmin.model.AreaInfo"
+                    select="com.izouma.awesomeadmin.dao.AreaInfoMapper.queryAllAreaInfoAllInfo"
+                    column="{landmarkId = id}">
+        </collection>
+
     </resultMap>
 
     <resultMap id="LandMarkChildResultMap" type="com.izouma.awesomeadmin.model.LandMark" extends="BaseResultMap">

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

@@ -1,16 +1,17 @@
 package com.izouma.awesomeadmin.dao;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.datasource.DataSource;
 import org.springframework.stereotype.Repository;
 import com.izouma.awesomeadmin.model.ThingInfo;
 
 
 /**
-*  Dao接口
-*/
+ * Dao接口
+ */
 @Repository("com.zoumaframe.dao.ThingInfoMapper")
-public interface ThingInfoMapper{
+public interface ThingInfoMapper {
 
     int deleteByPrimaryKey(Integer id);
 
@@ -22,6 +23,8 @@ public interface ThingInfoMapper{
 
     List<ThingInfo> queryAllThingInfo(ThingInfo record);
 
+    List<ThingInfo> queryAllThingInfoAllInfo(ThingInfo record);
+
     List<ThingInfo> queryThingInfoByPage(Map<String, Object> parameter);
 
     int delete(ThingInfo record);

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

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class AimGroupInfo{
+public class AimGroupInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -24,157 +25,183 @@ public class AimGroupInfo{
     private String userArea;
     private String remark;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * 点标
+     */
+    private List<AimPlaceInfo> aimPlaceInfoList;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
-    public String getCityId(){
+
+    public String getCityId() {
         return this.cityId;
     }
 
-    public void setCityId(String cityId){
+    public void setCityId(String cityId) {
         this.cityId = cityId;
     }
-    public String getLandmarkId(){
+
+    public String getLandmarkId() {
         return this.landmarkId;
     }
 
-    public void setLandmarkId(String landmarkId){
+    public void setLandmarkId(String landmarkId) {
         this.landmarkId = landmarkId;
     }
-    public String getAreaId(){
+
+    public String getAreaId() {
         return this.areaId;
     }
 
-    public void setAreaId(String areaId){
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
-    public String getThingId(){
+
+    public String getThingId() {
         return this.thingId;
     }
 
-    public void setThingId(String thingId){
+    public void setThingId(String thingId) {
         this.thingId = thingId;
     }
-    public String getGroupName(){
+
+    public String getGroupName() {
         return this.groupName;
     }
 
-    public void setGroupName(String groupName){
+    public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
-    public String getAimTemplateId(){
+
+    public String getAimTemplateId() {
         return this.aimTemplateId;
     }
 
-    public void setAimTemplateId(String aimTemplateId){
+    public void setAimTemplateId(String aimTemplateId) {
         this.aimTemplateId = aimTemplateId;
     }
-    public String getUserArea(){
+
+    public String getUserArea() {
         return this.userArea;
     }
 
-    public void setUserArea(String userArea){
+    public void setUserArea(String userArea) {
         this.userArea = userArea;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public List<AimPlaceInfo> getAimPlaceInfoList() {
+        return aimPlaceInfoList;
+    }
 
+    public void setAimPlaceInfoList(List<AimPlaceInfo> aimPlaceInfoList) {
+        this.aimPlaceInfoList = aimPlaceInfoList;
+    }
 }
 

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

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class AimPlaceInfo{
+public class AimPlaceInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -58,395 +59,452 @@ public class AimPlaceInfo{
     private String aimGroupId;
     private String templateAimId;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private List<ArContent> arContentList;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getName(){
+
+    public String getName() {
         return this.name;
     }
 
-    public void setName(String name){
+    public void setName(String name) {
         this.name = name;
     }
-    public String getType(){
+
+    public String getType() {
         return this.type;
     }
 
-    public void setType(String type){
+    public void setType(String type) {
         this.type = type;
     }
-    public String getOwnedLandMarkId(){
+
+    public String getOwnedLandMarkId() {
         return this.ownedLandMarkId;
     }
 
-    public void setOwnedLandMarkId(String ownedLandMarkId){
+    public void setOwnedLandMarkId(String ownedLandMarkId) {
         this.ownedLandMarkId = ownedLandMarkId;
     }
-    public String getArContentGroupId(){
+
+    public String getArContentGroupId() {
         return this.arContentGroupId;
     }
 
-    public void setArContentGroupId(String arContentGroupId){
+    public void setArContentGroupId(String arContentGroupId) {
         this.arContentGroupId = arContentGroupId;
     }
-    public String getArKitPosX(){
+
+    public String getArKitPosX() {
         return this.arKitPosX;
     }
 
-    public void setArKitPosX(String arKitPosX){
+    public void setArKitPosX(String arKitPosX) {
         this.arKitPosX = arKitPosX;
     }
-    public String getArKitPosY(){
+
+    public String getArKitPosY() {
         return this.arKitPosY;
     }
 
-    public void setArKitPosY(String arKitPosY){
+    public void setArKitPosY(String arKitPosY) {
         this.arKitPosY = arKitPosY;
     }
-    public String getArKitPosZ(){
+
+    public String getArKitPosZ() {
         return this.arKitPosZ;
     }
 
-    public void setArKitPosZ(String arKitPosZ){
+    public void setArKitPosZ(String arKitPosZ) {
         this.arKitPosZ = arKitPosZ;
     }
-    public String getArKitScale(){
+
+    public String getArKitScale() {
         return this.arKitScale;
     }
 
-    public void setArKitScale(String arKitScale){
+    public void setArKitScale(String arKitScale) {
         this.arKitScale = arKitScale;
     }
-    public String getArKitAngle(){
+
+    public String getArKitAngle() {
         return this.arKitAngle;
     }
 
-    public void setArKitAngle(String arKitAngle){
+    public void setArKitAngle(String arKitAngle) {
         this.arKitAngle = arKitAngle;
     }
-    public String getArKitShowLenth(){
+
+    public String getArKitShowLenth() {
         return this.arKitShowLenth;
     }
 
-    public void setArKitShowLenth(String arKitShowLenth){
+    public void setArKitShowLenth(String arKitShowLenth) {
         this.arKitShowLenth = arKitShowLenth;
     }
-    public String getGyroPosX(){
+
+    public String getGyroPosX() {
         return this.gyroPosX;
     }
 
-    public void setGyroPosX(String gyroPosX){
+    public void setGyroPosX(String gyroPosX) {
         this.gyroPosX = gyroPosX;
     }
-    public String getGyroPosY(){
+
+    public String getGyroPosY() {
         return this.gyroPosY;
     }
 
-    public void setGyroPosY(String gyroPosY){
+    public void setGyroPosY(String gyroPosY) {
         this.gyroPosY = gyroPosY;
     }
-    public String getGyroPosZ(){
+
+    public String getGyroPosZ() {
         return this.gyroPosZ;
     }
 
-    public void setGyroPosZ(String gyroPosZ){
+    public void setGyroPosZ(String gyroPosZ) {
         this.gyroPosZ = gyroPosZ;
     }
-    public String getGyroPosScale(){
+
+    public String getGyroPosScale() {
         return this.gyroPosScale;
     }
 
-    public void setGyroPosScale(String gyroPosScale){
+    public void setGyroPosScale(String gyroPosScale) {
         this.gyroPosScale = gyroPosScale;
     }
-    public String getGyroPosAngle(){
+
+    public String getGyroPosAngle() {
         return this.gyroPosAngle;
     }
 
-    public void setGyroPosAngle(String gyroPosAngle){
+    public void setGyroPosAngle(String gyroPosAngle) {
         this.gyroPosAngle = gyroPosAngle;
     }
-    public String getGyroPosShowLenth(){
+
+    public String getGyroPosShowLenth() {
         return this.gyroPosShowLenth;
     }
 
-    public void setGyroPosShowLenth(String gyroPosShowLenth){
+    public void setGyroPosShowLenth(String gyroPosShowLenth) {
         this.gyroPosShowLenth = gyroPosShowLenth;
     }
-    public String getVuforiaImageInfoAreaMarking(){
+
+    public String getVuforiaImageInfoAreaMarking() {
         return this.vuforiaImageInfoAreaMarking;
     }
 
-    public void setVuforiaImageInfoAreaMarking(String vuforiaImageInfoAreaMarking){
+    public void setVuforiaImageInfoAreaMarking(String vuforiaImageInfoAreaMarking) {
         this.vuforiaImageInfoAreaMarking = vuforiaImageInfoAreaMarking;
     }
-    public String getRemark1(){
+
+    public String getRemark1() {
         return this.remark1;
     }
 
-    public void setRemark1(String remark1){
+    public void setRemark1(String remark1) {
         this.remark1 = remark1;
     }
-    public String getRemark2(){
+
+    public String getRemark2() {
         return this.remark2;
     }
 
-    public void setRemark2(String remark2){
+    public void setRemark2(String remark2) {
         this.remark2 = remark2;
     }
-    public String getRemark3(){
+
+    public String getRemark3() {
         return this.remark3;
     }
 
-    public void setRemark3(String remark3){
+    public void setRemark3(String remark3) {
         this.remark3 = remark3;
     }
-    public String getRemark4(){
+
+    public String getRemark4() {
         return this.remark4;
     }
 
-    public void setRemark4(String remark4){
+    public void setRemark4(String remark4) {
         this.remark4 = remark4;
     }
-    public String getRemark5(){
+
+    public String getRemark5() {
         return this.remark5;
     }
 
-    public void setRemark5(String remark5){
+    public void setRemark5(String remark5) {
         this.remark5 = remark5;
     }
-    public String getRemark6(){
+
+    public String getRemark6() {
         return this.remark6;
     }
 
-    public void setRemark6(String remark6){
+    public void setRemark6(String remark6) {
         this.remark6 = remark6;
     }
-    public Integer getMapIndex(){
+
+    public Integer getMapIndex() {
         return this.mapIndex;
     }
 
-    public void setMapIndex(Integer mapIndex){
+    public void setMapIndex(Integer mapIndex) {
         this.mapIndex = mapIndex;
     }
-    public String getPosX(){
+
+    public String getPosX() {
         return this.posX;
     }
 
-    public void setPosX(String posX){
+    public void setPosX(String posX) {
         this.posX = posX;
     }
-    public String getPosY(){
+
+    public String getPosY() {
         return this.posY;
     }
 
-    public void setPosY(String posY){
+    public void setPosY(String posY) {
         this.posY = posY;
     }
-    public String getPosZ(){
+
+    public String getPosZ() {
         return this.posZ;
     }
 
-    public void setPosZ(String posZ){
+    public void setPosZ(String posZ) {
         this.posZ = posZ;
     }
-    public String getRemark7(){
+
+    public String getRemark7() {
         return this.remark7;
     }
 
-    public void setRemark7(String remark7){
+    public void setRemark7(String remark7) {
         this.remark7 = remark7;
     }
-    public String getRemark8(){
+
+    public String getRemark8() {
         return this.remark8;
     }
 
-    public void setRemark8(String remark8){
+    public void setRemark8(String remark8) {
         this.remark8 = remark8;
     }
-    public String getRemark9(){
+
+    public String getRemark9() {
         return this.remark9;
     }
 
-    public void setRemark9(String remark9){
+    public void setRemark9(String remark9) {
         this.remark9 = remark9;
     }
-    public String getFrontLevelId(){
+
+    public String getFrontLevelId() {
         return this.frontLevelId;
     }
 
-    public void setFrontLevelId(String frontLevelId){
+    public void setFrontLevelId(String frontLevelId) {
         this.frontLevelId = frontLevelId;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public Integer getIconRank(){
+
+    public Integer getIconRank() {
         return this.iconRank;
     }
 
-    public void setIconRank(Integer iconRank){
+    public void setIconRank(Integer iconRank) {
         this.iconRank = iconRank;
     }
-    public String getAloneFlag(){
+
+    public String getAloneFlag() {
         return this.aloneFlag;
     }
 
-    public void setAloneFlag(String aloneFlag){
+    public void setAloneFlag(String aloneFlag) {
         this.aloneFlag = aloneFlag;
     }
-    public String getAutoPlay(){
+
+    public String getAutoPlay() {
         return this.autoPlay;
     }
 
-    public void setAutoPlay(String autoPlay){
+    public void setAutoPlay(String autoPlay) {
         this.autoPlay = autoPlay;
     }
-    public String getAutoDisplay(){
+
+    public String getAutoDisplay() {
         return this.autoDisplay;
     }
 
-    public void setAutoDisplay(String autoDisplay){
+    public void setAutoDisplay(String autoDisplay) {
         this.autoDisplay = autoDisplay;
     }
-    public String getShowLevel(){
+
+    public String getShowLevel() {
         return this.showLevel;
     }
 
-    public void setShowLevel(String showLevel){
+    public void setShowLevel(String showLevel) {
         this.showLevel = showLevel;
     }
-    public String getTemplateId(){
+
+    public String getTemplateId() {
         return this.templateId;
     }
 
-    public void setTemplateId(String templateId){
+    public void setTemplateId(String templateId) {
         this.templateId = templateId;
     }
-    public String getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
-    public String getAreaId(){
+
+    public String getAreaId() {
         return this.areaId;
     }
 
-    public void setAreaId(String areaId){
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
-    public String getThingId(){
+
+    public String getThingId() {
         return this.thingId;
     }
 
-    public void setThingId(String thingId){
+    public void setThingId(String thingId) {
         this.thingId = thingId;
     }
-    public String getAimGroupId(){
+
+    public String getAimGroupId() {
         return this.aimGroupId;
     }
 
-    public void setAimGroupId(String aimGroupId){
+    public void setAimGroupId(String aimGroupId) {
         this.aimGroupId = aimGroupId;
     }
-    public String getTemplateAimId(){
+
+    public String getTemplateAimId() {
         return this.templateAimId;
     }
 
-    public void setTemplateAimId(String templateAimId){
+    public void setTemplateAimId(String templateAimId) {
         this.templateAimId = templateAimId;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public List<ArContent> getArContentList() {
+        return arContentList;
+    }
 
+    public void setArContentList(List<ArContent> arContentList) {
+        this.arContentList = arContentList;
+    }
 }
 

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

@@ -36,6 +36,8 @@ public class AimTemplate {
      */
     private String orderByStr;
 
+    private List<AimTemplateAim> aimTemplateAimList;
+
     public Integer getId() {
         return this.id;
     }
@@ -155,5 +157,13 @@ public class AimTemplate {
     public void setAimNum(String aimNum) {
         this.aimNum = aimNum;
     }
+
+    public List<AimTemplateAim> getAimTemplateAimList() {
+        return aimTemplateAimList;
+    }
+
+    public void setAimTemplateAimList(List<AimTemplateAim> aimTemplateAimList) {
+        this.aimTemplateAimList = aimTemplateAimList;
+    }
 }
 

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

@@ -42,6 +42,8 @@ public class AimTemplateAim {
      */
     private String orderByStr;
 
+    private List<AimTemplateAr> aimTemplateArList;
+
     public Integer getId() {
         return this.id;
     }
@@ -209,5 +211,13 @@ public class AimTemplateAim {
     public void setArNum(String arNum) {
         this.arNum = arNum;
     }
+
+    public List<AimTemplateAr> getAimTemplateArList() {
+        return aimTemplateArList;
+    }
+
+    public void setAimTemplateArList(List<AimTemplateAr> aimTemplateArList) {
+        this.aimTemplateArList = aimTemplateArList;
+    }
 }
 

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

@@ -53,6 +53,22 @@ public class ArContent {
      */
     private String orderByStr;
 
+    private String areaId;
+
+    private String thingId;
+
+    private String aimGroupId;
+
+    private String templateId;
+
+    private String templateAimId;
+
+    private String activationMode;
+
+    private String aimPlaceId;
+
+    private String templateArId;
+
     public Integer getId() {
         return this.id;
     }
@@ -308,5 +324,69 @@ public class ArContent {
     public void setRemark10(String remark10) {
         this.remark10 = remark10;
     }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getThingId() {
+        return thingId;
+    }
+
+    public void setThingId(String thingId) {
+        this.thingId = thingId;
+    }
+
+    public String getAimGroupId() {
+        return aimGroupId;
+    }
+
+    public void setAimGroupId(String aimGroupId) {
+        this.aimGroupId = aimGroupId;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateAimId() {
+        return templateAimId;
+    }
+
+    public void setTemplateAimId(String templateAimId) {
+        this.templateAimId = templateAimId;
+    }
+
+    public String getActivationMode() {
+        return activationMode;
+    }
+
+    public void setActivationMode(String activationMode) {
+        this.activationMode = activationMode;
+    }
+
+    public String getAimPlaceId() {
+        return aimPlaceId;
+    }
+
+    public void setAimPlaceId(String aimPlaceId) {
+        this.aimPlaceId = aimPlaceId;
+    }
+
+    public String getTemplateArId() {
+        return templateArId;
+    }
+
+    public void setTemplateArId(String templateArId) {
+        this.templateArId = templateArId;
+    }
 }
 

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

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class AreaInfo{
+public class AreaInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -34,227 +35,290 @@ public class AreaInfo{
     private String blockId;
     private String areaType;
 
-private String idStr;
+    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;
 
-private String searchKey;
+    /**
+     * 显示点
+     */
+    private List<AreaShowPoint> areaShowPointList;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * 绑定点标组
+     */
+    private AimGroupInfo aimGroupInfo;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * 事物
+     */
+    private List<ThingInfo> thingInfoList;
 
-    public Integer getId(){
+
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
-    public String getCityId(){
+
+    public String getCityId() {
         return this.cityId;
     }
 
-    public void setCityId(String cityId){
+    public void setCityId(String cityId) {
         this.cityId = cityId;
     }
-    public String getLandmarkId(){
+
+    public String getLandmarkId() {
         return this.landmarkId;
     }
 
-    public void setLandmarkId(String landmarkId){
+    public void setLandmarkId(String landmarkId) {
         this.landmarkId = landmarkId;
     }
-    public String getAreaName(){
+
+    public String getAreaName() {
         return this.areaName;
     }
 
-    public void setAreaName(String areaName){
+    public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
-    public String getRankLevel(){
+
+    public String getRankLevel() {
         return this.rankLevel;
     }
 
-    public void setRankLevel(String rankLevel){
+    public void setRankLevel(String rankLevel) {
         this.rankLevel = rankLevel;
     }
-    public String getAllowEdit(){
+
+    public String getAllowEdit() {
         return this.allowEdit;
     }
 
-    public void setAllowEdit(String allowEdit){
+    public void setAllowEdit(String allowEdit) {
         this.allowEdit = allowEdit;
     }
-    public String getAllowNavigate(){
+
+    public String getAllowNavigate() {
         return this.allowNavigate;
     }
 
-    public void setAllowNavigate(String allowNavigate){
+    public void setAllowNavigate(String allowNavigate) {
         this.allowNavigate = allowNavigate;
     }
-    public String getPublicArea(){
+
+    public String getPublicArea() {
         return this.publicArea;
     }
 
-    public void setPublicArea(String publicArea){
+    public void setPublicArea(String publicArea) {
         this.publicArea = publicArea;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public String getKeyword(){
+
+    public String getKeyword() {
         return this.keyword;
     }
 
-    public void setKeyword(String keyword){
+    public void setKeyword(String keyword) {
         this.keyword = keyword;
     }
-    public String getVideo(){
+
+    public String getVideo() {
         return this.video;
     }
 
-    public void setVideo(String video){
+    public void setVideo(String video) {
         this.video = video;
     }
-    public String getTextIntroduction(){
+
+    public String getTextIntroduction() {
         return this.textIntroduction;
     }
 
-    public void setTextIntroduction(String textIntroduction){
+    public void setTextIntroduction(String textIntroduction) {
         this.textIntroduction = textIntroduction;
     }
-    public String getUrl(){
+
+    public String getUrl() {
         return this.url;
     }
 
-    public void setUrl(String url){
+    public void setUrl(String url) {
         this.url = url;
     }
-    public String getShowDistance(){
+
+    public String getShowDistance() {
         return this.showDistance;
     }
 
-    public void setShowDistance(String showDistance){
+    public void setShowDistance(String showDistance) {
         this.showDistance = showDistance;
     }
-    public String getTemplateId(){
+
+    public String getTemplateId() {
         return this.templateId;
     }
 
-    public void setTemplateId(String templateId){
+    public void setTemplateId(String templateId) {
         this.templateId = templateId;
     }
-    public String getFrontLevelId(){
+
+    public String getFrontLevelId() {
         return this.frontLevelId;
     }
 
-    public void setFrontLevelId(String frontLevelId){
+    public void setFrontLevelId(String frontLevelId) {
         this.frontLevelId = frontLevelId;
     }
-    public String getBlockId(){
+
+    public String getBlockId() {
         return this.blockId;
     }
 
-    public void setBlockId(String blockId){
+    public void setBlockId(String blockId) {
         this.blockId = blockId;
     }
-    public String getAreaType(){
+
+    public String getAreaType() {
         return this.areaType;
     }
 
-    public void setAreaType(String areaType){
+    public void setAreaType(String areaType) {
         this.areaType = areaType;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public List<AreaShowPoint> getAreaShowPointList() {
+        return areaShowPointList;
+    }
+
+    public void setAreaShowPointList(List<AreaShowPoint> areaShowPointList) {
+        this.areaShowPointList = areaShowPointList;
+    }
 
+    public AimGroupInfo getAimGroupInfo() {
+        return aimGroupInfo;
+    }
+
+    public void setAimGroupInfo(AimGroupInfo aimGroupInfo) {
+        this.aimGroupInfo = aimGroupInfo;
+    }
+
+    public List<ThingInfo> getThingInfoList() {
+        return thingInfoList;
+    }
+
+    public void setThingInfoList(List<ThingInfo> thingInfoList) {
+        this.thingInfoList = thingInfoList;
+    }
 }
 

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

@@ -47,6 +47,8 @@ public class LandMark {
 
     private List<LandMark> landMarkChildList;
 
+    private List<AreaInfo> areaInfoList;
+
 
     //距离、经纬度查询。
     private String distance;
@@ -416,5 +418,13 @@ public class LandMark {
     public void setAreaMapInfo(String areaMapInfo) {
         this.areaMapInfo = areaMapInfo;
     }
+
+    public List<AreaInfo> getAreaInfoList() {
+        return areaInfoList;
+    }
+
+    public void setAreaInfoList(List<AreaInfo> areaInfoList) {
+        this.areaInfoList = areaInfoList;
+    }
 }
 

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

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class ThingInfo{
+public class ThingInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -34,227 +35,260 @@ public class ThingInfo{
     private String mapY;
     private String mapIndex;
 
-private String idStr;
+    private String idStr;
+
+    private String searchKey;
 
-private String searchKey;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    private AimGroupInfo aimGroupInfo;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getPower(){
+
+    public String getPower() {
         return this.power;
     }
 
-    public void setPower(String power){
+    public void setPower(String power) {
         this.power = power;
     }
-    public String getLandmarkId(){
+
+    public String getLandmarkId() {
         return this.landmarkId;
     }
 
-    public void setLandmarkId(String landmarkId){
+    public void setLandmarkId(String landmarkId) {
         this.landmarkId = landmarkId;
     }
-    public String getThingName(){
+
+    public String getThingName() {
         return this.thingName;
     }
 
-    public void setThingName(String thingName){
+    public void setThingName(String thingName) {
         this.thingName = thingName;
     }
-    public String getThingType(){
+
+    public String getThingType() {
         return this.thingType;
     }
 
-    public void setThingType(String thingType){
+    public void setThingType(String thingType) {
         this.thingType = thingType;
     }
-    public String getRankLevel(){
+
+    public String getRankLevel() {
         return this.rankLevel;
     }
 
-    public void setRankLevel(String rankLevel){
+    public void setRankLevel(String rankLevel) {
         this.rankLevel = rankLevel;
     }
-    public String getAllowNavigate(){
+
+    public String getAllowNavigate() {
         return this.allowNavigate;
     }
 
-    public void setAllowNavigate(String allowNavigate){
+    public void setAllowNavigate(String allowNavigate) {
         this.allowNavigate = allowNavigate;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public String getKeyword(){
+
+    public String getKeyword() {
         return this.keyword;
     }
 
-    public void setKeyword(String keyword){
+    public void setKeyword(String keyword) {
         this.keyword = keyword;
     }
-    public String getImage(){
+
+    public String getImage() {
         return this.image;
     }
 
-    public void setImage(String image){
+    public void setImage(String image) {
         this.image = image;
     }
-    public String getTextIntroduction(){
+
+    public String getTextIntroduction() {
         return this.textIntroduction;
     }
 
-    public void setTextIntroduction(String textIntroduction){
+    public void setTextIntroduction(String textIntroduction) {
         this.textIntroduction = textIntroduction;
     }
-    public String getShowDistance(){
+
+    public String getShowDistance() {
         return this.showDistance;
     }
 
-    public void setShowDistance(String showDistance){
+    public void setShowDistance(String showDistance) {
         this.showDistance = showDistance;
     }
-    public String getTemplateId(){
+
+    public String getTemplateId() {
         return this.templateId;
     }
 
-    public void setTemplateId(String templateId){
+    public void setTemplateId(String templateId) {
         this.templateId = templateId;
     }
-    public String getFrontLevelId(){
+
+    public String getFrontLevelId() {
         return this.frontLevelId;
     }
 
-    public void setFrontLevelId(String frontLevelId){
+    public void setFrontLevelId(String frontLevelId) {
         this.frontLevelId = frontLevelId;
     }
-    public String getCityId(){
+
+    public String getCityId() {
         return this.cityId;
     }
 
-    public void setCityId(String cityId){
+    public void setCityId(String cityId) {
         this.cityId = cityId;
     }
-    public String getAreaId(){
+
+    public String getAreaId() {
         return this.areaId;
     }
 
-    public void setAreaId(String areaId){
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
-    public String getMapX(){
+
+    public String getMapX() {
         return this.mapX;
     }
 
-    public void setMapX(String mapX){
+    public void setMapX(String mapX) {
         this.mapX = mapX;
     }
-    public String getMapY(){
+
+    public String getMapY() {
         return this.mapY;
     }
 
-    public void setMapY(String mapY){
+    public void setMapY(String mapY) {
         this.mapY = mapY;
     }
-    public String getMapIndex(){
+
+    public String getMapIndex() {
         return this.mapIndex;
     }
 
-    public void setMapIndex(String mapIndex){
+    public void setMapIndex(String mapIndex) {
         this.mapIndex = mapIndex;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public AimGroupInfo getAimGroupInfo() {
+        return aimGroupInfo;
+    }
+
+    public void setAimGroupInfo(AimGroupInfo aimGroupInfo) {
+        this.aimGroupInfo = aimGroupInfo;
+    }
 }
 

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

@@ -23,5 +23,7 @@ public interface AimTemplateService{
     boolean deleteAimTemplate(AimTemplate record);
 
     boolean updateAimTemplate(AimTemplate record);
+
+    AimTemplate getAimTemplateAllInfo(AimTemplate record);
 }
 

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

@@ -1,52 +1,68 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
+import com.izouma.awesomeadmin.dao.AimPlaceInfoMapper;
+import com.izouma.awesomeadmin.dao.AimTemplateMapper;
+import com.izouma.awesomeadmin.dao.ArContentMapper;
+import com.izouma.awesomeadmin.model.*;
+import javafx.scene.shape.Arc;
+import org.apache.commons.lang.StringUtils;
 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接口实现类
+ */
 @Service
-public class AimGroupInfoServiceImpl implements AimGroupInfoService{
+public class AimGroupInfoServiceImpl implements AimGroupInfoService {
 
     private static Logger logger = Logger.getLogger(AimGroupInfoServiceImpl.class);
 
     @Autowired
     private AimGroupInfoMapper aimGroupInfoMapper;
 
+    @Autowired
+    private AimTemplateMapper aimTemplateMapper;
+
+    @Autowired
+    private AimPlaceInfoMapper aimPlaceInfoMapper;
+
+    @Autowired
+    private ArContentMapper arContentMapper;
+
     @Override
     public List<AimGroupInfo> getAimGroupInfoList(AimGroupInfo record) {
 
         logger.info("getAimGroupInfoList");
         try {
 
-        return aimGroupInfoMapper.queryAllAimGroupInfo(record);
+            return aimGroupInfoMapper.queryAllAimGroupInfo(record);
         } catch (Exception e) {
-        logger.error("getAimGroupInfoList", 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);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return aimGroupInfoMapper.queryAimGroupInfoByPage(parameter);
+            return aimGroupInfoMapper.queryAimGroupInfoByPage(parameter);
         } catch (Exception e) {
-        logger.error("getAimGroupInfoByPage", e);
+            logger.error("getAimGroupInfoByPage", e);
         }
 
         return null;
@@ -60,7 +76,7 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService{
 
             return aimGroupInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getAimGroupInfoById", e);
+            logger.error("getAimGroupInfoById", e);
         }
 
         return null;
@@ -74,7 +90,7 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService{
 
             return aimGroupInfoMapper.queryAimGroupInfo(record);
         } catch (Exception e) {
-        logger.error("getAimGroupInfo", e);
+            logger.error("getAimGroupInfo", e);
         }
 
         return null;
@@ -89,7 +105,68 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService{
             int updates = aimGroupInfoMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+
+                //生成预设点标
+                if (StringUtils.isNotEmpty(record.getAimTemplateId())) {
+                    AimTemplate aimTemplate = new AimTemplate();
+                    aimTemplate.setId(Integer.valueOf(record.getAimTemplateId()));
+                    aimTemplate = aimTemplateMapper.queryAimTemplateAllInfo(aimTemplate);
+
+                    if (aimTemplate != null) {
+                        List<AimTemplateAim> aimTemplateAimList = aimTemplate.getAimTemplateAimList();
+                        if (aimTemplateAimList.size() > 0) {
+                            for (AimTemplateAim aimTemplateAim : aimTemplateAimList) {
+                                AimPlaceInfo aimPlaceInfo = new AimPlaceInfo();
+                                aimPlaceInfo.setName(aimTemplateAim.getAimName());
+                                aimPlaceInfo.setIcon(aimTemplateAim.getIcon());
+                                aimPlaceInfo.setIconRank(aimTemplateAim.getIconRank());
+                                aimPlaceInfo.setAloneFlag(aimTemplateAim.getAloneFlag());
+                                aimPlaceInfo.setAutoPlay(aimTemplateAim.getAutoPlay());
+                                aimPlaceInfo.setAutoDisplay(aimTemplateAim.getAutoDisplay());
+                                aimPlaceInfo.setShowLevel(aimTemplateAim.getShowLevel());
+                                aimPlaceInfo.setTemplateId(record.getAimTemplateId());
+                                aimPlaceInfo.setTemplateAimId(String.valueOf(aimTemplateAim.getId()));
+                                aimPlaceInfo.setOwnedLandMarkId(record.getLandmarkId());
+                                aimPlaceInfo.setAreaId(record.getAreaId());
+                                aimPlaceInfo.setThingId(record.getThingId());
+                                aimPlaceInfo.setAimGroupId(String.valueOf(record.getId()));
+
+                                aimPlaceInfoMapper.insertSelective(aimPlaceInfo);
+
+                                if (aimPlaceInfo.getId() != null) {
+                                    List<AimTemplateAr> aimTemplateArList = aimTemplateAim.getAimTemplateArList();
+                                    if (aimTemplateArList.size() > 0) {
+
+                                        for (AimTemplateAr aimTemplateAr : aimTemplateArList) {
+                                            ArContent arContent = new ArContent();
+                                            arContent.setName(aimTemplateAr.getArName());
+                                            arContent.setType(aimTemplateAr.getArType());
+                                            arContent.setActivationMode(aimTemplateAr.getActivationMode());
+                                            arContent.setAreaId(record.getAreaId());
+                                            arContent.setThingId(record.getThingId());
+                                            arContent.setAimGroupId(String.valueOf(record.getId()));
+                                            arContent.setAimPlaceId(String.valueOf(aimPlaceInfo.getId()));
+                                            arContent.setTemplateId(record.getAimTemplateId());
+                                            arContent.setTemplateAimId(String.valueOf(aimTemplateAim.getId()));
+                                            arContent.setTemplateArId(String.valueOf(aimTemplateAr.getId()));
+
+                                            arContentMapper.insertSelective(arContent);
+
+                                        }
+                                    }
+                                }
+
+                            }
+
+
+                        }
+
+                    }
+
+
+                }
+
+                return true;
             }
         } catch (Exception e) {
             logger.error("createAimGroupInfo", e);
@@ -104,13 +181,13 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService{
         logger.info("deleteAimGroupInfo");
         try {
 
-             int updates = aimGroupInfoMapper.delete(record);
+            int updates = aimGroupInfoMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteAimGroupInfo", e);
+            logger.error("deleteAimGroupInfo", e);
         }
 
         return false;
@@ -125,10 +202,10 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService{
             int updates = aimGroupInfoMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateAimGroupInfo", e);
+            logger.error("updateAimGroupInfo", e);
         }
 
         return false;

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

@@ -1,6 +1,7 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,10 +12,10 @@ import com.izouma.awesomeadmin.service.AimTemplateService;
 import com.izouma.awesomeadmin.dao.AimTemplateMapper;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class AimTemplateServiceImpl implements AimTemplateService{
+public class AimTemplateServiceImpl implements AimTemplateService {
 
     private static Logger logger = Logger.getLogger(AimTemplateServiceImpl.class);
 
@@ -27,26 +28,27 @@ public class AimTemplateServiceImpl implements AimTemplateService{
         logger.info("getAimTemplateList");
         try {
 
-        return aimTemplateMapper.queryAllAimTemplate(record);
+            return aimTemplateMapper.queryAllAimTemplate(record);
         } catch (Exception e) {
-        logger.error("getAimTemplateList", 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);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return aimTemplateMapper.queryAimTemplateByPage(parameter);
+            return aimTemplateMapper.queryAimTemplateByPage(parameter);
         } catch (Exception e) {
-        logger.error("getAimTemplateByPage", e);
+            logger.error("getAimTemplateByPage", e);
         }
 
         return null;
@@ -60,7 +62,7 @@ public class AimTemplateServiceImpl implements AimTemplateService{
 
             return aimTemplateMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getAimTemplateById", e);
+            logger.error("getAimTemplateById", e);
         }
 
         return null;
@@ -74,7 +76,21 @@ public class AimTemplateServiceImpl implements AimTemplateService{
 
             return aimTemplateMapper.queryAimTemplate(record);
         } catch (Exception e) {
-        logger.error("getAimTemplate", e);
+            logger.error("getAimTemplate", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimTemplate getAimTemplateAllInfo(AimTemplate record) {
+
+        logger.info("getAimTemplateAllInfo");
+        try {
+
+            return aimTemplateMapper.queryAimTemplateAllInfo(record);
+        } catch (Exception e) {
+            logger.error("getAimTemplateAllInfo", e);
         }
 
         return null;
@@ -89,7 +105,7 @@ public class AimTemplateServiceImpl implements AimTemplateService{
             int updates = aimTemplateMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createAimTemplate", e);
@@ -104,13 +120,13 @@ public class AimTemplateServiceImpl implements AimTemplateService{
         logger.info("deleteAimTemplate");
         try {
 
-             int updates = aimTemplateMapper.delete(record);
+            int updates = aimTemplateMapper.delete(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteAimTemplate", e);
+            logger.error("deleteAimTemplate", e);
         }
 
         return false;
@@ -125,10 +141,10 @@ public class AimTemplateServiceImpl implements AimTemplateService{
             int updates = aimTemplateMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateAimTemplate", e);
+            logger.error("updateAimTemplate", e);
         }
 
         return false;

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

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/aimTemplate")
 public class AimTemplateController {
@@ -28,8 +28,8 @@ public class AimTemplateController {
     private AimTemplateService aimTemplateService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class AimTemplateController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getAimTemplate", method = RequestMethod.GET)
     @ResponseBody
     public Result getAimTemplate(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class AimTemplateController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(AimTemplate record) {
@@ -58,16 +58,23 @@ public class AimTemplateController {
         return new Result(true, data);
     }
 
+    @RequestMapping(value = "/getOneAllInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOneAllInfo(AimTemplate record) {
+        AimTemplate data = aimTemplateService.getAimTemplateAllInfo(record);
+        return new Result(true, data);
+    }
+
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <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);
+        List<AimTemplate> pp = aimTemplateService.getAimTemplateByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,86 +83,87 @@ public class AimTemplateController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <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(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <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(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <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(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, AimTemplate record) throws Exception {
 
-    List<AimTemplate> aimTemplates = aimTemplateService.getAimTemplateList(record);
+        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 = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "模板名称" ,   "适用于" ,   "备注" ,   "权限"  };
+        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());
-                    }
+            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);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}
 

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

@@ -38,7 +38,7 @@
             </el-form-item>
             <el-form-item prop="aimTemplateId" label="点标模板">
                 <template>
-                    <el-select v-model="formData.aimTemplateId" clearable placeholder="请选择" :disabled="checkSubColumn('aimTemplateId')">
+                    <el-select v-model="formData.aimTemplateId" clearable placeholder="请选择" :disabled="checkSubColumn('aimTemplateId')||formData.id">
                         <el-option v-for="item in aimTemplateIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
@@ -188,6 +188,20 @@ export default {
             saving: false,
             formData: {},
             rules: {
+
+                cityId:
+                    [
+                        { required: true, message: '请选择 城市', trigger: 'blur' },
+                    ],
+                aimTemplateId:
+                    [
+                        { required: true, message: '请选择 点标模板', trigger: 'blur' },
+                    ],
+                landmarkId:
+                    [
+                        { required: true, message: '请选择 地标', trigger: 'blur' },
+                    ],
+
             },
             cityIdOptions: [],
             landmarkIdOptions: [],

src/main/vue/src/pages/AreaInfo.vue

@@ -80,7 +80,7 @@
                 M(最大不可超过10m)
             </el-form-item>
             <el-form-item prop="templateId" label="点标组ID">
-                <template>
+                <template v-if="formData.id">
                     <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="checkSubColumn('templateId')">
                         <el-option v-for="item in templateIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
@@ -130,9 +130,11 @@ export default {
 
                     if (res.data.keyword) {
                         res.data.keyword = res.data.keyword.split(',')
+                    } else {
+                        res.data.keyword = [];
                     }
 
-                     if (this.$route.query.column) {
+                    if (this.$route.query.column) {
                         var columnList = this.$route.query.column.split(';')
                         columnList.forEach(item => {
                             var tempColumn = item;
@@ -148,14 +150,14 @@ export default {
                 }
             })
         } else {
-             if (this.$route.query.column) {
-                        var columnList = this.$route.query.column.split(';')
-                        columnList.forEach(item => {
-                            var tempColumn = item;
-                            this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                        })
+            if (this.$route.query.column) {
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
+                    this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                })
 
-                    }
+            }
         }
 
 
@@ -192,9 +194,9 @@ export default {
 
 
         this.$http.get({
-            url: '/aimGroupInfos/all',
+            url: '/aimGroupInfo/all',
             data: {
-                areaId: this.formData.id,
+                areaId: this.$route.query.id,
             }
         }).then(res => {
             if (res.success) {

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

@@ -97,7 +97,7 @@
                         <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-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>
@@ -123,7 +123,7 @@
                 </div>
 
             </el-tab-pane>
-            <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
+            <!-- <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
 
                 <el-container>
                     <el-aside width="50%">
@@ -145,7 +145,7 @@
                         <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
                     </el-main>
                 </el-container>
-            </el-tab-pane>
+            </el-tab-pane> -->
             <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
                 <VuforiaImageInfos></VuforiaImageInfos>
             </el-tab-pane>
@@ -186,6 +186,8 @@ export default {
 
                     if (res.data.keyword) {
                         res.data.keyword = res.data.keyword.split(',')
+                    } else {
+                        res.data.keyword = [];
                     }
 
                     this.formData = res.data;
@@ -348,7 +350,7 @@ export default {
         },
         onDeleteKeyword(index) {
             console.log("111")
-            this.formData.keyword.splice(index,1)
+            this.formData.keyword.splice(index, 1)
         },
         addKeyword() {
             this.formData.keyword.push('')

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

@@ -75,7 +75,7 @@
             <el-input type="number" v-model="formData.showDistance" :disabled="checkSubColumn('showDistance')"></el-input>M(最大不可超过10m)
           </el-form-item>
           <el-form-item prop="templateId" label="点标组">
-            <template>
+            <template v-if="formData.id">
               <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="checkSubColumn('templateId')">
                 <el-option v-for="item in templateIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
@@ -165,6 +165,8 @@ export default {
 
           if (res.data.keyword) {
             res.data.keyword = res.data.keyword.split(',')
+          } else {
+            res.data.keyword = [];
           }
 
 
@@ -226,7 +228,7 @@ export default {
 
 
     this.$http.get({
-      url: '/aimGroupInfo/all'
+      url: '/aimGroupInfo/all' + (this.$route.query.id ? '?thingId=' + this.$route.query.id : '')
     }).then(res => {
       if (res.success) {
 
@@ -303,10 +305,10 @@ export default {
         index: this.formData.mapIndex
       }
     },
-    landmarkId(){
+    landmarkId() {
       return this.formData.landmarkId
     },
-    areaId(){
+    areaId() {
       return this.formData.areaId
     }
   },

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.9c5808f0ffa58e5184aa72e509260764.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5ede984582bd1b28163f.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/admin.35d5819a5018b34c359a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.5d039826b09cb5e6341ea6e253010ee7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f16dcf9dad3a97fbbd86.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/admin.3a3603f01a2da0dab85d.js></script></body></html>

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5ede984582bd1b28163f.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/loginAdmin.c1b11c00864212d9def2.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f16dcf9dad3a97fbbd86.js></script><script type=text/javascript src=/static/js/vendor.a890d64a84833c600d65.js></script><script type=text/javascript src=/static/js/loginAdmin.4bb29c046d494a4f6440.js></script></body></html>