Browse Source

用户登录新增最后登录时间,在管理员列表展示最后登录时间

anderx 7 years ago
parent
commit
71412d3520

+ 12 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -76,6 +76,10 @@ public class AdminListBo {
 	/** 职务 **/
 	private String duty;
 	
+	/**
+	 * 最后登录时间
+	 */
+	private String lastLoginTime;
 	/** 角色 **/
 	private List<String> roles;
 	
@@ -239,4 +243,12 @@ public class AdminListBo {
 
 	}
 
+	public String getLastLoginTime() {
+		return lastLoginTime;
+	}
+
+	public void setLastLoginTime(String lastLoginTime) {
+		this.lastLoginTime = lastLoginTime;
+	}
+
 }

+ 15 - 15
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -14,71 +14,69 @@ import com.goafanti.common.model.AdminExample;
 public interface AdminMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	long countByExample(AdminExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int deleteByExample(AdminExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int insert(Admin record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int insertSelective(Admin record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	List<Admin> selectByExample(AdminExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	Admin selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") Admin record, @Param("example") AdminExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int updateByExample(@Param("record") Admin record, @Param("example") AdminExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
 	int updateByPrimaryKeySelective(Admin record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table admin
-	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
+	 * @mbg.generated  Fri Jun 22 14:12:55 CST 2018
 	 */
-	
-
-	List<Admin> selectAllAdmin();
+	int updateByPrimaryKey(Admin record);
 
 	Admin selectByMobile(String mobile);
 
@@ -156,7 +154,7 @@ public interface AdminMapper {
 	List<AdminListBo> selectSubList(@Param("adminId")String adminId);
 	
 	/**
-	 * 查询订单变更信息通知�?
+	 * 查询订单变更信息通知�??
 	 * @param orderNo
 	 * @return
 	 */
@@ -171,6 +169,8 @@ public interface AdminMapper {
 	
 	Admin selectAdminName(@Param("name")String name);
 
+	List<Admin> selectAllAdmin();
+
 	
 
 }

+ 63 - 20
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -25,12 +25,13 @@
     <result column="district" jdbcType="VARCHAR" property="district" />
     <result column="head_portrait_url" jdbcType="VARCHAR" property="headPortraitUrl" />
     <result column="contact_mobile" jdbcType="VARCHAR" property="contactMobile" />
+    <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -64,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,16 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     id, mobile, name, password, email, create_time, number, province, position, superior_id, 
-    city, department_id, status, user_no, duty, district, head_portrait_url, contact_mobile
+    city, department_id, status, user_no, duty, district, head_portrait_url, contact_mobile, 
+    last_login_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.AdminExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     select
     <if test="distinct">
@@ -126,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -137,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     delete from admin
     where id = #{id,jdbcType=VARCHAR}
@@ -146,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     delete from admin
     <if test="_parameter != null">
@@ -157,28 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     insert into admin (id, mobile, name, 
       password, email, create_time, 
       number, province, position, 
       superior_id, city, department_id, 
       status, user_no, duty, 
-      district, head_portrait_url,contact_mobile
-      )
+      district, head_portrait_url, contact_mobile, 
+      last_login_time)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
       #{superiorId,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{departmentId,jdbcType=VARCHAR}, 
       #{status,jdbcType=VARCHAR}, #{userNo,jdbcType=VARCHAR}, #{duty,jdbcType=VARCHAR}, 
-      #{district,jdbcType=VARCHAR}, #{headPortraitUrl,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}
-      )
+      #{district,jdbcType=VARCHAR}, #{headPortraitUrl,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, 
+      #{lastLoginTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Admin">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     insert into admin
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -236,6 +238,9 @@
       <if test="contactMobile != null">
         contact_mobile,
       </if>
+      <if test="lastLoginTime != null">
+        last_login_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -292,13 +297,16 @@
       <if test="contactMobile != null">
         #{contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="lastLoginTime != null">
+        #{lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.AdminExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     select count(*) from admin
     <if test="_parameter != null">
@@ -309,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     update admin
     <set>
@@ -367,6 +375,9 @@
       <if test="record.contactMobile != null">
         contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="record.lastLoginTime != null">
+        last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -376,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     update admin
     set id = #{record.id,jdbcType=VARCHAR},
@@ -396,7 +407,8 @@
       duty = #{record.duty,jdbcType=VARCHAR},
       district = #{record.district,jdbcType=VARCHAR},
       head_portrait_url = #{record.headPortraitUrl,jdbcType=VARCHAR},
-      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR}
+      contact_mobile = #{record.contactMobile,jdbcType=VARCHAR},
+      last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -405,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 13 10:27:07 CST 2018.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
     -->
     update admin
     <set>
@@ -460,9 +472,39 @@
       <if test="contactMobile != null">
         contact_mobile = #{contactMobile,jdbcType=VARCHAR},
       </if>
+      <if test="lastLoginTime != null">
+        last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.Admin">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jun 22 14:12:55 CST 2018.
+    -->
+    update admin
+    set mobile = #{mobile,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      number = #{number,jdbcType=INTEGER},
+      province = #{province,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR},
+      superior_id = #{superiorId,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      user_no = #{userNo,jdbcType=VARCHAR},
+      duty = #{duty,jdbcType=VARCHAR},
+      district = #{district,jdbcType=VARCHAR},
+      head_portrait_url = #{headPortraitUrl,jdbcType=VARCHAR},
+      contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
  
 
   
@@ -622,6 +664,7 @@
    		 aa.name as superior, 
    		 a.superior_id as superiorId,
    		 a.department_id as departmentId,
+   		 date_format(a.last_login_time,'%Y-%m-%d %H:%i:%S') as lastLoginTime, 
    		 dm.name as departmentName
     from admin a 
     left join admin_location al on a.id = al.admin_id

+ 9 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -104,7 +104,7 @@ public class Admin extends BaseModel implements AftUser {
 	 * @return  the value of admin.id
 	 * @mbg.generated  Wed Jun 13 10:27:07 CST 2018
 	 */
-
+	private Date lastLoginTime;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column admin.contact_mobile
 	 * @return  the value of admin.contact_mobile
@@ -295,4 +295,12 @@ public class Admin extends BaseModel implements AftUser {
 	public Integer getType() {
 		return null;
 	}
+
+	public Date getLastLoginTime() {
+		return lastLoginTime;
+	}
+
+	public void setLastLoginTime(Date lastLoginTime) {
+		this.lastLoginTime = lastLoginTime;
+	}
 }

File diff suppressed because it is too large
+ 1542 - 1523
src/main/java/com/goafanti/common/model/AdminExample.java


+ 5 - 0
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -122,6 +122,11 @@ public class UserLoginController extends BaseController {
 			return res;
 		}
 		res.setData(TokenManager.manageLogin(admin, remember));
+		Admin a =adminMapper.selectByMobile(admin.getMobile());
+		if (a!=null) {
+			a.setLastLoginTime(new Date());
+			adminMapper.updateByPrimaryKeySelective(a);
+		}
 		return res;
 	}