20190328添加log

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

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

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

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

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

@@ -203,5 +203,31 @@ public class AimGroupInfo {
     public void setAimPlaceInfoList(List<AimPlaceInfo> aimPlaceInfoList) {
         this.aimPlaceInfoList = aimPlaceInfoList;
     }
+
+    @Override
+    public String toString() {
+        return "AimGroupInfo{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", power='" + power + '\'' +
+                ", cityId='" + cityId + '\'' +
+                ", landmarkId='" + landmarkId + '\'' +
+                ", areaId='" + areaId + '\'' +
+                ", thingId='" + thingId + '\'' +
+                ", groupName='" + groupName + '\'' +
+                ", aimTemplateId='" + aimTemplateId + '\'' +
+                ", userArea='" + userArea + '\'' +
+                ", remark='" + remark + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                ", aimPlaceInfoList=" + aimPlaceInfoList +
+                '}';
+    }
 }
 

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

@@ -506,5 +506,65 @@ public class AimPlaceInfo {
     public void setArContentList(List<ArContent> arContentList) {
         this.arContentList = arContentList;
     }
+
+    @Override
+    public String toString() {
+        return "AimPlaceInfo{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                ", ownedLandMarkId='" + ownedLandMarkId + '\'' +
+                ", arContentGroupId='" + arContentGroupId + '\'' +
+                ", arKitPosX='" + arKitPosX + '\'' +
+                ", arKitPosY='" + arKitPosY + '\'' +
+                ", arKitPosZ='" + arKitPosZ + '\'' +
+                ", arKitScale='" + arKitScale + '\'' +
+                ", arKitAngle='" + arKitAngle + '\'' +
+                ", arKitShowLenth='" + arKitShowLenth + '\'' +
+                ", gyroPosX='" + gyroPosX + '\'' +
+                ", gyroPosY='" + gyroPosY + '\'' +
+                ", gyroPosZ='" + gyroPosZ + '\'' +
+                ", gyroPosScale='" + gyroPosScale + '\'' +
+                ", gyroPosAngle='" + gyroPosAngle + '\'' +
+                ", gyroPosShowLenth='" + gyroPosShowLenth + '\'' +
+                ", vuforiaImageInfoAreaMarking='" + vuforiaImageInfoAreaMarking + '\'' +
+                ", remark1='" + remark1 + '\'' +
+                ", remark2='" + remark2 + '\'' +
+                ", remark3='" + remark3 + '\'' +
+                ", remark4='" + remark4 + '\'' +
+                ", remark5='" + remark5 + '\'' +
+                ", remark6='" + remark6 + '\'' +
+                ", mapIndex=" + mapIndex +
+                ", posX='" + posX + '\'' +
+                ", posY='" + posY + '\'' +
+                ", posZ='" + posZ + '\'' +
+                ", remark7='" + remark7 + '\'' +
+                ", remark8='" + remark8 + '\'' +
+                ", remark9='" + remark9 + '\'' +
+                ", frontLevelId='" + frontLevelId + '\'' +
+                ", icon='" + icon + '\'' +
+                ", iconRank=" + iconRank +
+                ", aloneFlag='" + aloneFlag + '\'' +
+                ", autoPlay='" + autoPlay + '\'' +
+                ", autoDisplay='" + autoDisplay + '\'' +
+                ", showLevel='" + showLevel + '\'' +
+                ", templateId='" + templateId + '\'' +
+                ", power='" + power + '\'' +
+                ", areaId='" + areaId + '\'' +
+                ", thingId='" + thingId + '\'' +
+                ", aimGroupId='" + aimGroupId + '\'' +
+                ", templateAimId='" + templateAimId + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                ", arContentList=" + arContentList +
+                '}';
+    }
 }
 

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

