Skip to content

Commit 254689f

Browse files
author
liujun
committed
update
1 parent e1f0087 commit 254689f

File tree

7 files changed

+143
-116
lines changed

7 files changed

+143
-116
lines changed

‎llmall-commodity/src/main/resources/mappers/GroupMapper.xml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
33
<mapper namespace="biz.llmall.commodity.model.mapper.GroupMapper">
4-
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.Group">
5-
<id column="id" jdbcType="BIGINT" property="id" />
6-
<result column="name" jdbcType="VARCHAR" property="name" />
7-
<result column="role" jdbcType="VARCHAR" property="role" />
8-
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
9-
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
10-
</resultMap>
11-
<sql id="Base_Column_List">
12-
id, name, role, create_time, update_time
13-
</sql>
14-
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
15-
select
16-
<include refid="Base_Column_List" />
17-
from group
18-
where id = #{id,jdbcType=BIGINT}
19-
</select>
20-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
21-
delete from group
22-
where id = #{id,jdbcType=BIGINT}
23-
</delete>
24-
<insert id="insert" parameterType="biz.llmall.common.entity.user.Group">
25-
insert into group (id, name, role,
26-
create_time, update_time)
27-
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR},
28-
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
29-
</insert>
30-
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.Group">
31-
update group
32-
set name = #{name,jdbcType=VARCHAR},
33-
role = #{role,jdbcType=VARCHAR},
34-
create_time = #{createTime,jdbcType=TIMESTAMP},
35-
update_time = #{updateTime,jdbcType=TIMESTAMP}
36-
where id = #{id,jdbcType=BIGINT}
37-
</update>
4+
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.Group">
5+
<id column="id" jdbcType="BIGINT" property="id"/>
6+
<result column="name" jdbcType="VARCHAR" property="name"/>
7+
<result column="role" jdbcType="VARCHAR" property="role"/>
8+
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
9+
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
10+
</resultMap>
11+
<sql id="Base_Column_List">
12+
id, name, role, create_time, update_time
13+
</sql>
14+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
15+
select
16+
<include refid="Base_Column_List"/>
17+
from group
18+
where id = #{id,jdbcType=BIGINT}
19+
</select>
20+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
21+
delete from group
22+
where id = #{id,jdbcType=BIGINT}
23+
</delete>
24+
<insert id="insert" parameterType="biz.llmall.common.entity.user.Group">
25+
insert into group (id, name, role,
26+
create_time, update_time)
27+
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR},
28+
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
29+
</insert>
30+
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.Group">
31+
update group
32+
set name = #{name,jdbcType=VARCHAR},
33+
role = #{role,jdbcType=VARCHAR},
34+
create_time = #{createTime,jdbcType=TIMESTAMP},
35+
update_time = #{updateTime,jdbcType=TIMESTAMP}
36+
where id = #{id,jdbcType=BIGINT}
37+
</update>
3838
</mapper>

