机构名称

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -262,6 +262,8 @@ public class UserInfoController {
 			}
 		}*/
 		UserInfo userInfo = null;
+		// 机构名称
+		String orgName = null;
 		if(!userInfoService.validUsername(null,username)) {//用户名存在
 			/**************************限制单个用户的同时重复登录操作************************/
 			String sessionId = ObjectUtils.toString(redisUtil.get(username+"_sessinId"),"");
@@ -373,6 +375,9 @@ public class UserInfoController {
 				OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
 				String orgInfoObject = mapper.writeValueAsString(orgInfo);
 				session.setAttribute("orgInfo", orgInfoObject);
+
+				// 登录日志保存机构名称
+				orgName = orgInfo.getOrgName();
 				// 当前用户所属的库信息及库编号
 				OrgInfo depotInfo = orgInfoService.getDepotInfo(orgInfo);
 				if(depotInfo!=null){
@@ -386,7 +391,8 @@ public class UserInfoController {
 			map.put("status", true);
 			map.put("userInfo", userInfo);
 			// 登录日志
-			userLoginLogService.saveData(request, userInfo, "1");
+			System.out.println(orgName);
+			userLoginLogService.saveData(request, userInfo, "1", orgName);
 		}
 		return map;
 	}
@@ -937,6 +943,8 @@ public class UserInfoController {
 		
 		Map<String, Object> map = new HashMap<String, Object>();
 		UserInfo userInfo = null;
+		// 登录日志
+		String orgName = null;
 		if(!userInfoService.validUsername(null,username)) {//用户名存在
 			/**************************限制单个用户的同时重复登录操作************************/
 			String sessionId = ObjectUtils.toString(redisUtil.get(username+"_sessinId"),"");
@@ -1027,6 +1035,9 @@ public class UserInfoController {
 				OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
 				String orgInfoObject = mapper.writeValueAsString(orgInfo);
 				session.setAttribute("orgInfo", orgInfoObject);
+
+				// 登录日志
+				orgName = orgInfo.getOrgName();
 				// 当前用户所属的库信息及库编号
 				OrgInfo depotInfo = orgInfoService.getDepotInfo(orgInfo);
 				if(depotInfo!=null){
@@ -1040,7 +1051,7 @@ public class UserInfoController {
 			map.put("status", true);
 			map.put("userInfo", userInfo);
             // 登录日志
-            userLoginLogService.saveData(request, userInfo, "2");
+            userLoginLogService.saveData(request, userInfo, "2", orgName);
 		}
 		return map;
 	}

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

@@ -11,6 +11,7 @@
     <result column="session_id" property="sessionId" jdbcType="VARCHAR" />
     <result column="login_type" property="loginType" jdbcType="VARCHAR" />
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="org_name" property="orgName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -71,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, user_name, real_name, user_ip, in_login_time, out_login_time, session_id, login_type, org_id
+    id, user_name, real_name, user_ip, in_login_time, out_login_time, session_id, login_type, org_id, org_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserLoginLogExample" >
     select
@@ -96,10 +97,10 @@
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserLoginLog" >
     insert into user_login_log (id, user_name, real_name, 
       user_ip, in_login_time, out_login_time, 
-      session_id, login_type,org_id)
+      session_id, login_type,org_id, org_name)
     values (#{id,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
       #{userIp,jdbcType=VARCHAR}, #{inLoginTime,jdbcType=TIMESTAMP}, #{outLoginTime,jdbcType=TIMESTAMP}, 
-      #{sessionId,jdbcType=VARCHAR}, #{loginType,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER})
+      #{sessionId,jdbcType=VARCHAR}, #{loginType,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserLoginLog" >
     insert into user_login_log
@@ -131,6 +132,9 @@
       <if test="orgId != null" >
         org_id,
       </if>
+      <if test="orgName != null" >
+        org_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -160,6 +164,9 @@
       <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.UserLoginLogExample" resultType="java.lang.Integer" >
@@ -196,7 +203,10 @@
         login_type = #{record.loginType,jdbcType=VARCHAR},
       </if>
       <if test="record.orgId != null" >
-        org_id = #{record.orgId,jdbcType=VARCHAR},
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgName != null" >
+        org_name = #{record.orgName,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null" >
@@ -213,7 +223,8 @@
       out_login_time = #{record.outLoginTime,jdbcType=TIMESTAMP},
       session_id = #{record.sessionId,jdbcType=VARCHAR},
       login_type = #{record.loginType,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=INTEGER}
+      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/UserLoginLog.java

@@ -34,6 +34,17 @@ public class UserLoginLog {
     // 库点id
     private Integer orgId;
 
+    // 机构名称
+    private String orgName;
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
     public Integer getOrgId() {
         return orgId;
     }

src/main/java/com/chinaitop/depot/system/service/UserLoginLogService.java

@@ -16,7 +16,7 @@ import java.util.List;
 public interface UserLoginLogService {
 
     // 保存登录日志
-    void saveData(HttpServletRequest request, UserInfo userInfo, String loginType);
+    void saveData(HttpServletRequest request, UserInfo userInfo, String loginType, String orgName);
 
     // 更新登录日志
     void updateData(HttpServletRequest request);

src/main/java/com/chinaitop/depot/system/service/impl/UserLoginLogServiceImpl.java

@@ -48,7 +48,7 @@ public class UserLoginLogServiceImpl implements UserLoginLogService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveData(HttpServletRequest request, UserInfo userInfo, String loginType) {
+    public void saveData(HttpServletRequest request, UserInfo userInfo, String loginType, String orgName) {
         // 查询是否登录成功
         if (redisUtil.hasKey(userInfo.getUsername() + CommonObject.sessionId)) {
             UserLoginLog log = new UserLoginLog();