From 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/AccountMapper.xml | 290 +++-------------------------------------------------------
1 files changed, 15 insertions(+), 275 deletions(-)
diff --git a/src/main/resources/mapper/AccountMapper.xml b/src/main/resources/mapper/AccountMapper.xml
index 6279878..715d8f4 100644
--- a/src/main/resources/mapper/AccountMapper.xml
+++ b/src/main/resources/mapper/AccountMapper.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.AccountMapper">
<resultMap id="BaseResultMap" type="com.moral.entity.Account">
<id column="id" jdbcType="INTEGER" property="id" />
@@ -12,284 +12,24 @@
<result column="is_delete" jdbcType="CHAR" property="isDelete" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
+ <result column="user_name" jdbcType="VARCHAR" property="userName" />
+ <association property="jwtTokenVersion" javaType="com.moral.entity.JwtTokenVersion">
+ <result column="jwt_token_version_id" property="id" jdbcType="INTEGER" />
+ <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ </association>
</resultMap>
- <sql id="Example_Where_Clause">
- <where>
- <foreach collection="oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause">
- <where>
- <foreach collection="example.oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
<sql id="Base_Column_List">
id, account_name, password, organization_id, email, mobile, weixin, is_delete, create_time,
- expire_time
+ expire_time, user_name
</sql>
- <select id="selectByExample" parameterType="com.moral.entity.AccountExample" resultMap="BaseResultMap">
- select
- <if test="distinct">
- distinct
- </if>
- <include refid="Base_Column_List" />
- from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null">
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ <select id="getByAccountName" parameterType="java.lang.String" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
- from account
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete from account
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.AccountExample">
- delete from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.Account">
- insert into account (id, account_name, password,
- organization_id, email, mobile,
- weixin, is_delete, create_time,
- expire_time)
- values (#{id,jdbcType=INTEGER}, #{accountName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
- #{organizationId,jdbcType=INTEGER}, #{email,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
- #{weixin,jdbcType=VARCHAR}, #{isDelete,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP},
- #{expireTime,jdbcType=TIMESTAMP})
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.Account">
- insert into account
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="accountName != null">
- account_name,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="organizationId != null">
- organization_id,
- </if>
- <if test="email != null">
- email,
- </if>
- <if test="mobile != null">
- mobile,
- </if>
- <if test="weixin != null">
- weixin,
- </if>
- <if test="isDelete != null">
- is_delete,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="expireTime != null">
- expire_time,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="accountName != null">
- #{accountName,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null">
- #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="email != null">
- #{email,jdbcType=VARCHAR},
- </if>
- <if test="mobile != null">
- #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null">
- #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null">
- #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null">
- #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.AccountExample" resultType="java.lang.Integer">
- select count(*) from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map">
- update account
- <set>
- <if test="record.id != null">
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.accountName != null">
- account_name = #{record.accountName,jdbcType=VARCHAR},
- </if>
- <if test="record.password != null">
- password = #{record.password,jdbcType=VARCHAR},
- </if>
- <if test="record.organizationId != null">
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- </if>
- <if test="record.email != null">
- email = #{record.email,jdbcType=VARCHAR},
- </if>
- <if test="record.mobile != null">
- mobile = #{record.mobile,jdbcType=VARCHAR},
- </if>
- <if test="record.weixin != null">
- weixin = #{record.weixin,jdbcType=VARCHAR},
- </if>
- <if test="record.isDelete != null">
- is_delete = #{record.isDelete,jdbcType=CHAR},
- </if>
- <if test="record.createTime != null">
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.expireTime != null">
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map">
- update account
- set id = #{record.id,jdbcType=INTEGER},
- account_name = #{record.accountName,jdbcType=VARCHAR},
- password = #{record.password,jdbcType=VARCHAR},
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- email = #{record.email,jdbcType=VARCHAR},
- mobile = #{record.mobile,jdbcType=VARCHAR},
- weixin = #{record.weixin,jdbcType=VARCHAR},
- is_delete = #{record.isDelete,jdbcType=CHAR},
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP}
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.Account">
- update account
- <set>
- <if test="accountName != null">
- account_name = #{accountName,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null">
- organization_id = #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="email != null">
- email = #{email,jdbcType=VARCHAR},
- </if>
- <if test="mobile != null">
- mobile = #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null">
- weixin = #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null">
- is_delete = #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null">
- expire_time = #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.Account">
- update account
- set account_name = #{accountName,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- organization_id = #{organizationId,jdbcType=INTEGER},
- email = #{email,jdbcType=VARCHAR},
- mobile = #{mobile,jdbcType=VARCHAR},
- weixin = #{weixin,jdbcType=VARCHAR},
- is_delete = #{isDelete,jdbcType=CHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- expire_time = #{expireTime,jdbcType=TIMESTAMP}
- where id = #{id,jdbcType=INTEGER}
- </update>
-
- <select id="getRoleNameByAccountId" resultType="map">
+ acc.*,jtv.id as jwt_token_version_id,jtv.update_time as update_time
+ from account acc
+ left join jwt_token_version jtv on acc.account_name = jtv.account_name
+ where acc.account_name = #{name,jdbcType=VARCHAR}
+ </select>
+ <select id="getRoleNameByAccountId" resultType="java.util.Map">
SELECT
r.role_name
FROM
--
Gitblit v1.8.0