‎llmall-commodity/src/main/resources/mappers/RoleMapper.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
33
<mapper namespace="biz.llmall.commodity.model.mapper.RoleMapper">
4-
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.Role">
5-
<id column="id" jdbcType="BIGINT" property="id" />
6-
<result column="name" jdbcType="VARCHAR" property="name" />
7-
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
8-
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
9-
</resultMap>
10-
<sql id="Base_Column_List">
11-
id, name, create_time, update_time
12-
</sql>
13-
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
14-
select
15-
<include refid="Base_Column_List" />
16-
from role
17-
where id = #{id,jdbcType=BIGINT}
18-
</select>
19-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
20-
delete from role
21-
where id = #{id,jdbcType=BIGINT}
22-
</delete>
23-
<insert id="insert" parameterType="biz.llmall.common.entity.user.Role">
24-
insert into role (id, name, create_time,
25-
update_time)
26-
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
27-
#{updateTime,jdbcType=TIMESTAMP})
28-
</insert>
29-
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.Role">
30-
update role
31-
set name = #{name,jdbcType=VARCHAR},
32-
create_time = #{createTime,jdbcType=TIMESTAMP},
33-
update_time = #{updateTime,jdbcType=TIMESTAMP}
34-
where id = #{id,jdbcType=BIGINT}
35-
</update>
4+
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.Role">
5+
<id column="id" jdbcType="BIGINT" property="id"/>
6+
<result column="name" jdbcType="VARCHAR" property="name"/>
7+
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
8+
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
9+
</resultMap>
10+
<sql id="Base_Column_List">
11+
id, name, create_time, update_time
12+
</sql>
13+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
14+
select
15+
<include refid="Base_Column_List"/>
16+
from role
17+
where id = #{id,jdbcType=BIGINT}
18+
</select>
19+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
20+
delete from role
21+
where id = #{id,jdbcType=BIGINT}
22+
</delete>
23+
<insert id="insert" parameterType="biz.llmall.common.entity.user.Role">
24+
insert into role (id, name, create_time,
25+
update_time)
26+
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
27+
#{updateTime,jdbcType=TIMESTAMP})
28+
</insert>
29+
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.Role">
30+
update role
31+
set name = #{name,jdbcType=VARCHAR},
32+
create_time = #{createTime,jdbcType=TIMESTAMP},
33+
update_time = #{updateTime,jdbcType=TIMESTAMP}
34+
where id = #{id,jdbcType=BIGINT}
35+
</update>
3636
</mapper>

