修改配置文件

arch-clouds/log/src/main/java/org/arch/log/entity/SysEventLog.java

@@ -157,16 +157,10 @@ public class SysEventLog {
 
     public static final String LOG_LEV = "log_lev";
 
-    public static final String IS_WARN = "is_warn";
-
     public static final String RESULT = "result";
 
     public static final String USER_CODE = "user_code";
 
-    public static final String MENU_ID = "menu_id";
-
-    public static final String MENU_URI = "menu_uri";
-
     public static final String IS_READ = "is_read";
     public static final String REQUEST_TIME = "request_time";
     public static final String REQUEST_PARAMS = "request_params";

arch-clouds/log/src/main/resources/mapper/SysEventLogMapper.xml

@@ -26,7 +26,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="BaseResultMap">
         select
-          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params
+          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code, is_read, request_time, request_params
         from sys_event_log
         where log_id = #{logId}
     </select>
@@ -34,7 +34,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="BaseResultMap">
         select
-          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params
+          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code, is_read, request_time, request_params
         from sys_event_log
         <where>
             <if test="logId != null and logId != ''">
@@ -73,12 +73,6 @@
             <if test="userCode != null and userCode != ''">
                 and user_code = #{userCode}
             </if>
-            <if test="menuId != null and menuId != ''">
-                and menu_id = #{menuId}
-            </if>
-            <if test="menuUri != null and menuUri != ''">
-                and menu_uri = #{menuUri}
-            </if>
             <if test="isRead != null">
                 and is_read = #{isRead}
             </if>
@@ -95,7 +89,7 @@
     <!--通过实体作为筛选条件查询-->
     <select id="queryAll" resultMap="BaseResultMap">
         select
-          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params
+          log_id, user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code,is_read, request_time, request_params
         from eadc.sys_event_log
     </select>
     <!--统计总行数-->
@@ -139,12 +133,6 @@
             <if test="userCode != null and userCode != ''">
                 and user_code = #{userCode}
             </if>
-            <if test="menuId != null and menuId != ''">
-                and menu_id = #{menuId}
-            </if>
-            <if test="menuUri != null and menuUri != ''">
-                and menu_uri = #{menuUri}
-            </if>
             <if test="isRead != null">
                 and is_read = #{isRead}
             </if>
@@ -159,23 +147,23 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="logId" useGeneratedKeys="true">
-        insert into sys_event_log(log_id,user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params ,cost_time)
-        values (#{logId},#{userId}, #{username}, #{ipAddr}, #{createTime}, #{eventType}, #{eventContent}, #{logType}, #{logLev}, #{isWarn}, #{result}, #{userCode}, #{menuId}, #{menuUri}, #{isRead}, #{requestTime}, #{requestParams}, #{costTime})
+        insert into sys_event_log(log_id,user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code, is_read, request_time, request_params ,cost_time)
+        values (#{logId},#{userId}, #{username}, #{ipAddr}, #{createTime}, #{eventType}, #{eventContent}, #{logType}, #{logLev}, #{isWarn}, #{result}, #{userCode}, #{isRead}, #{requestTime}, #{requestParams}, #{costTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="logId" useGeneratedKeys="true">
-        insert into sys_event_log(user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params)
+        insert into sys_event_log(user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code, is_read, request_time, request_params)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.userId}, #{entity.username}, #{entity.ipAddr}, #{entity.createTime}, #{entity.eventType}, #{entity.eventContent}, #{entity.logType}, #{entity.logLev}, #{entity.isWarn}, #{entity.result}, #{entity.userCode}, #{entity.menuId}, #{entity.menuUri}, #{entity.isRead}, #{entity.requestTime}, #{entity.requestParams})
+        (#{entity.userId}, #{entity.username}, #{entity.ipAddr}, #{entity.createTime}, #{entity.eventType}, #{entity.eventContent}, #{entity.logType}, #{entity.logLev}, #{entity.isWarn}, #{entity.result}, #{entity.userCode}, #{entity.isRead}, #{entity.requestTime}, #{entity.requestParams})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="logId" useGeneratedKeys="true">
-        insert into sys_event_log(user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev, is_warn, result, user_code, menu_id, menu_uri, is_read, request_time, request_params)
+        insert into sys_event_log(user_id, username, ip_addr, create_time, event_type, event_content, log_type, log_lev,  result, user_code, is_read, request_time, request_params)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.userId}, #{entity.username}, #{entity.ipAddr}, #{entity.createTime}, #{entity.eventType}, #{entity.eventContent}, #{entity.logType}, #{entity.logLev}, #{entity.isWarn}, #{entity.result}, #{entity.userCode}, #{entity.menuId}, #{entity.menuUri}, #{entity.isRead}, #{entity.requestTime}, #{entity.requestParams})
+            (#{entity.userId}, #{entity.username}, #{entity.ipAddr}, #{entity.createTime}, #{entity.eventType}, #{entity.eventContent}, #{entity.logType}, #{entity.logLev}, #{entity.isWarn}, #{entity.result}, #{entity.userCode}, #{entity.isRead}, #{entity.requestTime}, #{entity.requestParams})
         </foreach>
         on duplicate key update
         user_id = values(user_id),
@@ -186,11 +174,8 @@
         event_content = values(event_content),
         log_type = values(log_type),
         log_lev = values(log_lev),
-        is_warn = values(is_warn),
         result = values(result),
         user_code = values(user_code),
-        menu_id = values(menu_id),
-        menu_uri = values(menu_uri),
         is_read = values(is_read),
         request_time = values(request_time),
         request_params = values(request_params)
@@ -233,12 +218,6 @@
             <if test="userCode != null and userCode != ''">
                 user_code = #{userCode},
             </if>
-            <if test="menuId != null and menuId != ''">
-                menu_id = #{menuId},
-            </if>
-            <if test="menuUri != null and menuUri != ''">
-                menu_uri = #{menuUri},
-            </if>
             <if test="isRead != null">
                 is_read = #{isRead},
             </if>