hanqingsong 1 год назад
Родитель
Сommit
c0d945eeca

+ 3 - 1
src/main/java/com/chinaitop/depot/LogRecodeFilter.java

@@ -117,7 +117,9 @@ public class LogRecodeFilter extends ZuulFilter {
117 117
             pageLog.setViewName(viewName);
118 118
             // 访问用户名称
119 119
             String userInfo = request.getSession().getAttribute("userInfo").toString();
120
-            String realName = JSON.parseObject(userInfo, UserInfoLog.class).getRealName();
120
+			UserInfoLog userInfoLog = JSON.parseObject(userInfo, UserInfoLog.class);
121
+			String realName = userInfoLog.getRealName();
122
+			pageLog.setOrgId(userInfoLog.getOrgId());
121 123
             pageLog.setRealName(realName);
122 124
             // 用户设备IP
123 125
             String ip = getIpAddr(request);

+ 15 - 4
src/main/java/com/chinaitop/depot/system/mapper/UserOperationPageLogMapper.xml

@@ -7,6 +7,7 @@
7 7
     <result column="real_name" property="realName" jdbcType="VARCHAR" />
8 8
     <result column="user_ip" property="userIp" jdbcType="VARCHAR" />
9 9
     <result column="visit_page_time" property="visitPageTime" jdbcType="TIMESTAMP" />
10
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
10 11
   </resultMap>
11 12
   <sql id="Example_Where_Clause" >
12 13
     <where >
@@ -67,7 +68,7 @@
67 68
     </where>
68 69
   </sql>
69 70
   <sql id="Base_Column_List" >
70
-    id, view_name, real_name, user_ip, visit_page_time
71
+    id, view_name, real_name, user_ip, visit_page_time, org_id
71 72
   </sql>
72 73
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" >
73 74
     select
@@ -91,9 +92,9 @@
91 92
   </delete>
92 93
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
93 94
     insert into user_operation_page_log (id, view_name, real_name, 
94
-      user_ip, visit_page_time)
95
+      user_ip, visit_page_time, org_id)
95 96
     values (#{id,jdbcType=VARCHAR}, #{viewName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
96
-      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP})
97
+      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER})
97 98
   </insert>
98 99
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
99 100
     insert into user_operation_page_log
@@ -113,6 +114,9 @@
113 114
       <if test="visitPageTime != null" >
114 115
         visit_page_time,
115 116
       </if>
117
+      <if test="orgId != null" >
118
+        org_id,
119
+      </if>
116 120
     </trim>
117 121
     <trim prefix="values (" suffix=")" suffixOverrides="," >
118 122
       <if test="id != null" >
@@ -130,6 +134,9 @@
130 134
       <if test="visitPageTime != null" >
131 135
         #{visitPageTime,jdbcType=TIMESTAMP},
132 136
       </if>
137
+      <if test="orgId != null" >
138
+        #{orgId,jdbcType=INTEGER},
139
+      </if>
133 140
     </trim>
134 141
   </insert>
135 142
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" resultType="java.lang.Integer" >
@@ -156,6 +163,9 @@
156 163
       <if test="record.visitPageTime != null" >
157 164
         visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
158 165
       </if>
166
+      <if test="record.visitPageTime != null" >
167
+        org_id = #{record.orgId,jdbcType=INTEGER},
168
+      </if>
159 169
     </set>
160 170
     <if test="_parameter != null" >
161 171
       <include refid="Update_By_Example_Where_Clause" />
@@ -167,7 +177,8 @@
167 177
       view_name = #{record.viewName,jdbcType=VARCHAR},
168 178
       real_name = #{record.realName,jdbcType=VARCHAR},
169 179
       user_ip = #{record.userIp,jdbcType=VARCHAR},
170
-      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP}
180
+      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
181
+      org_id = #{record.orgId,jdbcType=INTEGER}
171 182
     <if test="_parameter != null" >
172 183
       <include refid="Update_By_Example_Where_Clause" />
173 184
     </if>

+ 10 - 0
src/main/java/com/chinaitop/depot/system/model/UserInfoLog.java

@@ -9,6 +9,16 @@ public class UserInfoLog {
9 9
 
10 10
     private String realName;
11 11
 
12
+    private Integer orgId;
13
+
14
+    public Integer getOrgId() {
15
+        return orgId;
16
+    }
17
+
18
+    public void setOrgId(Integer orgId) {
19
+        this.orgId = orgId;
20
+    }
21
+
12 22
     public String getRealName() {
13 23
         return realName;
14 24
     }

+ 10 - 0
src/main/java/com/chinaitop/depot/system/model/UserOperationPageLog.java

@@ -13,6 +13,16 @@ public class UserOperationPageLog {
13 13
 
14 14
     private Date visitPageTime;
15 15
 
16
+    private Integer orgId;
17
+
18
+    public Integer getOrgId() {
19
+        return orgId;
20
+    }
21
+
22
+    public void setOrgId(Integer orgId) {
23
+        this.orgId = orgId;
24
+    }
25
+
16 26
     /**
17 27
      * null
18 28
      * @return id null