‎llmall-commodity/src/main/resources/mappers/UserMapper.xml‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,55 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
33
<mapper namespace="biz.llmall.commodity.model.mapper.UserMapper">
4-
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.User">
5-
<id column="id" jdbcType="BIGINT" property="id" />
6-
<result column="group_id" jdbcType="BIGINT" property="groupId" />
7-
<result column="nickname" jdbcType="VARCHAR" property="nickname" />
8-
<result column="email" jdbcType="VARCHAR" property="email" />
9-
<result column="mobile" jdbcType="VARCHAR" property="mobile" />
10-
<result column="password" jdbcType="VARCHAR" property="password" />
11-
<result column="salt" jdbcType="VARCHAR" property="salt" />
12-
<result column="enable" jdbcType="BIT" property="enable" />
13-
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
14-
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
15-
</resultMap>
16-
<sql id="Base_Column_List">
17-
id, group_id, nickname, email, mobile, password, salt, enable, create_time, update_time
18-
</sql>
19-
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
20-
select
21-
<include refid="Base_Column_List" />
22-
from user
23-
where id = #{id,jdbcType=BIGINT}
24-
</select>
25-
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
26-
delete from user
27-
where id = #{id,jdbcType=BIGINT}
28-
</delete>
29-
<insert id="insert" parameterType="biz.llmall.common.entity.user.User">
30-
insert into user (id, group_id, nickname,
31-
email, mobile, password,
32-
salt, enable, create_time,
33-
update_time)
34-
values (#{id,jdbcType=BIGINT}, #{groupId,jdbcType=BIGINT}, #{nickname,jdbcType=VARCHAR},
35-
#{email,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
36-
#{salt,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP},
37-
#{updateTime,jdbcType=TIMESTAMP})
38-
</insert>
39-
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.User">
40-
update user
41-
set group_id = #{groupId,jdbcType=BIGINT},
42-
nickname = #{nickname,jdbcType=VARCHAR},
43-
email = #{email,jdbcType=VARCHAR},
44-
mobile = #{mobile,jdbcType=VARCHAR},
45-
password = #{password,jdbcType=VARCHAR},
46-
salt = #{salt,jdbcType=VARCHAR},
47-
enable = #{enable,jdbcType=BIT},
48-
create_time = #{createTime,jdbcType=TIMESTAMP},
49-
update_time = #{updateTime,jdbcType=TIMESTAMP}
50-
where id = #{id,jdbcType=BIGINT}
51-
</update>
4+
<resultMap id="BaseResultMap" type="biz.llmall.common.entity.user.User">
5+
<id column="id" jdbcType="BIGINT" property="id"/>
6+
<result column="group_id" jdbcType="BIGINT" property="groupId"/>
7+
<result column="nickname" jdbcType="VARCHAR" property="nickname"/>
8+
<result column="email" jdbcType="VARCHAR" property="email"/>
9+
<result column="mobile" jdbcType="VARCHAR" property="mobile"/>
10+
<result column="password" jdbcType="VARCHAR" property="password"/>
11+
<result column="salt" jdbcType="VARCHAR" property="salt"/>
12+
<result column="enable" jdbcType="BIT" property="enable"/>
13+
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
14+
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
15+
</resultMap>
16+
<sql id="User_Base_Column_List">
17+
id, group_id, nickname, email, mobile, password, salt, enable, create_time, update_time
18+
</sql>
19+
<sql id="Group_Base_Column_List">
20+
21+
</sql>
22+
<select id="selectUserByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
23+
select
24+
<include refid="Base_Column_List"/>
25+
from user
26+
where id = #{id,jdbcType=BIGINT}
27+
</select>
28+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
29+
delete from user
30+
where id = #{id,jdbcType=BIGINT}
31+
</delete>
32+
<insert id="insert" parameterType="biz.llmall.common.entity.user.User">
33+
insert into user (id, group_id, nickname,
34+
email, mobile, password,
35+
salt, enable, create_time,
36+
update_time)
37+
values (#{id,jdbcType=BIGINT}, #{groupId,jdbcType=BIGINT}, #{nickname,jdbcType=VARCHAR},
38+
#{email,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
39+
#{salt,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP},
40+
#{updateTime,jdbcType=TIMESTAMP})
41+
</insert>
42+
<update id="updateByPrimaryKey" parameterType="biz.llmall.common.entity.user.User">
43+
update user
44+
set group_id = #{groupId,jdbcType=BIGINT},
45+
nickname = #{nickname,jdbcType=VARCHAR},
46+
email = #{email,jdbcType=VARCHAR},
47+
mobile = #{mobile,jdbcType=VARCHAR},
48+
password = #{password,jdbcType=VARCHAR},
49+
salt = #{salt,jdbcType=VARCHAR},
50+
enable = #{enable,jdbcType=BIT},
51+
create_time = #{createTime,jdbcType=TIMESTAMP},
52+
update_time = #{updateTime,jdbcType=TIMESTAMP}
53+
where id = #{id,jdbcType=BIGINT}
54+
</update>
5255
</mapper>

‎llmall-common/src/main/java/biz/llmall/common/entity/user/Group.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package biz.llmall.common.entity.user;
2-
import biz.llmall.common.entity.user.Role;
3-
import biz.llmall.common.entity.user.User;
42
import lombok.Data;
53

64
import java.util.Date;

‎llmall-common/src/main/java/biz/llmall/common/entity/user/GroupRole.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package biz.llmall.common.entity.user;
2+
import lombok.Data;
3+
4+
@Data
5+
public class GroupRole {
6+
private Group group;
7+
private Role role;
8+
}

‎llmall-common/src/main/java/biz/llmall/common/entity/user/UserGroup.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package biz.llmall.common.entity.user;
2+
import lombok.Data;
3+
4+
import java.io.Serializable;
5+
6+
@Data
7+
public class UserGroup implements Serializable {
8+
private User user;
9+
private Group group;
10+
}

‎llmall-common/src/main/java/biz/llmall/common/entity/user/UserRole.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package biz.llmall.common.entity.user;
2+
import lombok.Data;
3+
4+
@Data
5+
public class UserRole {
6+
private User user;
7+
private Role role;
8+
}

0 commit comments

Comments
 (0)