Browse Source

adsc标识

master
review512jwy@163.com 1 week ago
parent
commit
8960e29784
  1. 29
      dongjian-center-admin-dao/src/main/resources/mappers/auto/BasicMenuMapper.xml
  2. 29
      dongjian-center-admin-dao/src/main/resources/mappers/auto/BasicUserMapper.xml
  3. 1
      dongjian-center-admin-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml
  4. 3
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/dto/user/OptUserParam.java
  5. 34
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicMenu.java
  6. 60
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicMenuExample.java
  7. 34
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicUser.java
  8. 60
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicUserExample.java
  9. 3
      dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/vo/user/UserPageDTO.java

29
dongjian-center-admin-dao/src/main/resources/mappers/auto/BasicMenuMapper.xml

@ -16,6 +16,7 @@
<result column="flag" jdbcType="INTEGER" property="flag" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="used_by_dashboard" jdbcType="INTEGER" property="usedByDashboard" />
<result column="dashboard_lowest_node" jdbcType="INTEGER" property="dashboardLowestNode" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
@ -89,7 +90,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, parent_menu_id, menu_name, menu_name_en, menu_name_jp, remark, menu_level, flag,
create_time, used_by_dashboard
create_time, used_by_dashboard, dashboard_lowest_node
</sql>
<select id="selectByExample" parameterType="com.dongjian.datacenter.admin.model.BasicMenuExample" resultMap="BaseResultMap">
<!--
@ -148,12 +149,12 @@
</selectKey>
insert into basic_menu (parent_menu_id, menu_name, menu_name_en,
menu_name_jp, remark, menu_level,
flag, create_time, used_by_dashboard
)
flag, create_time, used_by_dashboard,
dashboard_lowest_node)
values (#{parentMenuId,jdbcType=BIGINT}, #{menuName,jdbcType=VARCHAR}, #{menuNameEn,jdbcType=VARCHAR},
#{menuNameJp,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{menuLevel,jdbcType=INTEGER},
#{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{usedByDashboard,jdbcType=INTEGER}
)
#{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{usedByDashboard,jdbcType=INTEGER},
#{dashboardLowestNode,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.dongjian.datacenter.admin.model.BasicMenu">
<!--
@ -192,6 +193,9 @@
<if test="usedByDashboard != null">
used_by_dashboard,
</if>
<if test="dashboardLowestNode != null">
dashboard_lowest_node,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentMenuId != null">
@ -221,6 +225,9 @@
<if test="usedByDashboard != null">
#{usedByDashboard,jdbcType=INTEGER},
</if>
<if test="dashboardLowestNode != null">
#{dashboardLowestNode,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.dongjian.datacenter.admin.model.BasicMenuExample" resultType="java.lang.Long">
@ -270,6 +277,9 @@
<if test="record.usedByDashboard != null">
used_by_dashboard = #{record.usedByDashboard,jdbcType=INTEGER},
</if>
<if test="record.dashboardLowestNode != null">
dashboard_lowest_node = #{record.dashboardLowestNode,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -290,7 +300,8 @@
menu_level = #{record.menuLevel,jdbcType=INTEGER},
flag = #{record.flag,jdbcType=INTEGER},
create_time = #{record.createTime,jdbcType=BIGINT},
used_by_dashboard = #{record.usedByDashboard,jdbcType=INTEGER}
used_by_dashboard = #{record.usedByDashboard,jdbcType=INTEGER},
dashboard_lowest_node = #{record.dashboardLowestNode,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -329,6 +340,9 @@
<if test="usedByDashboard != null">
used_by_dashboard = #{usedByDashboard,jdbcType=INTEGER},
</if>
<if test="dashboardLowestNode != null">
dashboard_lowest_node = #{dashboardLowestNode,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -346,7 +360,8 @@
menu_level = #{menuLevel,jdbcType=INTEGER},
flag = #{flag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=BIGINT},
used_by_dashboard = #{usedByDashboard,jdbcType=INTEGER}
used_by_dashboard = #{usedByDashboard,jdbcType=INTEGER},
dashboard_lowest_node = #{dashboardLowestNode,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

29
dongjian-center-admin-dao/src/main/resources/mappers/auto/BasicUserMapper.xml

