日志导出

src/main/java/com/chinaitop/depot/system/mapper/UserOperationPageLogMapper.xml

@@ -7,6 +7,8 @@
     <result column="real_name" property="realName" jdbcType="VARCHAR" />
     <result column="user_ip" property="userIp" jdbcType="VARCHAR" />
     <result column="visit_page_time" property="visitPageTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="org_name" property="orgName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -67,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, view_name, real_name, user_ip, visit_page_time
+    id, view_name, real_name, user_ip, visit_page_time, org_id, org_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" >
     select
@@ -91,9 +93,9 @@
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
     insert into user_operation_page_log (id, view_name, real_name, 
-      user_ip, visit_page_time)
+      user_ip, visit_page_time,org_id, org_name)
     values (#{id,jdbcType=VARCHAR}, #{viewName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
-      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP})
+      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
     insert into user_operation_page_log
@@ -113,6 +115,12 @@
       <if test="visitPageTime != null" >
         visit_page_time,
       </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="orgName != null" >
+        org_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -130,6 +138,12 @@
       <if test="visitPageTime != null" >
         #{visitPageTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="orgName != null" >
+        #{orgName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" resultType="java.lang.Integer" >
@@ -156,6 +170,12 @@
       <if test="record.visitPageTime != null" >
         visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgName != null" >
+        org_name = #{record.orgName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -167,7 +187,9 @@
       view_name = #{record.viewName,jdbcType=VARCHAR},
       real_name = #{record.realName,jdbcType=VARCHAR},
       user_ip = #{record.userIp,jdbcType=VARCHAR},
-      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP}
+      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      org_name = #{record.orgName,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/system/model/UserLoginLogVO.java

@@ -33,4 +33,8 @@ public class UserLoginLogVO {
     // 注销时间
     @ExcelProperty(value = "注销时间")
     private Date outLoginTime;
+
+    // 机构名称
+    @ExcelProperty(value = "粮库名称")
+    private String orgName;
 }

src/main/java/com/chinaitop/depot/system/model/UserOperationPageLog.java

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.system.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -16,6 +18,12 @@ public class UserOperationPageLog {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date visitPageTime;
 
+    @Getter @Setter
+    private String orgId;
+
+    @Getter @Setter
+    private String orgName;
+
     /**
      * null
      * @return id null

src/main/java/com/chinaitop/depot/system/model/UserOperationPageLogVO.java

@@ -33,4 +33,7 @@ public class UserOperationPageLogVO {
     // 访问页面时间
     @ExcelProperty(value = "访问页面时间")
     private Date visitPageTime;
+
+    @ExcelProperty(value = "粮库名称")
+    private String orgName;
 }