@@ -320,5 +320,43 @@ public class AreaInfo {
     public void setThingInfoList(List<ThingInfo> thingInfoList) {
         this.thingInfoList = thingInfoList;
     }
+
+    @Override
+    public String toString() {
+        return "AreaInfo{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", power='" + power + '\'' +
+                ", cityId='" + cityId + '\'' +
+                ", landmarkId='" + landmarkId + '\'' +
+                ", areaName='" + areaName + '\'' +
+                ", rankLevel='" + rankLevel + '\'' +
+                ", allowEdit='" + allowEdit + '\'' +
+                ", allowNavigate='" + allowNavigate + '\'' +
+                ", publicArea='" + publicArea + '\'' +
+                ", remark='" + remark + '\'' +
+                ", icon='" + icon + '\'' +
+                ", keyword='" + keyword + '\'' +
+                ", video='" + video + '\'' +
+                ", textIntroduction='" + textIntroduction + '\'' +
+                ", url='" + url + '\'' +
+                ", showDistance='" + showDistance + '\'' +
+                ", templateId='" + templateId + '\'' +
+                ", frontLevelId='" + frontLevelId + '\'' +
+                ", blockId='" + blockId + '\'' +
+                ", areaType='" + areaType + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                ", areaShowPointList=" + areaShowPointList +
+                ", aimGroupInfo=" + aimGroupInfo +
+                ", thingInfoList=" + thingInfoList +
+                '}';
+    }
 }
 

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

@@ -249,5 +249,36 @@ public class AreaShowPoint {
     public void setAreaInfo(AreaInfo areaInfo) {
         this.areaInfo = areaInfo;
     }
+
+    @Override
+    public String toString() {
+        return "AreaShowPoint{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", power='" + power + '\'' +
+                ", cityId='" + cityId + '\'' +
+                ", landmarkId='" + landmarkId + '\'' +
+                ", areaId='" + areaId + '\'' +
+                ", pointName='" + pointName + '\'' +
+                ", doorFlag='" + doorFlag + '\'' +
+                ", remark='" + remark + '\'' +
+                ", mapX='" + mapX + '\'' +
+                ", mapY='" + mapY + '\'' +
+                ", mapIndex='" + mapIndex + '\'' +
+                ", longitude='" + longitude + '\'' +
+                ", latitude='" + latitude + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", landMark=" + landMark +
+                ", cityInfo=" + cityInfo +
+                ", areaInfo=" + areaInfo +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                '}';
+    }
 }
 

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

@@ -535,5 +535,64 @@ public class LandMark {
     public void setAddStepStr(String addStepStr) {
         this.addStepStr = addStepStr;
     }
+
+    @Override
+    public String toString() {
+        return "LandMark{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", mapName='" + mapName + '\'' +
+                ", ownedCityId=" + ownedCityId +
+                ", mapSprite='" + mapSprite + '\'' +
+                ", logeSprite='" + logeSprite + '\'' +
+                ", openDescribe='" + openDescribe + '\'' +
+                ", markDescribe='" + markDescribe + '\'' +
+                ", anchorImageGroupName='" + anchorImageGroupName + '\'' +
+                ", defaultMode=" + defaultMode +
+                ", vuforiaImageGroupId=" + vuforiaImageGroupId +
+                ", vuforiaDataName='" + vuforiaDataName + '\'' +
+                ", mapInfo='" + mapInfo + '\'' +
+                ", mapWidth='" + mapWidth + '\'' +
+                ", mapHeight='" + mapHeight + '\'' +
+                ", mapRate='" + mapRate + '\'' +
+                ", showInPanel='" + showInPanel + '\'' +
+                ", longitude='" + longitude + '\'' +
+                ", latitude='" + latitude + '\'' +
+                ", remark1='" + remark1 + '\'' +
+                ", remark2='" + remark2 + '\'' +
+                ", remark3='" + remark3 + '\'' +
+                ", frontLevelId='" + frontLevelId + '\'' +
+                ", vuforiaImageGroup=" + vuforiaImageGroup +
+                ", vuforiaImageInfoList=" + vuforiaImageInfoList +
+                ", aimPlaceContentList=" + aimPlaceContentList +
+                ", aimPlacePositionList=" + aimPlacePositionList +
+                ", landMarkChildList=" + landMarkChildList +
+                ", areaInfoList=" + areaInfoList +
+                ", thingInfoList=" + thingInfoList +
+                ", areaTypeId='" + areaTypeId + '\'' +
+                ", distance='" + distance + '\'' +
+                ", lngKey='" + lngKey + '\'' +
+                ", latKey='" + latKey + '\'' +
+                ", typeId=" + typeId +
+                ", keyword='" + keyword + '\'' +
+                ", power='" + power + '\'' +
+                ", areaMapInfo='" + areaMapInfo + '\'' +
+                ", mapAngle='" + mapAngle + '\'' +
+                ", markLevel='" + markLevel + '\'' +
+                ", markPrice='" + markPrice + '\'' +
+                ", busRoute='" + busRoute + '\'' +
+                ", addStep=" + addStep +
+                ", addStepStr='" + addStepStr + '\'' +
+                ", adImage='" + adImage + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                '}';
+    }
 }
 

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

