hanqingsong пре 1 година
родитељ
комит
57dbe06320

+ 4 - 0
src/main/java/com/chinaitop/depot/LogRecodeFilter.java

@@ -116,6 +116,10 @@ public class LogRecodeFilter extends ZuulFilter {
116
             String viewName = url.getViewName();
116
             String viewName = url.getViewName();
117
             pageLog.setViewName(viewName);
117
             pageLog.setViewName(viewName);
118
             // 访问用户名称
118
             // 访问用户名称
119
+			String orgInfo = request.getSession().getAttribute("orgInfo").toString();
120
+			UserInfoLog getOrg = JSON.parseObject(orgInfo, UserInfoLog.class);
121
+			pageLog.setOrgName(getOrg.getOrgName());
122
+
119
             String userInfo = request.getSession().getAttribute("userInfo").toString();
123
             String userInfo = request.getSession().getAttribute("userInfo").toString();
120
 			UserInfoLog userInfoLog = JSON.parseObject(userInfo, UserInfoLog.class);
124
 			UserInfoLog userInfoLog = JSON.parseObject(userInfo, UserInfoLog.class);
121
 			String realName = userInfoLog.getRealName();
125
 			String realName = userInfoLog.getRealName();

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

@@ -8,6 +8,7 @@
8
     <result column="user_ip" property="userIp" jdbcType="VARCHAR" />
8
     <result column="user_ip" property="userIp" jdbcType="VARCHAR" />
9
     <result column="visit_page_time" property="visitPageTime" jdbcType="TIMESTAMP" />
9
     <result column="visit_page_time" property="visitPageTime" jdbcType="TIMESTAMP" />
10
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
10
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
11
+    <result column="org_name" property="orgName" jdbcType="VARCHAR" />
11
   </resultMap>
12
   </resultMap>
12
   <sql id="Example_Where_Clause" >
13
   <sql id="Example_Where_Clause" >
13
     <where >
14
     <where >
@@ -68,7 +69,7 @@
68
     </where>
69
     </where>
69
   </sql>
70
   </sql>
70
   <sql id="Base_Column_List" >
71
   <sql id="Base_Column_List" >
71
-    id, view_name, real_name, user_ip, visit_page_time, org_id
72
+    id, view_name, real_name, user_ip, visit_page_time, org_id, org_name
72
   </sql>
73
   </sql>
73
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" >
74
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" >
74
     select
75
     select
@@ -92,9 +93,9 @@
92
   </delete>
93
   </delete>
93
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
94
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
94
     insert into user_operation_page_log (id, view_name, real_name, 
95
     insert into user_operation_page_log (id, view_name, real_name, 
95
-      user_ip, visit_page_time, org_id)
96
+      user_ip, visit_page_time, org_id, org_name)
96
     values (#{id,jdbcType=VARCHAR}, #{viewName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
97
     values (#{id,jdbcType=VARCHAR}, #{viewName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
97
-      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER})
98
+      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR})
98
   </insert>
99
   </insert>
99
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
100
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
100
     insert into user_operation_page_log
101
     insert into user_operation_page_log
@@ -117,6 +118,9 @@
117
       <if test="orgId != null" >
118
       <if test="orgId != null" >
118
         org_id,
119
         org_id,
119
       </if>
120
       </if>
121
+      <if test="orgName != null" >
122
+        org_name,
123
+      </if>
120
     </trim>
124
     </trim>
121
     <trim prefix="values (" suffix=")" suffixOverrides="," >
125
     <trim prefix="values (" suffix=")" suffixOverrides="," >
122
       <if test="id != null" >
126
       <if test="id != null" >
@@ -137,6 +141,9 @@
137
       <if test="orgId != null" >
141
       <if test="orgId != null" >
138
         #{orgId,jdbcType=INTEGER},
142
         #{orgId,jdbcType=INTEGER},
139
       </if>
143
       </if>
144
+      <if test="orgName != null" >
145
+        #{orgName,jdbcType=VARCHAR},
146
+      </if>
140
     </trim>
147
     </trim>
141
   </insert>
148
   </insert>
142
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" resultType="java.lang.Integer" >
149
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" resultType="java.lang.Integer" >
@@ -166,6 +173,9 @@
166
       <if test="record.visitPageTime != null" >
173
       <if test="record.visitPageTime != null" >
167
         org_id = #{record.orgId,jdbcType=INTEGER},
174
         org_id = #{record.orgId,jdbcType=INTEGER},
168
       </if>
175
       </if>
176
+      <if test="record.visitPageTime != null" >
177
+        org_name = #{record.orgName,jdbcType=VARCHAR},
178
+      </if>
169
     </set>
179
     </set>
170
     <if test="_parameter != null" >
180
     <if test="_parameter != null" >
171
       <include refid="Update_By_Example_Where_Clause" />
181
       <include refid="Update_By_Example_Where_Clause" />
@@ -178,7 +188,8 @@
178
       real_name = #{record.realName,jdbcType=VARCHAR},
188
       real_name = #{record.realName,jdbcType=VARCHAR},
179
       user_ip = #{record.userIp,jdbcType=VARCHAR},
189
       user_ip = #{record.userIp,jdbcType=VARCHAR},
180
       visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
190
       visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
181
-      org_id = #{record.orgId,jdbcType=INTEGER}
191
+      org_id = #{record.orgId,jdbcType=INTEGER},
192
+      org_name = #{record.orgName,jdbcType=VARCHAR}
182
     <if test="_parameter != null" >
193
     <if test="_parameter != null" >
183
       <include refid="Update_By_Example_Where_Clause" />
194
       <include refid="Update_By_Example_Where_Clause" />
184
     </if>
195
     </if>

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

@@ -11,6 +11,16 @@ public class UserInfoLog {
11
 
11
 
12
     private Integer orgId;
12
     private Integer orgId;
13
 
13
 
14
+    private String orgName;
15
+
16
+    public String getOrgName() {
17
+        return orgName;
18
+    }
19
+
20
+    public void setOrgName(String orgName) {
21
+        this.orgName = orgName;
22
+    }
23
+
14
     public Integer getOrgId() {
24
     public Integer getOrgId() {
15
         return orgId;
25
         return orgId;
16
     }
26
     }

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

@@ -15,6 +15,16 @@ public class UserOperationPageLog {
15
 
15
 
16
     private Integer orgId;
16
     private Integer orgId;
17
 
17
 
18
+    private String orgName;
19
+
20
+    public String getOrgName() {
21
+        return orgName;
22
+    }
23
+
24
+    public void setOrgName(String orgName) {
25
+        this.orgName = orgName;
26
+    }
27
+
18
     public Integer getOrgId() {
28
     public Integer getOrgId() {
19
         return orgId;
29
         return orgId;
20
     }
30
     }