@ -28,6 +28,7 @@
<result column="create_platform" jdbcType="INTEGER" property="createPlatform" />
<result column="last_name" jdbcType="VARCHAR" property="lastName" />
<result column="first_name" jdbcType="VARCHAR" property="firstName" />
<result column="adsc_flag" jdbcType="INTEGER" property="adscFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
@ -102,7 +103,7 @@
-->
id, user_type, company_id, username, login_name, `password`, salt, email, mfa_secret,
mfa_bind, mobile_number, last_login_time, flag, expire_time, create_time, creator_id,
modify_time, modifier_id, super_role, create_platform, last_name, first_name
modify_time, modifier_id, super_role, create_platform, last_name, first_name, adsc_flag
</sql>
<select id="selectByExample" parameterType="com.dongjian.datacenter.admin.model.BasicUserExample" resultMap="BaseResultMap">
<!--
@ -165,16 +166,16 @@
mobile_number, last_login_time, flag,
expire_time, create_time, creator_id,
modify_time, modifier_id, super_role,
create_platform, last_name, first_name
)
create_platform, last_name, first_name,
adsc_flag)
values (#{userType,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR},
#{loginName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR},
#{email,jdbcType=VARCHAR}, #{mfaSecret,jdbcType=VARCHAR}, #{mfaBind,jdbcType=INTEGER},
#{mobileNumber,jdbcType=VARCHAR}, #{lastLoginTime,jdbcType=BIGINT}, #{flag,jdbcType=INTEGER},
#{expireTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT},
#{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, #{superRole,jdbcType=INTEGER},
#{createPlatform,jdbcType=INTEGER}, #{lastName,jdbcType=VARCHAR}, #{firstName,jdbcType=VARCHAR}
)
#{createPlatform,jdbcType=INTEGER}, #{lastName,jdbcType=VARCHAR}, #{firstName,jdbcType=VARCHAR},
#{adscFlag,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.dongjian.datacenter.admin.model.BasicUser">
<!--
@ -249,6 +250,9 @@
<if test="firstName != null">
first_name,
</if>
<if test="adscFlag != null">
adsc_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userType != null">
@ -314,6 +318,9 @@
<if test="firstName != null">
#{firstName,jdbcType=VARCHAR},
</if>
<if test="adscFlag != null">
#{adscFlag,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.dongjian.datacenter.admin.model.BasicUserExample" resultType="java.lang.Long">
@ -399,6 +406,9 @@
<if test="record.firstName != null">
first_name = #{record.firstName,jdbcType=VARCHAR},
</if>
<if test="record.adscFlag != null">
adsc_flag = #{record.adscFlag,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -431,7 +441,8 @@
super_role = #{record.superRole,jdbcType=INTEGER},
create_platform = #{record.createPlatform,jdbcType=INTEGER},
last_name = #{record.lastName,jdbcType=VARCHAR},
first_name = #{record.firstName,jdbcType=VARCHAR}
first_name = #{record.firstName,jdbcType=VARCHAR},
adsc_flag = #{record.adscFlag,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -506,6 +517,9 @@
<if test="firstName != null">
first_name = #{firstName,jdbcType=VARCHAR},
</if>
<if test="adscFlag != null">
adsc_flag = #{adscFlag,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -535,7 +549,8 @@
super_role = #{superRole,jdbcType=INTEGER},
create_platform = #{createPlatform,jdbcType=INTEGER},
last_name = #{lastName,jdbcType=VARCHAR},
first_name = #{firstName,jdbcType=VARCHAR}
first_name = #{firstName,jdbcType=VARCHAR},
adsc_flag = #{adscFlag,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

1
dongjian-center-admin-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml

@ -29,6 +29,7 @@
buser.mfa_bind,
buser.mobile_number mobileNumber,
buser.create_time createTime,
buser.adsc_flag,
any_value(brole.id) roleId,
any_value(brole.role_name) roleName
FROM

3
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/dto/user/OptUserParam.java

@ -43,5 +43,8 @@ public class OptUserParam {
@Schema(description = "名",example = "由纪夫", required = true)
private String firstName;
@Schema(description = "adsc标识, 0-不是, 1-是",example = "1", required = true)
private Integer adscFlag;
}

34
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicMenu.java