@@ -316,5 +316,43 @@ public class ThingInfo {
     public void setLandMarkFlag(String landMarkFlag) {
         this.landMarkFlag = landMarkFlag;
     }
+
+    @Override
+    public String toString() {
+        return "ThingInfo{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", power='" + power + '\'' +
+                ", landmarkId='" + landmarkId + '\'' +
+                ", thingName='" + thingName + '\'' +
+                ", thingType='" + thingType + '\'' +
+                ", rankLevel='" + rankLevel + '\'' +
+                ", allowNavigate='" + allowNavigate + '\'' +
+                ", remark='" + remark + '\'' +
+                ", icon='" + icon + '\'' +
+                ", keyword='" + keyword + '\'' +
+                ", image='" + image + '\'' +
+                ", textIntroduction='" + textIntroduction + '\'' +
+                ", showDistance='" + showDistance + '\'' +
+                ", templateId='" + templateId + '\'' +
+                ", frontLevelId='" + frontLevelId + '\'' +
+                ", cityId='" + cityId + '\'' +
+                ", areaId='" + areaId + '\'' +
+                ", mapX='" + mapX + '\'' +
+                ", mapY='" + mapY + '\'' +
+                ", mapIndex='" + mapIndex + '\'' +
+                ", orientation='" + orientation + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                ", aimGroupInfo=" + aimGroupInfo +
+                ", landMarkFlag='" + landMarkFlag + '\'' +
+                '}';
+    }
 }
 

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

@@ -0,0 +1,140 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UserUpdateLog{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String tableName;
+    private String ip;
+    private String remark;
+    private String updateId;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public String getTableName(){
+        return this.tableName;
+    }
+
+    public void setTableName(String tableName){
+        this.tableName = tableName;
+    }
+    public String getIp(){
+        return this.ip;
+    }
+
+    public void setIp(String ip){
+        this.ip = ip;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getUpdateId(){
+        return this.updateId;
+    }
+
+    public void setUpdateId(String updateId){
+        this.updateId = updateId;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

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

@@ -175,5 +175,28 @@ public class VuforiaImageGroup {
     public void setSecretKey(String secretKey) {
         this.secretKey = secretKey;
     }
+
+    @Override
+    public String toString() {
+        return "VuforiaImageGroup{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", vuforiaDataName='" + vuforiaDataName + '\'' +
+                ", vuforiaName='" + vuforiaName + '\'' +
+                ", remark1='" + remark1 + '\'' +
+                ", remark2='" + remark2 + '\'' +
+                ", remark3='" + remark3 + '\'' +
+                ", accessKey='" + accessKey + '\'' +
+                ", secretKey='" + secretKey + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                '}';
+    }
 }
 

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

@@ -256,5 +256,37 @@ public class VuforiaImageInfo {
     public void setMapIndex(String mapIndex) {
         this.mapIndex = mapIndex;
     }
+
+    @Override
+    public String toString() {
+        return "VuforiaImageInfo{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateUser='" + updateUser + '\'' +
+                ", createTime=" + createTime +
+                ", createUser='" + createUser + '\'' +
+                ", vuforiaImageGroupId='" + vuforiaImageGroupId + '\'' +
+                ", name='" + name + '\'' +
+                ", vuforiaImageTypeId='" + vuforiaImageTypeId + '\'' +
+                ", areaMarking='" + areaMarking + '\'' +
+                ", landMarkId='" + landMarkId + '\'' +
+                ", arContentGroupId='" + arContentGroupId + '\'' +
+                ", posX='" + posX + '\'' +
+                ", posY='" + posY + '\'' +
+                ", posZ='" + posZ + '\'' +
+                ", angle='" + angle + '\'' +
+                ", remark1='" + remark1 + '\'' +
+                ", remark2='" + remark2 + '\'' +
+                ", remark3='" + remark3 + '\'' +
+                ", vuforiaImage='" + vuforiaImage + '\'' +
+                ", targetId='" + targetId + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", searchKey='" + searchKey + '\'' +
+                ", mapIndex='" + mapIndex + '\'' +
+                ", advancedQuery='" + advancedQuery + '\'' +
+                ", orderByStr='" + orderByStr + '\'' +
+                '}';
+    }
 }
 

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

@@ -0,0 +1,30 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+
+
+/**
+ * service接口类
+ */
+public interface UserUpdateLogService {
+
+    List<UserUpdateLog> getUserUpdateLogList(UserUpdateLog record);
+
+    List<UserUpdateLog> getUserUpdateLogByPage(Page page, UserUpdateLog record);
+
+    UserUpdateLog getUserUpdateLogById(String id);
+
+    UserUpdateLog getUserUpdateLog(UserUpdateLog record);
+
+    boolean createUserUpdateLog(UserUpdateLog record);
+
+    boolean newUserUpdateLog(UserUpdateLog record);
+
+    boolean deleteUserUpdateLog(UserUpdateLog record);
+
+    boolean updateUserUpdateLog(UserUpdateLog record);
+}
+

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

@@ -149,13 +149,23 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     private boolean updateUserRolesAndDeparts(UserInfo record, int updates) {
         if (updates > 0) {
-            if (record.getDepartId() != null) {
-                departInfoMapper.clearUserDeparts(record.getId());
-                departInfoMapper.setUserDeparts(record.getId(), Arrays.asList(record.getDepartId().split(",")));
+            if (StringUtils.isNotEmpty(record.getDepartId())) {
+                try {
+                    departInfoMapper.clearUserDeparts(record.getId());
+                    departInfoMapper.setUserDeparts(record.getId(), Arrays.asList(record.getDepartId().split(",")));
+                } catch (Exception e) {
+
+                    logger.error("更新部门异常", e);
+                }
             }
-            if (record.getRoleId() != null) {
-                sysRoleMapper.clearUserRoles(record.getId());
-                sysRoleMapper.setUserRoles(record.getId(), Arrays.asList(record.getRoleId().split(",")));
+            if (StringUtils.isNotEmpty(record.getRoleId())) {
+                try {
+                    sysRoleMapper.clearUserRoles(record.getId());
+                    sysRoleMapper.setUserRoles(record.getId(), Arrays.asList(record.getRoleId().split(",")));
+                } catch (Exception e) {
+                    logger.error("更新角色异常", e);
+                }
+
             }
             return true;
         }

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

@@ -0,0 +1,177 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.util.MbappUtil;
+import org.apache.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+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.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
+import com.izouma.awesomeadmin.dao.UserUpdateLogMapper;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class UserUpdateLogServiceImpl implements UserUpdateLogService{
+
+    private static Logger logger = Logger.getLogger(UserUpdateLogServiceImpl.class);
+
+    @Autowired
+    private UserUpdateLogMapper userUpdateLogMapper;
+
+    @Override
+    public List<UserUpdateLog> getUserUpdateLogList(UserUpdateLog record) {
+
+        logger.info("getUserUpdateLogList");
+        try {
+
+        return userUpdateLogMapper.queryAllUserUpdateLog(record);
+        } catch (Exception e) {
+        logger.error("getUserUpdateLogList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<UserUpdateLog> getUserUpdateLogByPage(Page page, UserUpdateLog record) {
+
+        logger.info("getUserUpdateLogByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return userUpdateLogMapper.queryUserUpdateLogByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getUserUpdateLogByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserUpdateLog getUserUpdateLogById(String id) {
+
+        logger.info("getUserUpdateLogyId");
+        try {
+
+            return userUpdateLogMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getUserUpdateLogById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserUpdateLog getUserUpdateLog(UserUpdateLog record) {
+
+        logger.info("getUserUpdateLog");
+        try {
+
+            return userUpdateLogMapper.queryUserUpdateLog(record);
+        } catch (Exception e) {
+        logger.error("getUserUpdateLog", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createUserUpdateLog(UserUpdateLog record) {
+
+        logger.info("createUserUpdateLog");
+        try {
+
+            int updates = userUpdateLogMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createUserUpdateLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteUserUpdateLog(UserUpdateLog record) {
+
+        logger.info("deleteUserUpdateLog");
+        try {
+
+             int updates = userUpdateLogMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteUserUpdateLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateUserUpdateLog(UserUpdateLog record) {
+
+        logger.info("updateUserUpdateLog");
+        try {
+
+            int updates = userUpdateLogMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateUserUpdateLog", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean newUserUpdateLog(UserUpdateLog record) {
+
+        logger.info("newUserUpdateLog");
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+            String ip = MbappUtil.getIpAdderss(request);
+
+            String userName = "未登录操作";
+            Subject subject = SecurityUtils.getSubject();
+            UserInfo userInfo = (UserInfo) subject.getPrincipal();
+            if (userInfo != null) {
+                userName = userInfo.getUsername();
+            }
+            record.setIp(ip);
+            record.setCreateUser(userName);
+
+
+            int updates = userUpdateLogMapper.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("newUserUpdateLog", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/util/MbappUtil.java

@@ -1,5 +1,6 @@
 package com.izouma.awesomeadmin.util;
 
+import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.springframework.stereotype.Service;
 
@@ -7,10 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
@@ -236,6 +234,41 @@ public class MbappUtil {
         return null;
     }
 
+    public static String getIpAdderss(HttpServletRequest request) {
+
+        InetAddress ia = null;
+        try {
+            // 获取客户端IP地址，考虑反向代理的问题
+            String ip = request.getHeader("x-forwarded-for");
+            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("Proxy-Client-IP");
+            }
+            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddr();
+                if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
+                    InetAddress inet = null;
+                    try {
+                        inet = InetAddress.getLocalHost();
+                        ip = inet.getHostAddress();
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            if (!StringUtils.isEmpty(ip) && ip.length() > 15) {
+                ip = ip.substring(0, ip.indexOf(","));
+            }
+            return ip;
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 
     /**
      * 生成商户订单号

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class AimGroupInfoController {
     @Autowired
     private AimGroupInfoService aimGroupInfoService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -80,6 +85,7 @@ public class AimGroupInfoController {
     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result save(AimGroupInfo record) {
         boolean num = aimGroupInfoService.createAimGroupInfo(record);
         if (num) {
@@ -91,9 +97,18 @@ public class AimGroupInfoController {
     /**
     * <p>更新信息。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateAimGroupInfo(AimGroupInfo record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("AimGroupInfo");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = aimGroupInfoService.updateAimGroupInfo(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -104,6 +119,7 @@ public class AimGroupInfoController {
     /**
     * <p>删除。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteAimGroupInfo(AimGroupInfo record) {

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class AimPlaceInfoController {
     @Autowired
     private AimPlaceInfoService aimPlaceInfoService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -80,6 +85,7 @@ public class AimPlaceInfoController {
     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result save(AimPlaceInfo record) {
         boolean num = aimPlaceInfoService.createAimPlaceInfo(record);
         if (num) {
@@ -93,7 +99,15 @@ public class AimPlaceInfoController {
     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result updateAimPlaceInfo(AimPlaceInfo record) {
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("AimPlaceInfo");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = aimPlaceInfoService.updateAimPlaceInfo(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -106,6 +120,7 @@ public class AimPlaceInfoController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result deleteAimPlaceInfo(AimPlaceInfo record) {
 
         boolean num = aimPlaceInfoService.deleteAimPlaceInfo(record);

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class AreaInfoController {
     @Autowired
     private AreaInfoService areaInfoService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -78,6 +83,7 @@ public class AreaInfoController {
     /**
     * <p>保存。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(AreaInfo record) {
@@ -91,9 +97,18 @@ public class AreaInfoController {
     /**
     * <p>更新信息。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateAreaInfo(AreaInfo record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("AreaInfo");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = areaInfoService.updateAreaInfo(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -104,6 +119,7 @@ public class AreaInfoController {
     /**
     * <p>删除。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteAreaInfo(AreaInfo record) {

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class AreaShowPointController {
     @Autowired
     private AreaShowPointService areaShowPointService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -80,6 +85,7 @@ public class AreaShowPointController {
     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result save(AreaShowPoint record) {
         boolean num = areaShowPointService.createAreaShowPoint(record);
         if (num) {
@@ -93,7 +99,16 @@ public class AreaShowPointController {
     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result updateAreaShowPoint(AreaShowPoint record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("AreaShowPoint");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = areaShowPointService.updateAreaShowPoint(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -106,6 +121,7 @@ public class AreaShowPointController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result deleteAreaShowPoint(AreaShowPoint record) {
 
         boolean num = areaShowPointService.deleteAreaShowPoint(record);

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class LandMarkController {
     @Autowired
     private LandMarkService landMarkService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
      * <p>获取全部记录。</p>
      */
@@ -114,6 +119,7 @@ public class LandMarkController {
     /**
      * <p>保存。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(LandMark record) {
@@ -127,9 +133,18 @@ public class LandMarkController {
     /**
      * <p>更新信息。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateLandMark(LandMark record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("landMark");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = landMarkService.updateLandMark(record);
         if (num) {
             return new Result(true, "保存成功");
@@ -140,6 +155,7 @@ public class LandMarkController {
     /**
      * <p>删除。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteLandMark(LandMark record) {

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -27,6 +29,9 @@ public class ThingInfoController {
     @Autowired
     private ThingInfoService thingInfoService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -80,6 +85,7 @@ public class ThingInfoController {
     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result save(ThingInfo record) {
         boolean num = thingInfoService.createThingInfo(record);
         if (num) {
@@ -93,7 +99,16 @@ public class ThingInfoController {
     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result updateThingInfo(ThingInfo record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("ThingInfo");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = thingInfoService.updateThingInfo(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -106,6 +121,7 @@ public class ThingInfoController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
+    @RequiresAuthentication
     public Result deleteThingInfo(ThingInfo record) {
 
         boolean num = thingInfoService.deleteThingInfo(record);

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

@@ -0,0 +1,161 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/userUpdateLog")
+public class UserUpdateLogController {
+
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(UserUpdateLog record) {
+        List<UserUpdateLog> pp = userUpdateLogService.getUserUpdateLogList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getUserUpdateLog", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getUserUpdateLog(@RequestParam(required = false, value = "id") String id) {
+        UserUpdateLog data = userUpdateLogService.getUserUpdateLogById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(UserUpdateLog record) {
+        UserUpdateLog data = userUpdateLogService.getUserUpdateLog(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, UserUpdateLog record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<UserUpdateLog> pp =userUpdateLogService.getUserUpdateLogByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(UserUpdateLog record) {
+        boolean num = userUpdateLogService.createUserUpdateLog(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateUserUpdateLog(UserUpdateLog record) {
+        boolean num = userUpdateLogService.updateUserUpdateLog(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteUserUpdateLog(UserUpdateLog record) {
+
+        boolean num = userUpdateLogService.deleteUserUpdateLog(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, UserUpdateLog record) throws Exception {
+
+    List<UserUpdateLog> userUpdateLogs = userUpdateLogService.getUserUpdateLogList(record);
+
+
+        String sheetName = "user_update_log";
+        String titleName = "更新操作日志数据表";
+        String fileName = "更新操作日志表";
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "表名" ,   "IP" ,   "内容" ,   "目标id"  };
+        String[][] dataList = new String[userUpdateLogs.size()][10];
+
+        for (int i = 0; i < userUpdateLogs.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(userUpdateLogs.get(i).getId());
+                        dataList[i][1] = String.valueOf(userUpdateLogs.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(userUpdateLogs.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(userUpdateLogs.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(userUpdateLogs.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(userUpdateLogs.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(userUpdateLogs.get(i).getTableName());
+                        dataList[i][7] = String.valueOf(userUpdateLogs.get(i).getIp());
+                        dataList[i][8] = String.valueOf(userUpdateLogs.get(i).getRemark());
+                        dataList[i][9] = String.valueOf(userUpdateLogs.get(i).getUpdateId());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

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

@@ -2,6 +2,8 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -26,6 +28,8 @@ public class VuforiaImageGroupController {
 
     @Autowired
     private VuforiaImageGroupService vuforiaImageGroupService;
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
 
     /**
     * <p>获取全部记录。</p>
@@ -78,6 +82,7 @@ public class VuforiaImageGroupController {
     /**
     * <p>保存。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(VuforiaImageGroup record) {
@@ -91,9 +96,18 @@ public class VuforiaImageGroupController {
     /**
     * <p>更新信息。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateVuforiaImageGroup(VuforiaImageGroup record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("VuforiaImageGroup");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = vuforiaImageGroupService.updateVuforiaImageGroup(record);
         if (num) {
         return new Result(true, "保存成功");
@@ -104,6 +118,7 @@ public class VuforiaImageGroupController {
     /**
     * <p>删除。</p>
     */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteVuforiaImageGroup(VuforiaImageGroup record) {

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

@@ -2,7 +2,9 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserUpdateLog;
 import com.izouma.awesomeadmin.model.VuforiaTarget;
+import com.izouma.awesomeadmin.service.UserUpdateLogService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -28,6 +30,9 @@ public class VuforiaImageInfoController {
     @Autowired
     private VuforiaImageInfoService vuforiaImageInfoService;
 
+    @Autowired
+    private UserUpdateLogService userUpdateLogService;
+
     /**
      * <p>获取全部记录。</p>
      */
@@ -85,6 +90,7 @@ public class VuforiaImageInfoController {
     /**
      * <p>保存。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(VuforiaImageInfo record) {
@@ -98,9 +104,18 @@ public class VuforiaImageInfoController {
     /**
      * <p>更新信息。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateVuforiaImageInfo(VuforiaImageInfo record) {
+
+        //添加更新日志。
+        UserUpdateLog userUpdateLog = new UserUpdateLog();
+        userUpdateLog.setUpdateId(record.getId() + "");
+        userUpdateLog.setTableName("VuforiaImageInfo");
+        userUpdateLog.setRemark(record.toString());
+        userUpdateLogService.newUserUpdateLog(userUpdateLog);
+
         boolean num = vuforiaImageInfoService.updateVuforiaImageInfo(record);
         if (num) {
             return new Result(true, "保存成功");
@@ -111,6 +126,7 @@ public class VuforiaImageInfoController {
     /**
      * <p>删除。</p>
      */
+    @RequiresAuthentication
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteVuforiaImageInfo(VuforiaImageInfo record) {

src/main/vue/src/pages/UserUpdateLog.vue

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

src/main/vue/src/pages/UserUpdateLogs.vue

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

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

@@ -589,6 +589,16 @@ const router = new Router({
                     name: 'ArContentTypes',
                     component: () =>
                         import ('../pages/ArContentTypes')
+                },
+                {
+                    path: '/userUpdateLog',
+                    name: 'UserUpdateLog',
+                    component: () => import('../pages/UserUpdateLog')
+                },
+                {
+                    path: '/userUpdateLogs',
+                    name: 'UserUpdateLogs',
+                    component: () => import('../pages/UserUpdateLogs')
                 }
                 /**INSERT_LOCATION**/
             ]

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.b07bc4f91549f9bffdf5bf82d883f088.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e80e5222e3c3a9ff10a1.js></script><script type=text/javascript src=/static/js/vendor.48a85186afc18aaab578.js></script><script type=text/javascript src=/static/js/admin.1d19960b46c299e256c9.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.b07bc4f91549f9bffdf5bf82d883f088.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7b646d606e4adc3c2f4e.js></script><script type=text/javascript src=/static/js/vendor.093529e5a9f11598157c.js></script><script type=text/javascript src=/static/js/admin.3d70caba16589b5012f5.js></script></body></html>

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

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

src/main/webapp/static/js/81.92e247d936678e569149.js → src/main/webapp/static/js/83.abd1fa4ff0a03e70f5b3.js

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