@ -93,6 +93,15 @@ public class BasicMenu implements Serializable {
*/
private Integer usedByDashboard;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column basic_menu.dashboard_lowest_node
*
* @mbg.generated
*/
private Integer dashboardLowestNode;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table basic_menu
@ -341,6 +350,30 @@ public class BasicMenu implements Serializable {
this.usedByDashboard = usedByDashboard;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_menu.dashboard_lowest_node
*
* @return the value of basic_menu.dashboard_lowest_node
*
* @mbg.generated
*/
public Integer getDashboardLowestNode() {
return dashboardLowestNode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column basic_menu.dashboard_lowest_node
*
* @param dashboardLowestNode the value for basic_menu.dashboard_lowest_node
*
* @mbg.generated
*/
public void setDashboardLowestNode(Integer dashboardLowestNode) {
this.dashboardLowestNode = dashboardLowestNode;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table basic_menu
@ -363,6 +396,7 @@ public class BasicMenu implements Serializable {
sb.append(", flag=").append(flag);
sb.append(", createTime=").append(createTime);
sb.append(", usedByDashboard=").append(usedByDashboard);
sb.append(", dashboardLowestNode=").append(dashboardLowestNode);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

60
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicMenuExample.java

@ -833,6 +833,66 @@ public class BasicMenuExample {
addCriterion("used_by_dashboard not between", value1, value2, "usedByDashboard");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeIsNull() {
addCriterion("dashboard_lowest_node is null");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeIsNotNull() {
addCriterion("dashboard_lowest_node is not null");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeEqualTo(Integer value) {
addCriterion("dashboard_lowest_node =", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeNotEqualTo(Integer value) {
addCriterion("dashboard_lowest_node <>", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeGreaterThan(Integer value) {
addCriterion("dashboard_lowest_node >", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeGreaterThanOrEqualTo(Integer value) {
addCriterion("dashboard_lowest_node >=", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeLessThan(Integer value) {
addCriterion("dashboard_lowest_node <", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeLessThanOrEqualTo(Integer value) {
addCriterion("dashboard_lowest_node <=", value, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeIn(List<Integer> values) {
addCriterion("dashboard_lowest_node in", values, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeNotIn(List<Integer> values) {
addCriterion("dashboard_lowest_node not in", values, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeBetween(Integer value1, Integer value2) {
addCriterion("dashboard_lowest_node between", value1, value2, "dashboardLowestNode");
return (Criteria) this;
}
public Criteria andDashboardLowestNodeNotBetween(Integer value1, Integer value2) {
addCriterion("dashboard_lowest_node not between", value1, value2, "dashboardLowestNode");
return (Criteria) this;
}
}
/**

34
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicUser.java

@ -201,6 +201,15 @@ public class BasicUser implements Serializable {
*/
private String firstName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column basic_user.adsc_flag
*
* @mbg.generated
*/
private Integer adscFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table basic_user
@ -737,6 +746,30 @@ public class BasicUser implements Serializable {
this.firstName = firstName == null ? null : firstName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_user.adsc_flag
*
* @return the value of basic_user.adsc_flag
*
* @mbg.generated
*/
public Integer getAdscFlag() {
return adscFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column basic_user.adsc_flag
*
* @param adscFlag the value for basic_user.adsc_flag
*
* @mbg.generated
*/
public void setAdscFlag(Integer adscFlag) {
this.adscFlag = adscFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table basic_user
@ -771,6 +804,7 @@ public class BasicUser implements Serializable {
sb.append(", createPlatform=").append(createPlatform);
sb.append(", lastName=").append(lastName);
sb.append(", firstName=").append(firstName);
sb.append(", adscFlag=").append(adscFlag);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

60
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/model/BasicUserExample.java

@ -1603,6 +1603,66 @@ public class BasicUserExample {
addCriterion("first_name not between", value1, value2, "firstName");
return (Criteria) this;
}
public Criteria andAdscFlagIsNull() {
addCriterion("adsc_flag is null");
return (Criteria) this;
}
public Criteria andAdscFlagIsNotNull() {
addCriterion("adsc_flag is not null");
return (Criteria) this;
}
public Criteria andAdscFlagEqualTo(Integer value) {
addCriterion("adsc_flag =", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagNotEqualTo(Integer value) {
addCriterion("adsc_flag <>", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagGreaterThan(Integer value) {
addCriterion("adsc_flag >", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagGreaterThanOrEqualTo(Integer value) {
addCriterion("adsc_flag >=", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagLessThan(Integer value) {
addCriterion("adsc_flag <", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagLessThanOrEqualTo(Integer value) {
addCriterion("adsc_flag <=", value, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagIn(List<Integer> values) {
addCriterion("adsc_flag in", values, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagNotIn(List<Integer> values) {
addCriterion("adsc_flag not in", values, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagBetween(Integer value1, Integer value2) {
addCriterion("adsc_flag between", value1, value2, "adscFlag");
return (Criteria) this;
}
public Criteria andAdscFlagNotBetween(Integer value1, Integer value2) {
addCriterion("adsc_flag not between", value1, value2, "adscFlag");
return (Criteria) this;
}
}
/**

3
dongjian-center-admin-model/src/main/java/com/dongjian/datacenter/admin/vo/user/UserPageDTO.java

@ -55,4 +55,7 @@ public class UserPageDTO {
@Schema(description = "名",example = "由纪夫", required = true)
private String firstName;
@Schema(description = "adsc标识, 0-不是, 1-是",example = "1", required = true)
private Integer adscFlag;
}

Loading…
Cancel
Save